Author: glen Date: Fri Oct 28 21:32:16 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from AC-branch
---- Files affected: SPECS: rpm.spec (1.707 -> 1.708) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.707 SPECS/rpm.spec:1.708 --- SPECS/rpm.spec:1.707 Sat Oct 22 21:14:24 2005 +++ SPECS/rpm.spec Fri Oct 28 23:32:09 2005 @@ -20,7 +20,6 @@ %define reqdb_ver 4.3.27-1 %define reqpopt_ver 1.10.2 %define beecrypt_ver 2:4.1.2-4 -%define rpm_macros_rev 1.247 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -31,7 +30,7 @@ Name: rpm %define sover 4.4 Version: 4.4.2 -Release: 16.1 +Release: 23.1 License: GPL Group: Base Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz @@ -46,7 +45,7 @@ Source8: %{name}-check-files Source9: %{name}-php-provides Source10: %{name}-php-requires -Source11: %{name}.macros + Source12: perl.prov Source13: %{name}-user_group.sh Source14: %{name}.sysconfig @@ -423,6 +422,7 @@ Summary(uk): óËŇÉĐÔÉ ÔÁ ŐÔÉĚŚÔÉ, ÎĹĎÂČŚÄÎŚ ÄĚŃ ĐĎÂŐÄĎ×É ĐÁËĹÔŚ× Group: Applications/File Requires(pre): findutils +Requires: %{name}-build-macros Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -446,14 +446,12 @@ Requires: sh-utils Requires: tar Requires: textutils -Provides: rpmbuild(macros) = %{rpm_macros_rev} Provides: rpmbuild(monoautodeps) Provides: rpmbuild(noauto) = 3 %ifarch %{x8664} Conflicts: automake < 1:1.7.9-2 Conflicts: libtool < 2:1.5-13 %endif -Obsoletes: rpmbuild(macros) < %{rpm_macros_rev} %description build Scripts for building binary RPM packages. @@ -636,7 +634,7 @@ %patch17 -p1 %patch18 -p1 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in -cp -f platform.in macros.pld.in +#cp -f platform.in macros.pld.in # what for? echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl echo '%%define __perl_requires %%{__perl} /usr/lib/rpm/perl.req' >> macros.perl echo '# obsoleted file' > macros.python @@ -647,7 +645,6 @@ install %{SOURCE9} scripts/php.prov.in install %{SOURCE10} scripts/php.req.in install %{SOURCE12} scripts/perl.prov -cat %{SOURCE11} >> macros.in %patch20 -p1 %patch21 -p1 %patch22 -p1 @@ -1150,6 +1147,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.708 2005/10/28 21:32:09 glen +- merged from AC-branch + Revision 1.707 2005/10/22 19:14:24 glen - rpm macros rev 1.247 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.707&r2=1.708&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
