Author: glen Date: Sun Feb 17 19:22:26 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - rpm-4_4_9 merge: find-lang moved to rpm-buildmacros relaxed gcc version (no rpmrc, pie not used, builds on ac) relaxed python dep (egg info not produced, python version from configure arg) obsoletes rpm-scripts (now rpm-base pkg) ppc macro back, defined in this spec check-files cleanup - sysinfo fully converted to dir - prefer shell version of rpm2cpio - epoch0 patch is back - resolved mess with libs packaging
---- Files affected: SPECS: rpm.spec (1.874 -> 1.875) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.874 SPECS/rpm.spec:1.875 --- SPECS/rpm.spec:1.874 Sun Feb 17 14:32:35 2008 +++ SPECS/rpm.spec Sun Feb 17 20:22:21 2008 @@ -22,17 +22,8 @@ # /usr/lib/rpm/mono-find-requires # /usr/lib/rpm/osgideps.pl # /usr/lib/rpm/perldeps.pl -# /usr/lib/rpm/rpm2cpio -# /usr/lib/rpm/symclash.py -# /usr/lib/rpm/symclash.sh # /usr/lib/rpm/vcheck -# /usr/share/man/ja/man8/rpmcache.8 -# /usr/share/man/ja/man8/rpmgraph.8 -# /usr/share/man/man8/rpmcache.8 -# /usr/share/man/man8/rpmconstant.8 -# /usr/share/man/man8/rpmgraph.8 -# /usr/share/man/pl/man8/rpmcache.8 -# /usr/share/man/pl/man8/rpmgraph.8 +# /usr/share/man/man8/rpmconstant.8.gz # # Conditional build: %bcond_with static # build static rpm+rpmi @@ -62,7 +53,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 5.0 Summary: RPM Package Manager Summary(de.UTF-8): RPM Packet-Manager @@ -73,7 +63,7 @@ Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.0.2 -Release: 0.1 +Release: 0.2 License: LGPL Group: Base Source0: http://rpm5.org/files/rpm/rpm-5.0/%{name}-%{version}.tar.gz @@ -82,7 +72,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: %{name}-check-files @@ -133,6 +122,7 @@ Patch27: %{name}-hack-norpmlibdep.patch Patch32: %{name}-pld-autodep.patch +Patch34: %{name}-epoch0.patch Patch35: %{name}-perl_req-INC_dirs.patch Patch36: %{name}-debuginfo.patch Patch37: %{name}-doxygen_hack.patch @@ -157,10 +147,6 @@ BuildRequires: bzip2-devel >= 1.0.2-17 %{?with_db:BuildRequires: db-devel >= %{reqdb_ver}} BuildRequires: elfutils-devel >= 0.108 -%ifnarch sparc64 -# -fPIE/-pie -BuildRequires: gcc >= 5:3.4 -%endif BuildRequires: gettext-autopoint >= 0.11.4-2 BuildRequires: gettext-devel >= 0.11.4-2 BuildRequires: libmagic-devel @@ -174,8 +160,8 @@ %endif BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} -%{?with_python:BuildRequires: python-devel >= 1:2.5} -BuildRequires: python-modules >= 1:2.5 +%{?with_python:BuildRequires: python-devel >= 1:2.3} +BuildRequires: python-modules >= 1:2.3 BuildRequires: rpm-perlprov %{?with_python:BuildRequires: rpm-pythonprov} %{?with_sqlite:BuildRequires: sqlite3-devel} @@ -207,6 +193,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 @@ -217,6 +204,7 @@ %define __newcpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E} %define _rpmlibdir /usr/lib/rpm +%define _noautocompressdoc RPM-GPG-KEY %define specflags -fno-strict-aliasing @@ -274,6 +262,7 @@ Summary(pl.UTF-8): Podstawowy pakiet RPM - skrypty używane przez same pakiety rpm Group: Base Requires: filesystem +Obsoletes: rpm-scripts Obsoletes: vserver-rpm %description base @@ -420,6 +409,7 @@ Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: popt >= %{reqpopt_ver} +Conflicts: filesystem-debuginfo < 3.0-16 %description utils Additional utilities for managing RPM packages and database. @@ -475,7 +465,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 @@ -489,7 +479,11 @@ Requires: file >= 4.17 Requires: fileutils Requires: findutils -Requires: gcc >= 5:3.4 +%ifarch athlon +Requires: gcc >= 3.0.3 +%else +Requires: gcc +%endif Requires: glibc-devel Requires: grep Requires: gzip @@ -500,7 +494,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 +648,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 @@ -667,6 +659,7 @@ %endif %patch27 -p1 %patch32 -p1 +%patch34 -p1 %patch35 -p0 %patch36 -p1 %patch37 -p1 @@ -674,7 +667,7 @@ %patch46 -p1 %patch47 -p1 # OLD COMMENTED OUT -#%%patch52 -p1 +#%%patch52 -p1 -- morearchs (rpmrc patch) adds ppc7400, ppc7400 %patch55 -p1 %patch58 -p1 %patch59 -p1 @@ -697,12 +690,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 - %{__libtoolize} %{__autopoint} %{__aclocal} @@ -736,7 +723,7 @@ --with-popt=external \ --with-db=%{?with_db:external}%{!?with_db:no} \ --with-sqlite=%{?with_sqlite:external}%{!?with_sqlite:no} \ - --with-dbapi=%{!?sqlite_dbapi:db}%{?sqlite_dbapi:sqlite} \ + --with-dbapi=%{!?with_sqlite_dbapi:db}%{?with_sqlite_dbapi:sqlite} \ --with-lua=internal \ --with-pcre=no \ --with-keyutils=none \ @@ -836,7 +823,7 @@ echo "powerpc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "ppc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif -%ifarch ppc +%ifarch %{ppc} ppc64 echo "powerpc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif @@ -872,6 +859,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} @@ -896,7 +884,14 @@ install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh -install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo +install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo + +touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname +touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames +install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos +touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Obsoletename +touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Providename +touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Requirename cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF # customized rpm macros - global for host @@ -993,9 +988,9 @@ install -d $RPM_BUILD_ROOT/var/{spool/repackage,lock/rpm} touch $RPM_BUILD_ROOT/var/lock/rpm/transaction -# mov rpm to /bin -mv -f $RPM_BUILD_ROOT%{_bindir}/rpm $RPM_BUILD_ROOT/bin -# move libs to /lib +# move rpm to /bin +mv $RPM_BUILD_ROOT%{_bindir}/rpm $RPM_BUILD_ROOT/bin +# move essential libs to /lib (libs that /bin/rpm links to) for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so librpmbuild-%{sover}.so; do mv -f $RPM_BUILD_ROOT%{_libdir}/$a $RPM_BUILD_ROOT/%{_lib} ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a @@ -1008,6 +1003,9 @@ #/{__spec_install_post_compress_modules}/d #' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros +# Bourne shell script vs ELF executable linked with rpm,rpmdb,rpmio +mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio + %py_ocomp $RPM_BUILD_ROOT%{py_sitedir} %py_comp $RPM_BUILD_ROOT%{py_sitedir} @@ -1015,8 +1013,10 @@ # wrong location, not used anyway rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd} -# manuals for utils dropped in 4.4.8 (?) -#rm $RPM_BUILD_ROOT%{_mandir}/{,*/}/man8/{rpmcache,rpmgraph}.8 +# utils dropped in 4.4.8 -- their manuals +rm $RPM_BUILD_ROOT%{_mandir}/{,*/}/man8/rpmgraph.8 +# unpackaged in 4.4.9, reasons unknown +rm $RPM_BUILD_ROOT%{_rpmlibdir}/symclash.{sh,py} %find_lang %{name} @@ -1055,8 +1055,9 @@ %dir %{_sysconfdir}/rpm %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros +%dir %{_sysconfdir}/rpm/sysinfo # these are ok to be replaced -%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo +%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo/* %config %verify(not md5 mtime size) %{_sysconfdir}/rpm/platform @@ -1092,25 +1093,28 @@ %files lib %defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/librpm*-*.so -%attr(755,root,root) %{_libdir}/librpm*-*.so +%attr(755,root,root) /%{_lib}/librpm-%{sover}.so +%attr(755,root,root) /%{_lib}/librpmdb-%{sover}.so +%attr(755,root,root) /%{_lib}/librpmio-%{sover}.so +%attr(755,root,root) /%{_lib}/librpmbuild-%{sover}.so %files devel %defattr(644,root,root,755) -%{_includedir}/rpm -%{_libdir}/librpm*.la -%{_pkgconfigdir}/*.pc %attr(755,root,root) %{_libdir}/librpm.so %attr(755,root,root) %{_libdir}/librpm-%{sover}.so +%attr(755,root,root) %{_libdir}/librpmbuild.so +%attr(755,root,root) %{_libdir}/librpmbuild-%{sover}.so %attr(755,root,root) %{_libdir}/librpmconstant.so %attr(755,root,root) %{_libdir}/librpmconstant-%{sover}.so +%attr(755,root,root) %{_libdir}/librpmdb.so +%attr(755,root,root) %{_libdir}/librpmdb-%{sover}.so %attr(755,root,root) %{_libdir}/librpmio.so %attr(755,root,root) %{_libdir}/librpmio-%{sover}.so %attr(755,root,root) %{_libdir}/librpmmisc.so %attr(755,root,root) %{_libdir}/librpmmisc-%{sover}.so -%attr(755,root,root) %{_libdir}/librpmdb.so -%attr(755,root,root) %{_libdir}/librpmdb-%{sover}.so -%attr(755,root,root) %{_libdir}/librpmbuild.so +%{_libdir}/librpm*.la +%{_includedir}/rpm +%{_pkgconfigdir}/*.pc %files static %defattr(644,root,root,755) @@ -1129,17 +1133,14 @@ %attr(755,root,root) %{_rpmlibdir}/tgpg %attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt %{_mandir}/man8/rpm2cpio.8* +%{_mandir}/man8/rpmcache.8* %{_mandir}/man8/rpmdeps.8* -#%{_mandir}/man8/rpmcache.8* -#%{_mandir}/man8/rpmgraph.8* %lang(ja) %{_mandir}/ja/man8/rpm2cpio.8* -#%lang(ja) %{_mandir}/ja/man8/rpmcache.8* -#%lang(ja) %{_mandir}/ja/man8/rpmgraph.8* +%lang(ja) %{_mandir}/ja/man8/rpmcache.8* %lang(ko) %{_mandir}/ko/man8/rpm2cpio.8* %lang(pl) %{_mandir}/pl/man8/rpm2cpio.8* +%lang(pl) %{_mandir}/pl/man8/rpmcache.8* %lang(pl) %{_mandir}/pl/man8/rpmdeps.8* -#%lang(pl) %{_mandir}/pl/man8/rpmcache.8* -#%lang(pl) %{_mandir}/pl/man8/rpmgraph.8* %lang(ru) %{_mandir}/ru/man8/rpm2cpio.8* %files utils-perl @@ -1163,7 +1164,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 @@ -1262,6 +1262,19 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.875 2008-02-17 19:22:21 glen +- rpm-4_4_9 merge: + find-lang moved to rpm-buildmacros + relaxed gcc version (no rpmrc, pie not used, builds on ac) + relaxed python dep (egg info not produced, python version from configure arg) + obsoletes rpm-scripts (now rpm-base pkg) + ppc macro back, defined in this spec + check-files cleanup +- sysinfo fully converted to dir +- prefer shell version of rpm2cpio +- epoch0 patch is back +- resolved mess with libs packaging + Revision 1.874 2008-02-17 13:32:35 glen - rpm-specdump would be rpm-build-tools dependency ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.874&r2=1.875&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
