SPECS: rpm.spec - partialy fixed /usr/lib/rpm/*-linux/macros by ap...

[twittner]

Author: twittner                     Date: Sat Feb 23 23:29:01 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- partialy fixed /usr/lib/rpm/*-linux/macros by appending rpm.platform
  contents (correct me if I did this in wrong way).
  Probably `Multilibs' and `Build policy macros.' sections should be added.
- rel. 0.7

---- Files affected:
SPECS:
   rpm.spec (1.881 -> 1.882) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.881 SPECS/rpm.spec:1.882
--- SPECS/rpm.spec:1.881	Wed Feb 20 21:46:49 2008
+++ SPECS/rpm.spec	Sun Feb 24 00:28:56 2008
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 #
 # TODO:
-# - manuals are not compressed
 # - %{_arch} = i686 not as used to be i386:
 #   5.0.2: rpm -E '%_target_base_arch %_arch'
 #          i386 i686
@@ -64,7 +63,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.0.2
-Release:	0.6
+Release:	0.7
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-5.0/%{name}-%{version}.tar.gz
@@ -1002,12 +1001,16 @@
 	ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
+# Append rpm.platform contents to /usr/lib/rpm/${arch}-linux/macros
+for m in $RPM_BUILD_ROOT%{_rpmlibdir}/*/macros ; do
+	cat %{SOURCE2} | %{__sed} 's#@LIB@#%{_lib}#' >> $m
+done
 # remove arch dependant macros which have no use on noarch
-#%{__sed} -i -e '
-#/{__spec_install_post_strip}/d
-#/{__spec_install_post_chrpath}/d
-#/{__spec_install_post_compress_modules}/d
-#' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
+%{__sed} -i -e '
+/{__spec_install_post_strip}/d
+/{__spec_install_post_chrpath}/d
+/{__spec_install_post_compress_modules}/d
+' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
 
 # Bourne shell script vs ELF executable linked with rpm,rpmdb,rpmio
 mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio
@@ -1277,6 +1280,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.882  2008-02-23 23:28:56  twittner
+- partialy fixed /usr/lib/rpm/*-linux/macros by appending rpm.platform
+  contents (correct me if I did this in wrong way).
+  Probably `Multilibs' and `Build policy macros.' sections should be added.
+- rel. 0.7
+
 Revision 1.881  2008-02-20 20:46:49  glen
 - revert wrong branch commit
 
================================================================

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