SPECS (AC-branch): rpm.spec - %_smp_mflags cames from rpm-build-macros, don...

glen glen at pld-linux.org
Thu Oct 9 14:24:23 CEST 2008


Author: glen                         Date: Thu Oct  9 12:24:23 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- %_smp_mflags cames from rpm-build-macros, don't let platform.in overwrite it; rel 86

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.62 -> 1.837.2.42.2.63) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.62 SPECS/rpm.spec:1.837.2.42.2.63
--- SPECS/rpm.spec:1.837.2.42.2.62	Tue Oct  7 12:09:39 2008
+++ SPECS/rpm.spec	Thu Oct  9 14:24:17 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	85
+Release:	86
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -144,6 +144,7 @@
 Patch76:	%{name}-link.patch
 Patch77:	%{name}-perl_req-use_base.patch
 Patch78:	%{name}-perl_req-skip_multiline.patch
+Patch79:	%{name}-nosmpflags.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -291,10 +292,10 @@
 Group:		Libraries
 Requires:	beecrypt >= %{beecrypt_ver}
 Requires:	db >= %{reqdb_ver}
-Requires:	zlib >= 1.2.3
-%{?with_selinux:Requires:	libselinux >= 1.18}
 %{?with_system_libmagic:Requires:	libmagic >= 1.15-2}
+%{?with_selinux:Requires:	libselinux >= 1.18}
 Requires:	popt >= %{reqpopt_ver}
+Requires:	zlib >= 1.2.3
 %{?with_suggest_tags:Suggests:	lzma >= 1:4.42.0}
 Obsoletes:	rpm-libs
 # avoid installing with incompatible (non-tukaani) lzma
@@ -733,6 +734,7 @@
 %patch76 -p1
 %patch77 -p1
 %patch78 -p1
+%patch79 -p1
 
 mv -f scripts/{perl.req,perl.req.in}
 mv -f scripts/{perl.prov,perl.prov.in}
@@ -1370,6 +1372,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.63  2008/10/09 12:24:17  glen
+- %_smp_mflags cames from rpm-build-macros, don't let platform.in overwrite it; rel 86
+
 Revision 1.837.2.42.2.62  2008/10/07 10:09:39  glen
 - move %_install_langs to separate file: /etc/rpm/macros.lang (for better rpm updates); rel 85
 
================================================================

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



More information about the pld-cvs-commit mailing list