Author: glen Date: Fri Feb 15 00:30:03 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- find-lang moved here from main pkg
---- Files affected:
SPECS:
rpm-build-macros.spec (1.153 -> 1.154)
---- Diffs:
================================================================
Index: SPECS/rpm-build-macros.spec
diff -u SPECS/rpm-build-macros.spec:1.153 SPECS/rpm-build-macros.spec:1.154
--- SPECS/rpm-build-macros.spec:1.153 Tue Feb 12 22:49:21 2008
+++ SPECS/rpm-build-macros.spec Fri Feb 15 01:29:58 2008
@@ -1,21 +1,24 @@
# $Revision$, $Date$
-%define rpm_macros_rev 1.433
+%define rpm_macros_rev 1.433
+%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: 1
+Release: 2
License: GPL
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
-# for _x_libraries macro
-Conflicts: rpm < 4.4.2-27.1
+# for find-lang collision
+Conflicts: rpm < 4.4.9-37
# php-config --sysconfdir
Conflicts: php-devel < 4:5.2.0-3
Conflicts: php4-devel < 3:4.4.4-10
@@ -32,19 +35,24 @@
%prep
%setup -qcT
-cp %{SOURCE0} rpm.macros
-rev=$(awk '/^#.*Revision:.*Date/{print $3}' rpm.macros)
+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
install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
-cp rpm.macros $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
+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
@@ -53,6 +61,7 @@
%defattr(644,root,root,755)
%{_rpmlibdir}/macros.build
%attr(755,root,root) %{_rpmlibdir}/service_generator.sh
+%attr(755,root,root) %{_rpmlibdir}/find-lang.sh
/etc/shrc.d/rpm-build.sh
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -61,6 +70,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.154 2008-02-15 00:29:58 glen
+- find-lang moved here from main pkg
+
Revision 1.153 2008-02-12 21:49:21 glen
- 1.433: use rpm tag magic to supress epoch (none), update for kernel-vanila
packaging
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm-build-macros.spec?r1=1.153&r2=1.154&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
