packages (rpm-4_9): rpm/rpm.spec - removed some %{pld_release} usage - upda...

[wiget]

Author: wiget                        Date: Mon Apr  4 15:09:56 2011 GMT
Module: packages                      Tag: rpm-4_9
---- Log message:
- removed some %{pld_release} usage
- updated rpm-rpmrc.patch

---- Files affected:
packages/rpm:
   rpm.spec (1.837.2.42.2.49.2.100.2.2 -> 1.837.2.42.2.49.2.100.2.3) 

---- Diffs:

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.100.2.2 packages/rpm/rpm.spec:1.837.2.42.2.49.2.100.2.3
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.100.2.2	Tue Mar 29 16:34:20 2011
+++ packages/rpm/rpm.spec	Mon Apr  4 17:09:50 2011
@@ -18,15 +18,10 @@
 #
 # Conditional build:
 %bcond_with	static		# build static rpm+rpmi
-%bcond_without	apidocs		# don't generate documentation with doxygen
+%bcond_with	apidocs		# don't generate documentation with doxygen
 %bcond_with		internal_db		# internal db (db 4.5.20)
-%if "%{pld_release}" == "ac"
-%bcond_without	autoreqdep	# autogenerate package name deps in addition to sonames/perl(X)
-%bcond_with		nptl			# internal db: don't use process-shared POSIX mutexes (NPTL provides full interface)
-%else
 %bcond_with		autoreqdep	# autogenerate package name deps in addition to sonames/perl(X)
 %bcond_without	nptl			# internal db: don't use process-shared POSIX mutexes (NPTL provides full interface)
-%endif
 %bcond_without	python		# don't build python bindings
 %bcond_without	selinux		# build without selinux support
 %bcond_without	system_libmagic	# don't use system libmagic
@@ -41,11 +36,7 @@
 %endif
 
 # versions of required libraries
-%if "%{pld_release}" == "th"
 %define	reqdb_ver	4.7.25
-%else
-%define	reqdb_ver	4.5.20
-%endif
 %define	reqpopt_ver	1.10.8
 %define	beecrypt_ver	2:4.1.2-4
 %define	sover		4.5
@@ -88,7 +79,6 @@
 Patch1067:	%{name}-disable-features.patch
 Patch1070:	%{name}-rpmrc-ac.patch
 #Patch0:	%{name}-pl.po.patch
-Patch1:		%{name}-rpmrc.patch
 Patch2:		%{name}-arch.patch
 Patch3:		%{name}-rpmpopt.patch
 Patch4:		%{name}-perl-macros.patch
@@ -187,6 +177,7 @@
 Patch2003:	debuginfo-strict.patch
 Patch2004:	debuginfo-nostrip.patch
 Patch2005:	debuginfo-builddir.patch
+Patch2006:	%{name}-rpmrc.patch
 
 URL:		http://www.rpm.org/
 BuildRequires:	autoconf >= 2.57
@@ -473,11 +464,7 @@
 Group:		Applications/File
 Requires:	%{name} = %{version}-%{release}
 Requires:	popt >= %{reqpopt_ver}
-%if "%{pld_release}" == "ac"
-Conflicts:	filesystem-debuginfo < 2.0-7
-%else
 Conflicts:	filesystem-debuginfo < 3.0-16
-%endif
 
 %description utils
 Additional utilities for managing RPM packages and database.
@@ -545,16 +532,8 @@
 Requires:	file >= 4.17
 Requires:	fileutils
 Requires:	findutils
-%if "%{pld_release}" == "ac"
-%ifarch athlon
-Requires:	gcc >= 3.0.3
-%else
-Requires:	gcc
-%endif
-%else
 # rpmrc patch adds flags specific to gcc >= 3.4
 Requires:	gcc >= 5:3.4
-%endif
 Requires:	glibc-devel
 Requires:	grep
 Requires:	gzip
@@ -842,6 +821,7 @@
 %patch2003 -p1
 %patch2004 -p1
 %patch2005 -p1
+%patch2006 -p1
 
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE1}
@@ -926,11 +906,9 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/%{_lib},/etc/{sysconfig,tmpwatch},%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib}
 
-%if "%{pld_release}" != "ti"
 install -d $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 install %{SOURCE9} $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-%endif
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -1073,11 +1051,7 @@
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
 # customized rpm macros - global for host
 #
-%if "%{pld_release}" == "ti"
-%%distribution PLD Titanium
-%else
 %%distribution PLD
-%endif
 #
 # remove or replace with file_contexts path if you want to use custom
 # SELinux file contexts policy instead of one stored in packages payload
@@ -1248,9 +1222,7 @@
 	rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__*
 fi
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
-%if "%{pld_release}" == "th"
 echo >&2 "You probably want to remove db4.5 package now"
-%endif
 
 %triggerpostun -- %{name} < 4.4.9-44
 %{_rpmlibdir}/hrmib-cache
@@ -1265,10 +1237,8 @@
 %defattr(644,root,root,755)
 %doc CHANGES CREDITS README manual/*
 
-%if "%{pld_release}" != "ti"
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*.asc
-%endif
 
 %attr(755,root,root) /bin/rpm
 %attr(755,root,root) %{_bindir}/rpmdb
@@ -1316,6 +1286,7 @@
 
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/macros
+%{_rpmlibdir}/rpmrc
 
 %attr(755,root,root) %{_rpmlibdir}/hrmib-cache
 
@@ -1535,6 +1506,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.100.2.3  2011/04/04 15:09:50  wiget
+- removed some %{pld_release} usage
+- updated rpm-rpmrc.patch
+
 Revision 1.837.2.42.2.49.2.100.2.2  2011/03/29 14:34:20  wiget
 - rpm-new-debuginfo.patch partialy applied upstream, rest splitted into
  - debuginfo-builddir.patch - canonical RPM_BUILD_DIR
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.100.2.2&r2=1.837.2.42.2.49.2.100.2.3&f=u