Author: adamg Date: Thu Dec 11 08:40:07 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - updated to 1.6.0.5; partial sync with HEAD
---- Files affected: SPECS: git-core.spec (1.97.2.21 -> 1.97.2.22) ---- Diffs: ================================================================ Index: SPECS/git-core.spec diff -u SPECS/git-core.spec:1.97.2.21 SPECS/git-core.spec:1.97.2.22 --- SPECS/git-core.spec:1.97.2.21 Wed Oct 22 23:12:00 2008 +++ SPECS/git-core.spec Thu Dec 11 09:40:01 2008 @@ -8,12 +8,12 @@ Summary: The stupid content tracker Summary(pl.UTF-8): Prymitywne narzędzie do śledzenia treści Name: git-core -Version: 1.6.0.3 -Release: 1 +Version: 1.6.0.5 +Release: 2 License: GPL v2 Group: Development/Tools Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2 -# Source0-md5: d7178b0b0eaaa07538149bb231902796 +# Source0-md5: 899172ebeac65f7a09a8e204d4f87d8c Source1: %{name}-gitweb.conf Source2: %{name}-gitweb-httpd.conf Source3: %{name}.sysconfig @@ -315,6 +315,7 @@ install *.h $RPM_BUILD_ROOT%{_includedir}/%{name} install xdiff/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff install libgit.a $RPM_BUILD_ROOT%{_libdir} +install xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a # bash completion install contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d @@ -337,6 +338,10 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon +# paths cleanup +sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon +sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon + # remove unneeded files rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist @@ -383,9 +388,6 @@ %doc Documentation/RelNotes* %doc Documentation/*.html Documentation/howto Documentation/technical %{_mandir}/man1/git-*.1* -%dir %{_libdir}/%{name} -%attr(755,root,root) %{_libdir}/%{name}/*-* -%exclude %{_libdir}/%{name}/git-gui %{_mandir}/man1/git.1* %{_mandir}/man5/gitattributes.5* %{_mandir}/man5/githooks.5* @@ -402,6 +404,9 @@ %endif %attr(755,root,root) %{_bindir}/git %attr(755,root,root) %{_bindir}/git-* +%dir %{_libdir}/%{name} +%attr(755,root,root) %{_libdir}/%{name}/*-* +%exclude %{_libdir}/%{name}/git-gui %{_datadir}/%{name} %{_localstatedir}/lib/git @@ -418,6 +423,7 @@ %defattr(644,root,root,755) %{_includedir}/git-core %{_libdir}/libgit.a +%{_libdir}/libgit_xdiff.a %files gitk %defattr(644,root,root,755) @@ -451,7 +457,6 @@ %files gui %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/git-gui -%{_mandir}/man1/git-gui.1* %dir %{_datadir}/git-gui %dir %{_datadir}/git-gui/lib %dir %{_datadir}/git-gui/lib/msgs @@ -488,6 +493,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.97.2.22 2008/12/11 08:40:01 adamg +- updated to 1.6.0.5; partial sync with HEAD + Revision 1.97.2.21 2008/10/22 21:12:00 adamg - updated to 1.6.0.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/git-core.spec?r1=1.97.2.21&r2=1.97.2.22&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
