X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-build-macros.spec;h=8374d0f4e2909db121a6b5bafd6cb24e89e5edb1;hb=e340772ed0bdc21aeaa3ba292e9deef64dbdaa06;hp=a43f5a28ee1abf943eb7099bbe0b64c0c9ad32e7;hpb=8870acc212e5e09979dbe54f49928901a354c7fc;p=packages%2Frpm-build-macros.git

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index a43f5a2..8374d0f 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,19 +1,29 @@
-%define		rpm_macros_rev 1.336
+%define		rpm_macros_rev	1.465
+%define		find_lang_rev	1.32
 Summary:	PLD Linux RPM build macros
-Summary(pl):	Makra do budowania pakietów RPM dla Linuksa PLD
+Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
 Release:	1
 License:	GPL
-Group:		Base
+Group:		Development/Building
 Source0:	rpm.macros
 Source1:	service_generator.sh
 Source2:	rpm-build.sh
+Source3:	rpm-find-lang
+Provides:	rpmbuild(find_lang) = %{find_lang_rev}
+Requires:	findutils >= 1:4.2.26
 Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Obsoletes:	rpm-macros
+Conflicts:	gettext-devel < 0.11
+# tmpdir/_tmppath macros problems
+Conflicts:	rpm < 4.4.9-52
+# php-config --sysconfdir
+Conflicts:	php-devel < 4:5.2.0-3
+Conflicts:	php4-devel < 3:4.4.4-10
+# libtool --install
+Conflicts:	libtool <  2:2.2
 BuildArch:	noarch
-# for _x_libraries macro
-Conflicts:	rpm < 4.4.2-27.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_rpmlibdir %{_prefix}/lib/rpm
@@ -21,15 +31,21 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 This package contains rpm build macros for PLD Linux.
 
-%description -l pl
-Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
+%description -l pl.UTF-8
+Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
+%setup -qcT
 rev=$(awk '/^#.*Revision:.*Date/{print $3}' %{SOURCE0})
 if [ "$rev" != "%rpm_macros_rev" ]; then
 	: Update rpm_macros_rev define to $rev, and retry
 	exit 1
 fi
+rev=$(awk '/^#.*Id:.*/{print $4}' %{SOURCE3})
+if [ "$rev" != "%find_lang_rev" ]; then
+	: Update find_lang_rev define to $rev, and retry
+	exit 1
+fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -37,6 +53,7 @@ install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
 cp %{SOURCE0} $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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,4 +62,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_rpmlibdir}/macros.build
 %attr(755,root,root) %{_rpmlibdir}/service_generator.sh
-%attr(755,root,root) /etc/shrc.d/rpm-build.sh
+%attr(755,root,root) %{_rpmlibdir}/find-lang.sh
+/etc/shrc.d/rpm-build.sh