Author: glen Date: Fri Feb 15 00:42:54 2008 GMT Module: SPECS Tag: rpm-4_4_9 ---- Log message: - find-lang moved to rpm-build-maros package; rel 38
---- Files affected: SPECS: rpm.spec (1.837.2.48 -> 1.837.2.49) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.837.2.48 SPECS/rpm.spec:1.837.2.49 --- SPECS/rpm.spec:1.837.2.48 Thu Feb 14 11:09:11 2008 +++ SPECS/rpm.spec Fri Feb 15 01:42:48 2008 @@ -26,7 +26,6 @@ %define reqdb_ver 4.6.18 %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: 35 +Release: 38 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: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc @@ -187,6 +185,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 @@ -458,7 +457,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 @@ -482,7 +481,6 @@ Requires: sh-utils Requires: tar Requires: textutils -Provides: rpmbuild(find_lang) = %{find_lang_rev} Provides: rpmbuild(monoautodeps) Provides: rpmbuild(noauto) = 3 %ifarch %{x8664} @@ -655,7 +653,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 @@ -728,12 +725,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 @@ -877,6 +868,7 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides* rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl +rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh # not installed since 4.4.8 (-tools-perl subpackage) install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir} @@ -1180,7 +1172,6 @@ %attr(755,root,root) %{_rpmlibdir}/config.* %attr(755,root,root) %{_rpmlibdir}/cross-build %attr(755,root,root) %{_rpmlibdir}/find-spec-bcond -%attr(755,root,root) %{_rpmlibdir}/find-lang.sh %attr(755,root,root) %{_rpmlibdir}/getpo.sh %attr(755,root,root) %{_rpmlibdir}/install-build-tree %attr(755,root,root) %{_rpmlibdir}/mkinstalldirs @@ -1284,6 +1275,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.837.2.49 2008-02-15 00:42:48 glen +- find-lang moved to rpm-build-maros package; rel 38 + Revision 1.837.2.48 2008-02-14 10:09:11 glen - package the key ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.48&r2=1.837.2.49&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
