SPECS (rpm-4_4_9): rpm.spec - use %pld_release macro for Titanium specific ...

[hawk]

Author: hawk                         Date: Sat May 24 15:28:53 2008 GMT
Module: SPECS                         Tag: rpm-4_4_9
---- Log message:
- use %pld_release macro for Titanium specific changes, should rpm BR: rpm
  due to this macro? :)

---- Files affected:
SPECS:
   rpm.spec (1.837.2.70 -> 1.837.2.71) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.70 SPECS/rpm.spec:1.837.2.71
--- SPECS/rpm.spec:1.837.2.70	Wed May 21 12:55:37 2008
+++ SPECS/rpm.spec	Sat May 24 17:28:48 2008
@@ -23,7 +23,11 @@
 # force_cpp		- force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E"
 
 # versions of required libraries
+%if "%{pld_release}" == "ti"
+%define	reqdb_ver	4.5.20
+%else
 %define	reqdb_ver	4.6.18
+%endif
 %define	reqpopt_ver	1.10.8
 %define	beecrypt_ver	2:4.1.2-4
 %define	sover	4.4
@@ -79,8 +83,8 @@
 Patch15:	%{name}-system_libs-more.patch
 Patch16:	%{name}-php-deps.patch
 Patch17:	%{name}-ldconfig-always.patch
-Patch18:	%{name}-macros-th.patch
-Patch19:	%{name}-link.patch
+Patch18:	%{name}-macros-ti.patch
+Patch19:	%{name}-macros-th.patch
 Patch20:	%{name}-magic-usesystem.patch
 Patch21:	%{name}-dontneedutils.patch
 Patch22:	%{name}-provides-dont-obsolete.patch
@@ -135,6 +139,7 @@
 Patch73:	%{name}-namespace-probe.patch
 Patch74:	%{name}-mktemperror.patch
 Patch75:	%{name}-mimetype.patch
+Patch76:	%{name}-link.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -664,7 +669,6 @@
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
-%patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
@@ -704,7 +708,11 @@
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
+%if "%{pld_release}" == "ti"
 %patch18 -p1
+%else
+%patch19 -p1
+%endif
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
@@ -720,6 +728,7 @@
 %patch73 -p1
 %patch74 -p1
 %patch75 -p1
+%patch76 -p1
 
 mv -f scripts/{perl.req,perl.req.in}
 mv -f scripts/{perl.prov,perl.prov.in}
@@ -791,7 +800,9 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg}
 
+%if "%{pld_release}" != "ti"
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
+%endif
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -919,6 +930,28 @@
 # obsolete but still installed
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpmrc
 
+%if "%{pld_release}" == "ti"
+
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
+# customized rpm macros - global for host
+#
+#%%_install_langs pl_PL:en_US
+%%distribution PLD Titanium
+#
+# remove or replace with file_contexts path if you want to use custom
+# SELinux file contexts policy instead of one stored in packages payload
+%%_install_file_context_path	%%{nil}
+%%_verify_file_context_path	%%{nil}
+
+# If non-zero, all erasures will be automagically repackaged.
+%%_repackage_all_erasures	0
+
+# If non-zero, create debuginfo packages
+%%_enable_debug_packages		0
+EOF
+
+%else
+
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
 # customized rpm macros - global for host
 #
@@ -934,6 +967,8 @@
 #%%_repackage_all_erasures    1
 EOF
 
+%endif
+
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles <<EOF
 # global list of files (regexps) which don't generate Provides
 EOF
@@ -1078,8 +1113,10 @@
 %defattr(644,root,root,755)
 %doc CHANGES CREDITS README wdj/JBJ-GPG-KEY manual/*
 
+%if "%{pld_release}" != "ti"
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
+%endif
 
 %attr(755,root,root) /bin/rpm
 #%attr(755,root,root) %{_bindir}/rpmdb
@@ -1307,6 +1344,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.71  2008-05-24 15:28:48  hawk
+- use %pld_release macro for Titanium specific changes, should rpm BR: rpm
+  due to this macro? :)
+
 Revision 1.837.2.70  2008-05-21 10:55:37  pluto
 - fix installation of th pgp key.
 
================================================================

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