X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=git-core.spec;h=b3b882c3f742820976ceb596557aa92e306237b4;hb=6fa8665e091db026960c52733e728824073123c9;hp=bfc3abd4276f959bd910cff9accbdd28dbf250c5;hpb=1b1fc5594ac945b3d0e28d8eef1de76b200ebbe1;p=packages%2Fgit-core.git

diff --git a/git-core.spec b/git-core.spec
index bfc3abd..b3b882c 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -14,12 +14,12 @@
 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:	2.14.1
+Version:	2.17.0
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5:	a55bc6a2164d3ef1c3e5fc2f0c1d0d52
+# Source0-md5:	371985891f467969802fe1c7584a45bf
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf
@@ -78,8 +78,6 @@ Conflicts:	pdksh < 5.2.14-46
 Requires:	grep
 # git-pull: printf
 Requires:	coreutils
-Requires:	perl-Error
-Requires:	perl-Git = %{version}-%{release}
 Requires:	sed
 Suggests:	git-core-bzr
 Suggests:	git-core-cvs
@@ -88,19 +86,25 @@ Suggests:	git-core-p4
 Suggests:	git-core-svn
 Suggests:	less
 Suggests:	openssh-clients
+Suggests:	perl-Git = %{version}-%{release}
 Suggests:	rsync
 Obsoletes:	git-core-gitview
 Obsoletes:	python-Git
+Conflicts:	perl-Git < %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # html docs have links to txt files
 %define		_noautocompressdoc	*.txt
 
+# do not generate perl dependency, git add -p support is optional
+# skip dependency generation from templates
+%define		_noautoreqfiles %{_libexecdir}/%{name}/git-add--interactive %{_datadir}/%{name}/templates
+
 %define		webapp		gitweb
 %define		webappdir	%{_sysconfdir}/webapps/%{webapp}
 %define		appdir		%{_datadir}/%{webapp}
 %define		cgibindir	%{_prefix}/lib/cgi-bin
-%define		gitcoredir	%{_libdir}/%{name}
+%define		gitcoredir	%{_libexecdir}/%{name}
 
 %description
 "git" can mean anything, depending on your mood.
@@ -158,9 +162,6 @@ Requires:	setup >= 2.4.11-1
 Provides:	git-core-daemon
 Obsoletes:	git-core-daemon
 Obsoletes:	git-core-daemon-standalone
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
 
 %description daemon-inetd
 Git-daemon is a really simple TCP git daemon that can serve git
@@ -180,9 +181,6 @@ Requires:	%{name} = %{version}-%{release}
 Provides:	git-core-daemon
 Obsoletes:	git-core-daemon
 Obsoletes:	git-core-daemon-inetd
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
 
 %description daemon-standalone
 Git-daemon is a really simple TCP git daemon that can serve git
@@ -454,12 +452,13 @@ cp -a contrib contrib-doc
 echo "BLK_SHA1=1" >> config.mak
 
 %{__make} \
-	INSTALLDIRS=vendor \
 	GITWEB_CONFIG="%{webappdir}/gitweb.conf" \
 	GITWEB_PROJECTROOT="/var/lib/git" \
 	GITWEB_CSS="/gitweb/gitweb.css" \
 	GITWEB_LOGO="/gitweb/git-logo.png" \
 	GITWEB_FAVICON="/gitweb/git-favicon.png" \
+	NO_PERL_CPAN_FALLBACKS=1 \
+	perllibdir=%{perl_vendorlib} \
 	V=1
 
 %{__make} -C contrib/subtree
@@ -469,7 +468,7 @@ echo "BLK_SHA1=1" >> config.mak
 %endif
 
 %if %{with doc}
-%{__make} -C Documentation \
+%{__make} doc \
 	MAN_BASE_URL=file://%{_docdir}/%{name}-doc-%{version}/ \
 	V=1
 %endif
@@ -483,7 +482,7 @@ echo "BLK_SHA1=1" >> config.mak
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir}/%{name}/xdiff,%{_localstatedir}/lib/git}
+install -d $RPM_BUILD_ROOT{%{_includedir}/%{name}/xdiff,%{_libdir},%{_localstatedir}/lib/git}
 install -d $RPM_BUILD_ROOT{%{appdir},%{cgibindir},%{webappdir}}
 install -d $RPM_BUILD_ROOT/etc/{sysconfig/rc-inetd,rc.d/init.d}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -493,11 +492,12 @@ cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/git-core/gitconfig
 EOF
 
 %{__make} install \
-	INSTALLDIRS=vendor \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	NO_PERL_CPAN_FALLBACKS=1 \
+	perllibdir=%{perl_vendorlib}
 
 %if %{with doc}
-%{__make} -C Documentation install \
+%{__make} install-doc \
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
@@ -581,8 +581,6 @@ ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-ftp
 ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-ftps
 
 # remove unneeded files
-%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist
 %py_postclean
 
 mv $RPM_BUILD_ROOT%{_localedir}/pt{_PT,}
@@ -678,6 +676,7 @@ fi
 %exclude %{gitcoredir}/*email*
 %exclude %{gitcoredir}/*p4*
 %exclude %{gitcoredir}/git-archimport
+%exclude %{gitcoredir}/git-citool
 %exclude %{gitcoredir}/git-cvs*
 %exclude %{gitcoredir}/git-gui
 %exclude %{gitcoredir}/git-imap-send
@@ -758,6 +757,7 @@ fi
 %if %{with tk}
 %files gui
 %defattr(644,root,root,755)
+%attr(755,root,root) %{gitcoredir}/git-citool
 %attr(755,root,root) %{gitcoredir}/git-gui
 %dir %{_datadir}/git-gui
 %dir %{_datadir}/git-gui/lib
@@ -820,12 +820,6 @@ fi
 %if %{with doc}
 %{_mandir}/man1/git-svn.1*
 %endif
-%{_mandir}/man3/Git::SVN::Editor.3pm*
-%{_mandir}/man3/Git::SVN::Fetcher.3pm*
-%{_mandir}/man3/Git::SVN::Memoize::YAML.3pm*
-%{_mandir}/man3/Git::SVN::Prompt.3pm*
-%{_mandir}/man3/Git::SVN::Ra.3pm*
-%{_mandir}/man3/Git::SVN::Utils.3pm*
 
 %files email
 %defattr(644,root,root,755)
@@ -846,8 +840,13 @@ fi
 %dir %{perl_vendorlib}/Git
 %{perl_vendorlib}/Git/I18N.pm
 %{perl_vendorlib}/Git/IndexInfo.pm
+%{perl_vendorlib}/Git/LoadCPAN.pm
+%{perl_vendorlib}/Git/Packet.pm
+%dir %{perl_vendorlib}/Git/LoadCPAN
+%{perl_vendorlib}/Git/LoadCPAN/Error.pm
+%dir %{perl_vendorlib}/Git/LoadCPAN/Mail
+%{perl_vendorlib}/Git/LoadCPAN/Mail/Address.pm
 %{_mandir}/man3/Git.3pm*
-%{_mandir}/man3/Git::I18N.3pm*
 
 %if %{with gnome_keyring}
 %files -n gnome-keyring-git-core