diff --git a/git.spec b/git.spec index 92048e159e49056046e9f8bfff43f0dc1705f7f2..dbe5afd5f04e006a857204b29db60f350ebe7cd7 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ %global gitexecdir %{_libexecdir}/git-core Name: git Version: 2.23.0 -Release: 6 +Release: 7 Summary: A popular and widely used Version Control System License: GPLv2+ or LGPLv2.1 URL: https://git-scm.com/ @@ -9,10 +9,8 @@ Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.x Source1: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.sign Source100: git-gui.desktop -Source101: gitweb-httpd.conf -Source102: gitweb.conf.in -Source103: git@.service.in -Source104: git.socket +Source101: git@.service.in +Source102: git.socket BuildRequires: openssl-devel libcurl-devel expat-devel systemd asciidoc xmlto glib2-devel libsecret-devel pcre-devel desktop-file-utils BuildRequires: python3-devel perl-generators perl-interpreter perl-Error perl(Test::More) perl-MailTools perl(Test) @@ -177,10 +175,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/git # install config files desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE100} -install -D -p -m 644 %{SOURCE101} %{buildroot}%{_sysconfdir}/httpd/conf.d/gitweb-httpd.conf -install -D -p -m 644 %{SOURCE102} %{buildroot}%{_sysconfdir}/gitweb.conf -install -D -p -m 644 %{SOURCE103} %{buildroot}%{_unitdir}/git@.service -install -D -p -m 644 %{SOURCE104} %{buildroot}%{_unitdir}/git.socket +install -D -p -m 644 %{SOURCE101} %{buildroot}%{_unitdir}/git@.service +install -D -p -m 644 %{SOURCE102} %{buildroot}%{_unitdir}/git.socket %find_lang %{name} @@ -268,6 +264,9 @@ make test %{_mandir}/man7/git*.7.* %changelog +* Thu Jan 09 2020 openEuler Buildteam - 2.23.0-7 +- Delete unneeded files + * Thu Dec 5 2019 shenyangyang - 2.23.0-6 - Delete the perl(Error*) module that provided by perl-Git diff --git a/gitweb-httpd.conf b/gitweb-httpd.conf deleted file mode 100644 index 4f4eac7c7615015c59d00df0cc53c5ba22f5d8ca..0000000000000000000000000000000000000000 --- a/gitweb-httpd.conf +++ /dev/null @@ -1,7 +0,0 @@ -Alias /git /var/www/git - - - Options +ExecCGI - AddHandler cgi-script .cgi - DirectoryIndex gitweb.cgi - diff --git a/gitweb.conf.in b/gitweb.conf.in deleted file mode 100644 index 88226aaa394d063e6a682f25cdd207379aca0705..0000000000000000000000000000000000000000 --- a/gitweb.conf.in +++ /dev/null @@ -1,53 +0,0 @@ -# The gitweb config file is a fragment of perl code. You can set variables -# using "our $variable = value"; text from "#" character until the end of a -# line is ignored. See perlsyn(1) man page for details. -# -# See /usr/share/doc/gitweb-*/README and /usr/share/doc/gitweb-*/INSTALL for -# more details and available configuration variables. - -# Set the path to git projects. This is an absolute filesystem path which will -# be prepended to the project path. -#our $projectroot = "/var/lib/git"; - -# Set the list of git base URLs used for URL to where fetch project from, i.e. -# the full URL is "$git_base_url/$project". By default this is empty -#our @git_base_url_list = qw(git://git.example.com -# ssh://git.example.com/var/lib/git); - -# Enable the 'blame' blob view, showing the last commit that modified -# each line in the file. This can be very CPU-intensive. Disabled by default -#$feature{'blame'}{'default'} = [1]; -# -# Allow projects to override the default setting via git config file. -# Example: gitweb.blame = 0|1; -#$feature{'blame'}{'override'} = 1; - -# Disable the 'snapshot' link, providing a compressed archive of any tree. This -# can potentially generate high traffic if you have large project. Enabled for -# .tar.gz snapshots by default. -# -# Value is a list of formats defined in %known_snapshot_formats that you wish -# to offer. -#$feature{'snapshot'}{'default'} = []; -# -# Allow projects to override the default setting via git config file. -# Example: gitweb.snapshot = tbz2,zip; (use "none" to disable) -#$feature{'snapshot'}{'override'} = 1; - -# Disable grep search, which will list the files in currently selected tree -# containing the given string. This can be potentially CPU-intensive, of -# course. Enabled by default. -#$feature{'grep'}{'default'} = [0]; -# -# Allow projects to override the default setting via git config file. -# Example: gitweb.grep = 0|1; -#$feature{'grep'}{'override'} = 1; - -# Disable the pickaxe search, which will list the commits that modified a given -# string in a file. This can be practical and quite faster alternative to -# 'blame', but still potentially CPU-intensive. Enabled by default. -#$feature{'pickaxe'}{'default'} = [0]; -# -# Allow projects to override the default setting via git config file. -# Example: gitweb.pickaxe = 0|1; -#$feature{'pickaxe'}{'override'} = 1;