SPECS: rpm.spec - install arch specific macros

[arekm]

Author: arekm                        Date: Tue Oct  2 19:56:35 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- install arch specific macros

---- Files affected:
SPECS:
   rpm.spec (1.846 -> 1.847) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.846 SPECS/rpm.spec:1.847
--- SPECS/rpm.spec:1.846	Tue Oct  2 21:05:05 2007
+++ SPECS/rpm.spec	Tue Oct  2 21:56:30 2007
@@ -8,6 +8,7 @@
 #   tags (incl. digest) and writes whole package to destination file;
 #   repackaging uses unchanged "immutable header" image from original rpm, also
 #   preserving payload format and compressor from original rpm, _not_ current settings
+# - TODO: add macros for some ppc, mipsel, alpha and sparc
 #
 # Conditional build:
 %bcond_with	static		# build static rpm+rpmi
@@ -28,7 +29,7 @@
 %endif
 
 %if %{without db} && %{without sqlite}
-%{error: Need db or sqlite}
+%{error:Need db or sqlite}
 ERROR
 %endif
 
@@ -50,7 +51,7 @@
 Release:	0.1
 License:	GPL
 Group:		Base
-Source0:	rpm-20070927.tar.gz
+Source0:	%{name}-20070927.tar.gz
 # Source0-md5:	cf0bda3a41b74d68b36ef078edfafc6d
 Source1:	%{name}.groups
 Source2:	%{name}.platform
@@ -71,6 +72,21 @@
 # http://svn.pld-linux.org/banner.sh/
 Source17:	banner.sh
 Source18:	%{name}-pld.macros
+
+Source100:	%{name}-macros-athlon
+Source101:	%{name}-macros-i386
+Source102:	%{name}-macros-i486
+Source103:	%{name}-macros-i586
+Source104:	%{name}-macros-i686
+Source105:	%{name}-macros-noarch
+Source106:	%{name}-macros.patch
+Source107:	%{name}-macros-pentium3
+Source108:	%{name}-macros-pentium4
+Source109:	%{name}-macros-ppc
+Source110:	%{name}-macros-x86_64
+Source111:	%{name}-macros-ia32e
+Source112:	%{name}-macros-amd64
+
 Patch0:		%{name}-pl.po.patch
 
 Patch3:		%{name}-rpmpopt.patch
@@ -708,7 +724,7 @@
 	--with-pcre=external \
 	--with-keyutils=none \
 	--without-path-versioned \
-	--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/macros.*:%{_sysconfdir}/macros:%{_sysconfdir}/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
+	--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/macros.*:%{_sysconfdir}/macros:%{_sysconfdir}/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
 	--with-bugreport="http://bugs.pld-linux.org/"
 
 %{__make} \
@@ -724,6 +740,33 @@
 	pkgconfigdir=%{_pkgconfigdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# install ARCH macros
+install -d $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux
+install %{SOURCE105} $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
+
+%ifarch %{ix86}
+install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{i386,i486,i586,i686,athlon,pentium3,pentium4}-linux
+install %{SOURCE100} $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros
+install %{SOURCE101} $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
+install %{SOURCE102} $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros
+install %{SOURCE103} $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros
+install %{SOURCE104} $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros
+install %{SOURCE107} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros
+install %{SOURCE110} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
+%endif
+
+%ifarch %{x8664}
+install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{x86_64,ia32e,amd64}-linux
+install %{SOURCE110} $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
+install %{SOURCE111} $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
+install %{SOURCE112} $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
+%endif
+
+%ifarch %{ppc}
+install -d $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux
+install %{SOURCE109} $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
+%endif
+
 # first platform file entry can't contain regexps
 echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 
@@ -1071,8 +1114,6 @@
 %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh
 #%attr(755,root,root) %{_rpmlibdir}/rpmb
 #%attr(755,root,root) %{_rpmlibdir}/rpmt
-# XXX FIXME FIXME FIXME XXX
-%if 0
 %{_rpmlibdir}/noarch-*
 %ifarch %{ix86}
 %{_rpmlibdir}/i?86*
@@ -1099,7 +1140,6 @@
 %{_rpmlibdir}/ia32e*
 %{_rpmlibdir}/x86_64*
 %endif
-%endif
 # must be here for "Requires: rpm-*prov" to work
 %{_rpmlibdir}/macros.java
 %{_rpmlibdir}/macros.mono
@@ -1162,6 +1202,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.847  2007/10/02 19:56:30  arekm
+- install arch specific macros
+
 Revision 1.846  2007/10/02 19:05:05  arekm
 - drop rpm-macros.patch; use SOURCES/rpm-pld.macros
 
================================================================

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