- 1.536

[packages/rpm-build-macros.git] / rpm-build-macros.spec

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 06359fd6a31d76f4e6534ec303afe66cd5e6477c..9c44576e9c69669eb4982ef51cdcf8599a57b319 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,10 +1,10 @@
-%define                rpm_macros_rev  1.520
+%define                rpm_macros_rev  1.536
 %define                find_lang_rev   1.32
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
 Version:       %{rpm_macros_rev}
-Release:       2
+Release:       1
 License:       GPL
 Group:         Development/Building
 Source0:       rpm.macros
@@ -34,7 +34,7 @@ BuildArch:    noarch
 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.
@@ -44,7 +44,15 @@ Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
 %setup -qcT
-rev=$(awk '/^#.*Revision:.*Date/{print $3}' %{SOURCE0})
+cp %{SOURCE0} .
+#%patch0 -p1
+
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
+%endif
+
+%build
+rev=$(awk '/^#.*Revision:.*Date/{print $3}' rpm.macros)
 if [ "$rev" != "%rpm_macros_rev" ]; then
        : Update rpm_macros_rev define to $rev, and retry
        exit 1
@@ -54,30 +62,23 @@ if [ "$rev" != "%find_lang_rev" ]; then
        : Update find_lang_rev define to $rev, and retry
        exit 1
 fi
-cp %{SOURCE0} .
-
-%if "%{pld_release}" == "ac"
-%{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
-%endif
-
-#%patch0 -p1
 
 %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