packages: rpm-build-macros/rpm-build-macros.spec - %_usrlibrpm is in rpm 4....

[glen]

Author: glen                         Date: Mon Jun 15 15:35:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %_usrlibrpm is in rpm 4.4.9 too

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.219 -> 1.220) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.219 packages/rpm-build-macros/rpm-build-macros.spec:1.220
--- packages/rpm-build-macros/rpm-build-macros.spec:1.219	Mon Jun 15 17:13:25 2009
+++ packages/rpm-build-macros/rpm-build-macros.spec	Mon Jun 15 17:35:10 2009
@@ -35,7 +35,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # redefine to bootstrap
-%define		_rpmhome %{_prefix}/lib/rpm
+%define		_usrlibrpm %{_prefix}/lib/rpm
 
 %description
 This package contains rpm build macros for PLD Linux.
@@ -65,22 +65,22 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_rpmhome},/etc/shrc.d}
-cp rpm.macros $RPM_BUILD_ROOT%{_rpmhome}/macros.build
-install %{SOURCE1} $RPM_BUILD_ROOT%{_rpmhome}/service_generator.sh
+install -d $RPM_BUILD_ROOT{%{_usrlibrpm},/etc/shrc.d}
+cp rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
+install %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
-install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmhome}/find-lang.sh
-install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmhome}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
+install %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_rpmhome}/macros.build
-%attr(755,root,root) %{_rpmhome}/service_generator.sh
-%attr(755,root,root) %{_rpmhome}/find-lang.sh
-%attr(755,root,root) %{_rpmhome}/dokuwiki-find-lang.sh
+%{_usrlibrpm}/macros.build
+%attr(755,root,root) %{_usrlibrpm}/service_generator.sh
+%attr(755,root,root) %{_usrlibrpm}/find-lang.sh
+%attr(755,root,root) %{_usrlibrpm}/dokuwiki-find-lang.sh
 /etc/shrc.d/rpm-build.sh
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -89,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.220  2009/06/15 15:35:10  glen
+- %_usrlibrpm is in rpm 4.4.9 too
+
 Revision 1.219  2009/06/15 15:13:25  glen
 - release 2
 
================================================================

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