updated to 1.8.5.2

[packages/git-core.git] / git-core.spec

diff --git a/git-core.spec b/git-core.spec
index 2ca292b1b2127567360aadfe461e2fafc88e8bd1..f3221f5e9317f08a6bd062aa290437c62d1cc6fa 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -10,25 +10,23 @@
 Summary:       Distributed version control system focused on speed, effectivity and usability
 Summary(pl.UTF-8):     Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:          git-core
-Version:       1.8.3.4
-Release:       2
+Version:       1.8.5.2
+Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://git-core.googlecode.com/files/git-%{version}.tar.gz
-# Source0-md5: 80eec3201a5d012913d287b85adaee8e
+# Source0-md5: df8519044f9880f3687d863d99245282
 Source1:       %{name}-gitweb.conf
-Source2:       %{name}-gitweb-apache.conf
+Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}-gitweb-lighttpd.conf
 Source4:       %{name}.sysconfig
 Source5:       %{name}.inet
 Source6:       %{name}.init
-Source7:       %{name}-gitweb-httpd.conf
 Patch0:                %{name}-tests.patch
 Patch1:                %{name}-key-bindings.patch
 Patch2:                %{name}-sysconfdir.patch
 Patch3:                cherry-picked-commitlog.patch
-Patch4:                %{name}-svn-serf.patch
-Patch5:                %{name}-svn-exit-errors.patch
+Patch4:                %{name}-svn-exit-errors.patch
 URL:           http://git-scm.com/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -71,6 +69,7 @@ Suggests:     git-core-cvs
 Suggests:      git-core-svn
 Suggests:      less
 Suggests:      rsync
+Obsoletes:     python-Git
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # html docs have links to txt files
@@ -212,10 +211,10 @@ Summary(pl.UTF-8):        Frontend WWW do gita
 Group:         Development/Tools
 Requires:      %{name} = %{version}-%{release}
 Requires:      webapps
+Requires:      webserver(access)
 Requires:      webserver(alias)
 Requires:      webserver(cgi)
 Suggests:      webserver(setenv)
-Conflicts:     apache-base < 2.4.0-1
 
 %description gitweb
 This package provides a web interface for browsing git repositories.
@@ -354,20 +353,6 @@ dowolne polecenia Gita; w przyszłości interfejs udostępni także
 specjalne metody do łatwego wykonywania operacji nietrywialnych do
 wykonania przy użyciu ogólnego interfejsu poleceń.
 
-%package -n python-Git
-Summary:       Python Git remote helpers for non-git repositories
-Summary(pl.UTF-8):     Pythonowe zdalne moduły pomocnicze dla repozytoriów niegitowych
-Group:         Development/Languages/Python
-Requires:      %{name} = %{version}-%{release}
-
-%description -n python-Git
-This package contains Python git_repote_helpers package - Git remote
-helpers for non-git repositories.
-
-%description -n python-Git -l pl.UTF-8
-Ten pakiet zawiera pakiet Pythona git_remote_helpers - zdalne moduły
-pomocnicze Gita dla repozytoriów niegitowych.
-
 %package -n vim-syntax-gitcommit
 Summary:       Vim syntax: gitcommit
 Summary(pl.UTF-8):     Składnia dla Vima: gitcommit
@@ -481,7 +466,7 @@ mv $RPM_BUILD_ROOT{%{appdir},%{cgibindir}}/gitweb.cgi
 ln -s %{cgibindir}/gitweb.cgi $RPM_BUILD_ROOT%{appdir}/gitweb.cgi
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}/gitweb.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/apache.conf
-cp -p %{SOURCE7} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/lighttpd.conf
 
 # gitview
@@ -537,10 +522,10 @@ fi
 %triggerun gitweb -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{webapp}
 
-%triggerin gitweb -- apache-base
+%triggerin gitweb -- apache < 2.2.0, apache-base
 %webapp_register httpd %{webapp}
 
-%triggerun gitweb -- apache-base
+%triggerun gitweb -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{webapp}
 
 %triggerin gitweb -- lighttpd
@@ -566,8 +551,8 @@ fi
 %exclude %{_mandir}/man1/git-cvs*.1*
 %exclude %{_mandir}/man1/git-imap-send*.1*
 %exclude %{_mandir}/man1/*email*.1*
-%exclude %{_mandir}/man1/gitremote-helpers.1*
 %{_mandir}/man1/git.1*
+%{_mandir}/man1/gitremote-helpers.1*
 %{_mandir}/man5/gitattributes.5*
 %{_mandir}/man5/githooks.5*
 %{_mandir}/man5/gitignore.5*
@@ -596,7 +581,6 @@ fi
 %exclude %{_libdir}/%{name}/git-cvs*
 %exclude %{_libdir}/%{name}/git-imap-send
 %exclude %{_libdir}/%{name}/git-instaweb
-%exclude %{_libdir}/%{name}/git-remote-testpy
 %exclude %{_libdir}/%{name}/git-remote-testsvn
 %exclude %{_libdir}/%{name}/*email*
 
@@ -735,20 +719,6 @@ fi
 %{perl_vendorlib}/Git/IndexInfo.pm
 %{_mandir}/man3/Git*.3pm*
 
-%files -n python-Git
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/git-remote-testpy
-%dir %{py_sitescriptdir}/git_remote_helpers
-%{py_sitescriptdir}/git_remote_helpers/*.py[co]
-%dir %{py_sitescriptdir}/git_remote_helpers/git
-%{py_sitescriptdir}/git_remote_helpers/git/*.py[co]
-%if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/git_remote_helpers*.egg-info
-%endif
-%if %{with doc}
-%{_mandir}/man1/gitremote-helpers.1*
-%endif
-
 %files -n vim-syntax-gitcommit
 %defattr(644,root,root,755)
 %doc contrib/vim/README