SPECS (AC-branch): rpm.spec - versioned Provides rpmbuild(find_lan...

[glen]

Author: glen                         Date: Tue Nov 27 21:49:44 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- versioned Provides rpmbuild(find_lang)
- rel 48

---- Files affected:
SPECS:
   rpm.spec (1.555.2.200 -> 1.555.2.201) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.200 SPECS/rpm.spec:1.555.2.201
--- SPECS/rpm.spec:1.555.2.200	Sat Nov 24 23:34:14 2007
+++ SPECS/rpm.spec	Tue Nov 27 22:49:39 2007
@@ -22,6 +22,7 @@
 %define	reqpopt_ver	1.10.2
 %define	beecrypt_ver	2:4.1.2-4
 %define	sover	4.4
+%define	find_lang_rev	1.23
 Summary:	RPM Package Manager
 Summary(de):	RPM Packet-Manager
 Summary(es):	Gestor de paquetes RPM
@@ -31,7 +32,7 @@
 Summary(uk):	íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM
 Name:		rpm
 Version:	4.4.2
-Release:	47
+Release:	48
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -465,6 +466,7 @@
 Requires:	sh-utils
 Requires:	tar
 Requires:	textutils
+Provides:	rpmbuild(find_lang) = %{find_lang_rev}
 Provides:	rpmbuild(monoautodeps)
 Provides:	rpmbuild(noauto) = 3
 %ifarch %{x8664}
@@ -688,6 +690,7 @@
 %patch64 -p1
 %patch65 -p1
 cp %{SOURCE17} RPM-GPG-KEY
+install %{SOURCE5} scripts/find-lang.sh
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -709,7 +712,13 @@
 done
 
 %build
-%if ! %{with system_libmagic}
+rev=$(awk '/^#.*Id:.*/{print $4}' scripts/find-lang.sh)
+if [ "$rev" != "%find_lang_rev" ]; then
+	: Update find_lang_rev define to $rev, and retry
+	exit 1
+fi
+
+%if %{without system_libmagic}
 cd file
 %{__libtoolize}
 %{__aclocal}
@@ -788,7 +797,6 @@
 install %{SOURCE11} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
 install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-provides
 install %{SOURCE15} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
-install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
 install %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh
@@ -1161,6 +1169,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.201  2007-11-27 21:49:39  glen
+- versioned Provides rpmbuild(find_lang)
+- rel 48
+
 Revision 1.555.2.200  2007-11-24 22:34:14  ankry
 - added rpm-man_pl.patch, rel. 47
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.555.2.200&r2=1.555.2.201&f=u