rpms/git/FC-6 .cvsignore, 1.34, 1.35 git.spec, 1.23, 1.24 sources, 1.34, 1.35

[Chris Wright (chrisw)]

Author: chrisw

Update of /cvs/extras/rpms/git/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4249

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.4.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-6/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	17 Oct 2006 18:31:21 -0000	1.34
+++ .cvsignore	10 Dec 2006 22:37:54 -0000	1.35
@@ -1 +1 @@
-git-1.4.2.4.tar.gz
+git-1.4.4.2.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-6/git.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- git.spec	17 Oct 2006 18:31:21 -0000	1.23
+++ git.spec	10 Dec 2006 22:37:54 -0000	1.24
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.4.2.4
+Version: 	1.4.4.2
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -9,7 +9,7 @@
 Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
 BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	git-core, git-svn, git-cvs, git-arch, git-email, gitk
+Requires:	git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git
 
 %description
 This is a stupid (but extremely fast) directory content manager.  It
@@ -70,6 +70,16 @@
 %description -n gitk
 Git revision tree visualiser ('gitk')
 
+%package -n perl-Git
+Summary:        Perl interface to Git
+Group:          Development/Libraries
+Requires:       git-core = %{version}-%{release}
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Error)
+
+%description -n perl-Git
+Perl interface to Git
+
 %prep
 %setup -q
 
@@ -80,12 +90,18 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \
-     prefix=%{_prefix} mandir=%{_mandir} \
+     prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \
      install %{!?_without_docs: install-doc}
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
 
-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
+(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
 %if %{!?_without_docs:1}0
-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+%else
+rm -rf $RPM_BUILD_ROOT%{_mandir}
 %endif
 
 %clean
@@ -110,10 +126,10 @@
 
 %files arch
 %defattr(-,root,root)
-%doc Documentation/*arch*.txt
-%{_bindir}/*arch*
-%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
-%{!?_without_docs: %doc Documentation/*arch*.html }
+%doc Documentation/git-archimport.txt
+%{_bindir}/git-archimport
+%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
+%{!?_without_docs: %doc Documentation/git-archimport.html }
 
 %files email
 %defattr(-,root,root)
@@ -129,6 +145,9 @@
 %{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
 %{!?_without_docs: %doc Documentation/*gitk*.html }
 
+%files -n perl-Git -f perl-files
+%defattr(-,root,root)
+
 %files core -f bin-man-doc-files
 %defattr(-,root,root)
 %{_datadir}/git-core/
@@ -136,6 +155,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Sun Dec 10 2006 Chris Wright <chrisw at redhat.com> 1.4.4.2-1
+- git-1.4.4.2
+
 * Tue Oct 17 2006 Chris Wright <chrisw at redhat.com> 1.4.2.4-1
 - git-1.4.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-6/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	17 Oct 2006 18:31:21 -0000	1.34
+++ sources	10 Dec 2006 22:37:54 -0000	1.35
@@ -1 +1 @@
-285f8b7a57f3062217e9fb5fb53836a5  git-1.4.2.4.tar.gz
+e659d672930ed5144ab20df4d6958007  git-1.4.4.2.tar.gz