SPECS (rpm-4_5): rpm.spec - fix perl dep generators, rpm2cpio problem seems...

glen glen at pld-linux.org
Sun Oct 26 22:05:39 CET 2008


Author: glen                         Date: Sun Oct 26 21:05:39 2008 GMT
Module: SPECS                         Tag: rpm-4_5
---- Log message:
- fix perl dep generators, rpm2cpio problem seems solved

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.49.2.28 -> 1.837.2.42.2.49.2.29) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.28 SPECS/rpm.spec:1.837.2.42.2.49.2.29
--- SPECS/rpm.spec:1.837.2.42.2.49.2.28	Sun Oct 26 21:36:06 2008
+++ SPECS/rpm.spec	Sun Oct 26 22:05:33 2008
@@ -10,13 +10,6 @@
 #   preserving payload format and compressor from original rpm, _not_ current settings
 #   /usr/bin/install: cannot stat `./it.gmo': No such file or directory
 #   /usr/bin/install: cannot stat `./sr at Latn.gmo': No such file or directory
-# - rpm2cpio borken:
-#glen at builder-ac pld/BUILD $ unpack dnews-5.5d1-1.src.rpm
-#* dnews-5.5d1-1.src.rpm... lzma: (stdin): Compressed data is corrupt
-#cpio: premature end of archive
-#DONE
-#glen at builder-ac pld/BUILD $ file dnews-5.5d1-1.src.rpm
-#dnews-5.5d1-1.src.rpm: RPM v3 src i386 dnews-5.5d1-1
 #
 # Conditional build:
 %bcond_with	static		# build static rpm+rpmi
@@ -57,7 +50,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	0.58
+Release:	0.59
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -691,8 +684,8 @@
 echo '%%define	__php_requires	/usr/lib/rpm/php.req' >> macros.php
 echo '%%define	__mono_provides	/usr/lib/rpm/mono-find-provides' > macros.mono
 echo '%%define	__mono_requires	/usr/lib/rpm/mono-find-requires' >> macros.mono
-install %{SOURCE10} scripts/php.prov.in
-install %{SOURCE11} scripts/php.req.in
+install %{SOURCE10} scripts/php.prov
+install %{SOURCE11} scripts/php.req
 install %{SOURCE13} scripts/perl.prov
 %patch21 -p1
 %patch22 -p1
@@ -1415,6 +1408,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.29  2008/10/26 21:05:33  glen
+- fix perl dep generators, rpm2cpio problem seems solved
+
 Revision 1.837.2.42.2.49.2.28  2008/10/26 20:36:06  glen
 - package /etc/rpm/macros.lang
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.49.2.28&r2=1.837.2.42.2.49.2.29&f=u



More information about the pld-cvs-commit mailing list