SPECS: git-core.spec - Perl Package Naming - cleanup files - BR: p...

[glen]

Author: glen                         Date: Sun Nov  5 17:39:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Perl Package Naming
- cleanup files
- BR: perl-Error to avoid copy of Error.pm being installed
- fix perl paths
- rel 2

---- Files affected:
SPECS:
   git-core.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/git-core.spec
diff -u SPECS/git-core.spec:1.35 SPECS/git-core.spec:1.36
--- SPECS/git-core.spec:1.35	Sun Nov  5 17:56:11 2006
+++ SPECS/git-core.spec	Sun Nov  5 18:39:31 2006
@@ -4,7 +4,7 @@
 Summary(pl):	Prymitywne narzędzie do śledzenia treści
 Name:		git-core
 Version:	1.4.3.4
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
@@ -14,6 +14,7 @@
 BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	openssl-devel
+BuildRequires:	perl-Error
 BuildRequires:	perl-base
 BuildRequires:	python
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -65,12 +66,13 @@
 %description devel
 Pliki nagłówkowe dla git-core.
 
-%package -n perl-git-core
+%package -n perl-Git-Core
 Summary:	Perl interface to the Git version control system
 Group:		Development/Languages/Perl
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	perl-git-core
 
-%description -n perl-git-core
+%description -n perl-Git-Core
 This module provides Perl scripts easy way to interface the Git
 version control system. The modules have an easy and well-tested way
 to call arbitrary Git commands; in the future, the interface will also
@@ -81,17 +83,19 @@
 %setup -q -n git-%{version}
 
 %build
-cd perl
-%{__perl} Makefile.PL \
-	INSTALLDIRS=vendor
-cd ..
-
 %{__make} \
 	prefix=%{_prefix} \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
 
+# once again to get perl paths stright
+cd perl
+%{__perl} Makefile.PL \
+	INSTALLDIRS=vendor
+%{__make}
+cd ..
+
 %{__make} -C Documentation
 
 %install
@@ -111,6 +115,9 @@
 install *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 install xdiff/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
 
+rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -126,7 +133,7 @@
 %defattr(644,root,root,755)
 %{_includedir}/*
 
-%files -n perl-git-core
+%files -n perl-Git-Core
 %defattr(644,root,root,755)
 %{perl_vendorlib}/*.pm
 %{_mandir}/man3/*
@@ -137,6 +144,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/11/05 17:39:31  glen
+- Perl Package Naming
+- cleanup files
+- BR: perl-Error to avoid copy of Error.pm being installed
+- fix perl paths
+- rel 2
+
 Revision 1.35  2006/11/05 16:56:11  arekm
 - drop todo; add br
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/git-core.spec?r1=1.35&r2=1.36&f=u