X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-build-macros.spec;h=4c7072bb198e96a3a44d6508f6b88894a4a8bbd3;hb=f58a519511879538d3a39532404f28a5222eb8ce;hp=f3bf452631133fdf2dbbe1f23de52bbca42d981c;hpb=e675ef22064a3ee45935dbfd75587147ba2a08e2;p=packages%2Frpm-build-macros.git

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index f3bf452..4c7072b 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,5 +1,5 @@
-%define		rpm_macros_rev	1.490
-%define		find_lang_rev	1.32
+%define		rpm_macros_rev	1.617
+%define		find_lang_rev	1.34
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
@@ -11,6 +11,7 @@ Source0:	rpm.macros
 Source1:	service_generator.sh
 Source2:	rpm-build.sh
 Source3:	rpm-find-lang
+Source4:	dokuwiki-find-lang.sh
 #Patch0:		%{name}-pydebuginfo.patch
 BuildRequires:	rpm >= 4.4.9-56
 Requires:	findutils >= 1:4.2.26
@@ -25,6 +26,8 @@ Conflicts:	rpm < 4.4.9-72
 # php-config --sysconfdir
 Conflicts:	php-devel < 4:5.2.0-3
 Conflicts:	php4-devel < 3:4.4.4-10
+# sysconfig module with proper 'purelib' path
+Conflicts:	python3 < 1:3.2.1-3
 %if "%{pld_release}" != "ac"
 # libtool --install
 Conflicts:	libtool < 2:2.2
@@ -32,7 +35,8 @@ Conflicts:	libtool < 2:2.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_rpmlibdir %{_prefix}/lib/rpm
+# redefine to bootstrap
+%define		_usrlibrpm %{_prefix}/lib/rpm
 
 %description
 This package contains rpm build macros for PLD Linux.
@@ -42,7 +46,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
@@ -52,28 +64,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{%{_rpmlibdir},/etc/shrc.d}
-cp rpm.macros $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
-install %{SOURCE1} $RPM_BUILD_ROOT%{_rpmlibdir}/service_generator.sh
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
-install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
+install -d $RPM_BUILD_ROOT{%{_usrlibrpm},/etc/shrc.d}
+cp -a rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}
 
 %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
+%{_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