packages: rpm-build-macros/rpm-build-macros.spec - use _rpmhome as rpm itse...

[glen]

Author: glen                         Date: Mon Jun 15 15:07:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use _rpmhome as rpm itself has the same macro

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.217 packages/rpm-build-macros/rpm-build-macros.spec:1.218
--- packages/rpm-build-macros/rpm-build-macros.spec:1.217	Mon Jun 15 17:02:42 2009
+++ packages/rpm-build-macros/rpm-build-macros.spec	Mon Jun 15 17:07:10 2009
@@ -34,7 +34,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_rpmlibdir %{_prefix}/lib/rpm
+# redefine to bootstrap
+%define		_rpmhome %{_prefix}/lib/rpm
 
 %description
 This package contains rpm build macros for PLD Linux.
@@ -64,22 +65,22 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
-cp rpm.macros $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
-install %{SOURCE1} $RPM_BUILD_ROOT%{_rpmlibdir}/service_generator.sh
+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 %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
-install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
-install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmhome}/find-lang.sh
+install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmhome}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_rpmlibdir}/macros.build
-%attr(755,root,root) %{_rpmlibdir}/service_generator.sh
-%attr(755,root,root) %{_rpmlibdir}/find-lang.sh
-%attr(755,root,root) %{_rpmlibdir}/dokuwiki-find-lang.sh
+%{_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
 /etc/shrc.d/rpm-build.sh
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -88,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2009/06/15 15:07:10  glen
+- use _rpmhome as rpm itself has the same macro
+
 Revision 1.217  2009/06/15 15:02:42  glen
 - 1.520: add dokuwiki-find-lang.sh helper
 
================================================================

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