SPECS (AC-branch): rpm.spec - find-lang moved to rpm-build-maros p...

[glen]

Author: glen                         Date: Fri Feb 15 00:36:01 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- find-lang moved to rpm-build-maros package; rel 37

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.7 -> 1.837.2.42.2.8) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.7 SPECS/rpm.spec:1.837.2.42.2.8
--- SPECS/rpm.spec:1.837.2.42.2.7	Thu Feb 14 14:07:24 2008
+++ SPECS/rpm.spec	Fri Feb 15 01:35:56 2008
@@ -26,7 +26,6 @@
 %define	reqdb_ver	4.5.20-3
 %define	reqpopt_ver	1.10.8
 %define	beecrypt_ver	2:4.1.2-4
-%define	find_lang_rev	1.27
 %define	sover	4.4
 Summary:	RPM Package Manager
 Summary(de.UTF-8):	RPM Packet-Manager
@@ -37,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	36
+Release:	37
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -46,7 +45,6 @@
 Source2:	%{name}.platform
 Source3:	%{name}-install-tree
 Source4:	%{name}-find-spec-bcond
-Source5:	%{name}-find-lang
 Source6:	%{name}-groups-po.awk
 Source7:	%{name}-compress-doc
 Source8:	RPM-GPG-KEY
@@ -190,6 +188,7 @@
 
 # don't require very fresh rpm.macros to build
 %define		__gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,}
+%define		find_lang sh ./scripts/find-lang.sh $RPM_BUILD_ROOT
 %define		ix86	i386 i486 i586 i686 athlon pentium3 pentium4
 %define		ppc	ppc ppc7400 ppc7450
 %define		x8664	amd64 ia32e x86_64
@@ -461,7 +460,7 @@
 Summary(uk.UTF-8):	Скрипти та утиліти, необхідні для побудови пакетів
 Group:		Applications/File
 Requires(pre):	findutils
-Requires:	%{name}-build-macros >= 1.417
+Requires:	%{name}-build-macros >= 1.433-2
 Requires:	%{name}-utils = %{version}-%{release}
 Requires:	/bin/id
 Requires:	awk
@@ -488,7 +487,6 @@
 Requires:	sh-utils
 Requires:	tar
 Requires:	textutils
-Provides:	rpmbuild(find_lang) = %{find_lang_rev}
 Provides:	rpmbuild(monoautodeps)
 Provides:	rpmbuild(noauto) = 3
 %ifarch %{x8664}
@@ -661,7 +659,6 @@
 echo '%%define	__php_requires	/usr/lib/rpm/php.req' >> macros.php
 echo '%%define	__mono_provides	/usr/lib/rpm/mono-find-provides' > macros.mono
 echo '%%define	__mono_requires	/usr/lib/rpm/mono-find-requires' >> macros.mono
-install %{SOURCE5} scripts/find-lang.sh
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
@@ -740,12 +737,6 @@
 done
 
 %build
-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 %{with system_libmagic}
 rm -rf file
 %else
@@ -1271,6 +1262,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.8  2008-02-15 00:35:56  glen
+- find-lang moved to rpm-build-maros package; rel 37
+
 Revision 1.837.2.42.2.7  2008-02-14 13:07:24  glen
 - rpm must have conflicts < poldek, and poldek must bave requires > rpm for upgrade to work; rel 36
 
================================================================

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