SPECS (AC-branch): git-core.spec - merged 1.5.4.2 from HEAD

glen glen at pld-linux.org
Sun Feb 24 11:20:23 CET 2008 

Author: glen                         Date: Sun Feb 24 10:20:23 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged 1.5.4.2 from HEAD

---- Files affected:
SPECS:
   git-core.spec (1.97.2.1 -> 1.97.2.2) 

---- Diffs:

================================================================
Index: SPECS/git-core.spec
diff -u SPECS/git-core.spec:1.97.2.1 SPECS/git-core.spec:1.97.2.2
--- SPECS/git-core.spec:1.97.2.1	Wed Nov 28 18:41:25 2007
+++ SPECS/git-core.spec	Sun Feb 24 11:20:18 2008
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-
+#
 # Conditional build:
 %bcond_without	tests	# don't perform make test
 %bcond_without	doc	# skip building/packaging docs/manuals (takes some time)
@@ -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.5.3.6
-Release:	3
+Version:	1.5.4.2
+Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5:	9b0a6cea7b084f3fc78f264cd2fb49bd
+# Source0-md5:	a083e05d03fe23e5b4af0a7c17e48aaa
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}.sysconfig
@@ -24,6 +24,7 @@
 BuildRequires:	automake
 BuildRequires:	curl-devel
 BuildRequires:	expat-devel
+BuildRequires:	gettext-devel
 BuildRequires:	openssl-devel
 BuildRequires:	perl-Error
 BuildRequires:	perl-base
@@ -44,6 +45,7 @@
 Requires:	coreutils
 Requires:	cpio
 Requires:	curl
+Requires:	cvsps >= 2.1-2
 Requires:	diffutils
 Requires:	findutils
 Requires:	grep
@@ -96,7 +98,7 @@
 
 %package daemon-inetd
 Summary:	Files necessary to run git-daemon as an inetd service
-Summary(pl.UTF-8):	Pliki niezbędne do uruchomienia git-daemon w trybie usługi inetd
+Summary(pl.UTF-8):	Pliki niezbędne do uruchomienia git-daemona w trybie usługi inetd
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires:	setup >= 2.4.10-6
@@ -110,13 +112,13 @@
 git-daemon as an inetd service.
 
 %description daemon-inetd -l pl.UTF-8
-Git-daemon to prosty daemon git korzystający z protokołu TCP do
-udostępnienia repozytoriów git. Pakiet ten dostarcza potrzebnych
-plików do uruchomienia git-daemon w trybie usługi inetd.
+Git-daemon to prosty demon git korzystający z protokołu TCP do
+udostępniania repozytoriów git. Ten pakiet dostarcza pliki potrzebne
+do uruchomienia git-demona w trybie usługi inetd.
 
 %package daemon-standalone
 Summary:	Files necessary to run git-daemon as a standalone service
-Summary(pl.UTF-8):	Pliki niezbędne do uruchomienia git-daemon w trybie usługi standalone
+Summary(pl.UTF-8):	Pliki niezbędne do uruchomienia git-daemona w trybie usługi samodzielnej
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
 Provides:	git-core-daemon
@@ -129,9 +131,9 @@
 git-daemon as an standalone service.
 
 %description daemon-standalone -l pl.UTF-8
-Git-daemon to prosty daemon git korzystający z protokołu TCP do
-udostępnienia repozytoriów git. Pakiet ten dostarcza potrzebnych
-plików do uruchomienia git-daemon w trybie usługi standalone.
+Git-daemon to prosty demon git korzystający z protokołu TCP do
+udostępniania repozytoriów git. Ten pakiet dostarcza pliki potrzebne
+do uruchomienia git-daemona w trybie usługi samodzielnej.
 
 %package devel
 Summary:	Header files for git-core
@@ -188,7 +190,11 @@
 Summary(pl.UTF-8):	Oparta na GTK+ przeglądarka repozytorium gita
 Group:		Development/Tools
 Requires:	%{name} = %{version}-%{release}
-#Requires:	pytongowe mambo dżambo
+Requires:	python >= 1:2.4
+Requires:	python-pycairo >= 1.0
+Requires:	python-pygobject
+Requires:	python-pygtk-gtk >= 2:2.8
+Suggests:	python-gnome-desktop-gtksourceview
 
 %description gitview
 A GTK+ based repository browser for git.
@@ -265,11 +271,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir}/%{name}/xdiff,%{_sharedstatedir}/git}
+install -d $RPM_BUILD_ROOT{%{_includedir}/%{name}/xdiff,%{_localstatedir}/lib/git}
 install -d $RPM_BUILD_ROOT{%{appdir},%{cgibindir},%{webappdir}}
 install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/syntax
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig/rc-inetd,rc.d/init.d}
+install -d $RPM_BUILD_ROOT/etc/{sysconfig/rc-inetd,rc.d/init.d}
 
 %{__make} install \
 	INSTALLDIRS=vendor \
@@ -302,13 +308,15 @@
 install contrib/gitview/gitview $RPM_BUILD_ROOT%{_bindir}
 
 # git-daemon related files
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/git-daemon
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rc-inetd/git-daemon
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/git-daemon
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/git-daemon
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon
 
 # remove unneeded files
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist
+rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/Error.pm
+rm -f $RPM_BUILD_ROOT%{_mandir}/man3/private-Error.3*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -350,6 +358,7 @@
 %doc Documentation/{[!g]*,g[!i]*,git,git[!k]*}.html Documentation/howto Documentation/technical
 %{_mandir}/man1/git-*.1*
 %{_mandir}/man5/gitattributes.5*
+%{_mandir}/man5/gitcli.5*
 %{_mandir}/man5/gitignore.5*
 %{_mandir}/man5/gitmodules.5*
 %{_mandir}/man7/git.7*
@@ -358,7 +367,7 @@
 %attr(755,root,root) %{_bindir}/git-*
 %{_datadir}/%{name}
 %{_datadir}/git-gui
-%{_sharedstatedir}/git
+%{_localstatedir}/lib/git
 
 %files daemon-inetd
 %defattr(644,root,root,755)
@@ -371,8 +380,8 @@
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/*
-%{_libdir}/*.a
+%{_includedir}/git-core
+%{_libdir}/libgit.a
 
 %files gitk
 %defattr(644,root,root,755)
@@ -381,6 +390,10 @@
 %{_mandir}/man1/gitk.1*
 %endif
 %attr(755,root,root) %{_bindir}/gitk
+%dir %{_datadir}/gitk
+%dir %{_datadir}/gitk/lib
+%dir %{_datadir}/gitk/lib/msgs
+%lang(de) %dir %{_datadir}/gitk/lib/msgs/de.msg
 
 %files gitweb
 %defattr(644,root,root,755)
@@ -417,6 +430,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97.2.2  2008-02-24 10:20:18  glen
+- merged 1.5.4.2 from HEAD
+
 Revision 1.97.2.1  2007-11-28 17:41:25  adamg
 - R: setup-2.1.10-6 in git-core-daemon-inetd
 - release 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/git-core.spec?r1=1.97.2.1&r2=1.97.2.2&f=u

More information about the pld-cvs-commit mailing list