automatic import of dist-gitopeneuler20.03

1 files changed, 7 insertions, 128 deletions

diff --git a/dist-git.spec b/dist-git.spec
index b058424..0d77228 100644
--- a/dist-git.spec
+++ b/dist-git.spec
@@ -4,7 +4,7 @@
 
 Name:           dist-git
 Version:        1.17
-Release:        2%{?dist}
+Release:        1
 Summary:        Package source version control system
 
 # upload.cgi uses GPLv1
@@ -21,48 +21,18 @@ BuildRequires:  systemd
 
 Requires:       httpd
 Requires:       perl(Sys::Syslog)
-%if 0%{?fedora} || 0%{?rhel} > 7
 Requires:       (dist-git-selinux if selinux-policy-targeted)
-%else
-Requires:       dist-git-selinux
-%endif
 Requires:       git
 Requires:       git-daemon
 Requires:       mod_ssl
-Requires:       crudini
+Requires:       /usr/bin/crudini
 Requires(pre):  shadow-utils
 
-%if 0%{?rhel} && 0%{?rhel} < 8
-Requires:       python-requests
-Requires:       python-configparser
-Requires:       python-grokmirror
-Requires:       fedmsg
-BuildRequires:  python-nose
-BuildRequires:  python-nose-parameterized
-BuildRequires:  python-requests
-BuildRequires:  python-configparser
-
-# temporary because global Requires doesn't work right now, see the comment below
-Requires:       moreutils
-
-%else
 Requires:       python3-requests
-Recommends:     python3-grokmirror
-Suggests:       python3-fedmsg
-Suggests:       fedora-messaging
-%if 0%{?rhel} == 8
-BuildRequires:  python3-nose
-%else
 BuildRequires:  python3-pytest
-%endif
 BuildRequires:  python3-parameterized
 BuildRequires:  python3-requests
 
-# this should be Requires but see https://bugzilla.redhat.com/show_bug.cgi?id=1833810
-Recommends: moreutils
-
-%endif
-
 %description
 DistGit is a Git repository specifically designed to hold RPM
 package sources.
@@ -117,17 +87,9 @@ getent group packager > /dev/null || \
     groupadd -r packager
 exit 0
 
-#disable check as wo run builder as root
-#%check
-#%if 0%{?rhel} && 0%{?rhel} <= 8
-#%if 0%{?rhel} < 8
-#nosetests -v .
-#%else
-#nosetests-3 -v .
-#%endif
-#%else
-#pytest -vv .
-#%endif
+
+%check
+pytest -vv .
 
 
 %install
@@ -161,10 +123,6 @@ install -d %{buildroot}%{installdir}/web
 
 cp -a scripts/httpd/upload.cgi %{buildroot}%{installdir}/web/
 
-%if 0%{?rhel} && 0%{?rhel} < 8
-    sed -i '1 s|#.*|#!/usr/bin/python2|' %{buildroot}%{installdir}/web/upload.cgi
-%endif
-
 # ------------------------------------------------------------------------------
 # /usr/bin/ ...... links to executable files
 # ------------------------------------------------------------------------------
@@ -266,84 +224,5 @@ fi
 %{_bindir}/*
 
 %changelog
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 04 2023 Miroslav Suchý <msuchy@redhat.com> 1.17-1
-- use spdx license
-- use pytest instead of nose test
-
-* Mon Oct 5 2020 clime <clime@fedoraproject.com> - 1.16-1
-- fixed exceptions for fedora-messaging
-- fixed topic for fedora-messaging (to git.lookaside.new)
-- spec tweak not to require distgit-selinux in containers
-- only Suggests fedmsg
-- garbage collection (git gc) script and systemd timer
-  for its periodic run added
-
-* Fri Jun 12 2020 clime <clime@fedoraproject.com> - 1.15-1
-- added support for fedora-messaging
-
-* Thu May 21 2020 clime <clime@fedoraproject.com> - 1.14-1
-- disable unit tests temporarily as they do not pass
-  with network disabled during build
-
-* Thu May 21 2020 clime <clime@fedoraproject.com> - 1.13-1
-- fedmsg made an optional (recommnended) dependency
-- slight refactoring of upload.cgi script
-- tests added and documented
-
-* Tue May 28 2019 Miroslav Suchy <msuchy@redhat.com> - 1.12-1
-- remove old changelog entries
-- do not specify full path for hardlink [RHBZ#1714637]
-- add script for removing unused source tarballs in lookaside cache
-
-* Tue Apr 30 2019 clime <clime@redhat.com> 1.11-1
-- remove python3-configparser require
-- move scripts to bindir
-
-* Mon Mar 11 2019 clime <clime@redhat.com> 1.10-1
-- python3 support
-- fix post-receive hook in case post.receive.d is empty
-
-* Fri Nov 23 2018 clime <clime@redhat.com> 1.9-1
-- do not create sources file when creating a repo
-- set umask 0002 in all available dist-git scripts
-- Use REMOTE_USER as fallback for GSS_NAME
-- add support for setting mtime for an uploaded file
-
-* Tue Aug 14 2018 clime <clime@redhat.com> 1.8-1
-- add disable group check option
-- add lookaside_dir option
-- deprecate cache_dir
-- fix python-grokmirror dep
-
-* Mon Feb 26 2018 clime <clime@redhat.com> 1.7-1
-- move 'fedmsgs', 'old_paths', 'nomd5' options to optional upload section
-
-* Mon Feb 19 2018 clime <clime@redhat.com> 1.6-1
-- add 'fedmsgs', 'old_paths', and 'default_namespace' config options
-- remove domain_read_all_domains_state SELinux rule
-- require dist-git-selinux
-- give optional map permission to git_system_t on git_user_content_t
-- update requires to work for all environments
-- make the package completely distribution-agnostic
-
-* Mon Dec 18 2017 clime <clime@redhat.com> 1.5-1
-- make selinux policy build on f27+
-- add optional map SELinux permission for httpd_t
-
-* Tue Jul 25 2017 clime <clime@redhat.com> 1.4-1
-- disable md5 uploading by default
-
-* Mon Jun 26 2017 clime <clime@redhat.com> 1.3-1
-- translate '/' to '-' in package name for mailinglist hook
-  (graybrandon@gmail.com)
-
-* Fri May 26 2017 clime <clime@redhat.com> 1.2-1
-- remove mail git hook
-- grokmirror support
-
-* Wed May 03 2017 clime <clime@redhat.com> 1.1-1
-- fix default config value for email
-- fix name/email switch
+* Tue Jun 6 2023 lichaoran <pkwarcraft@hotmail.com> - 1.17-1
+- Init package