X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=7f18ab293b0c735036a1300b66d479ff49b5eed6;hb=bba1059ca5e7aa6f9fef653e710e44a8ece0f974;hp=eab55b1ec24aab61cf54f45129d67dffd65229ff;hpb=086976808583daaa0e5103a1ab5f51e723ae5a60;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index eab55b1..7f18ab2 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,51 +1,14 @@ # # TODO: -# - check if glob() patch needs resurrecting/rewriting -# - check if we want shell autodeps: Requires: executable(ln) executable(mv) -# - %{_arch} = i686 not as used to be i386 (platform file thing?): -# 5.0.2: rpm -E '%_target_base_arch %_arch' -# i386 i686 -# 4.4.9: rpm -E '%_target_base_arch %_arch' -# i386 i386 -# - python(abi) cap is not provided automatically because /usr/lib*/libpython2*.so.* -# matches ELF first +# - make key infrastructure code fallback from keyutils to plain mode in case keyctl +# returns -ENOSYS # - add macros for some ppc, mipsel, alpha and sparc -# - uppackaged list: -# /usr/bin/multiarch-dispatch -# /usr/bin/multiarch-platform -# /usr/include/multiarch-dispatch.h -# /usr/lib/rpm/bin/api-sanity-autotest.pl -# /usr/lib/rpm/bin/api-sanity-checker.pl -# /usr/lib/rpm/bin/chroot -# /usr/lib/rpm/bin/cp -# /usr/lib/rpm/bin/dbconvert -# /usr/lib/rpm/bin/find -# /usr/lib/rpm/bin/mgo -# /usr/lib/rpm/bin/pom2spec -# /usr/lib/rpm/bin/sqlite3 -# /usr/lib/rpm/check-multiarch-files -# /usr/lib/rpm/dbconvert.sh -# /usr/lib/rpm/gem_helper.rb -# /usr/lib/rpm/gstreamer.sh -# /usr/lib/rpm/kmod-deps.sh -# /usr/lib/rpm/macros.d/cmake -# /usr/lib/rpm/macros.d/gstreamer -# /usr/lib/rpm/macros.d/kernel -# /usr/lib/rpm/macros.d/mandriva -# /usr/lib/rpm/macros.d/ruby -# /usr/lib/rpm/macros.d/tcl -# /usr/lib/rpm/mkmultiarch -# /usr/lib/rpm/pythoneggs.py -# /usr/lib/rpm/rubygems.rb # -# - headerGet() making poldek segfault http://rpm5.org/cvs/tktview?tn=38,1 -# - rpm doesn't exit when no sources/patches available http://rpm5.org/cvs/tktview?tn=40,1 -# - http://rpm5.org/cvs/tktview?tn=41&_submit=Show # - when adopting, use 4.5 ticket for checklist: https://bugs.launchpad.net/pld-linux/+bug/262985 # # Conditional build: %bcond_with static # build static rpm+rpmi -%bcond_with apidocs # don't generate documentation with doxygen +%bcond_without apidocs # don't generate documentation with doxygen %bcond_without python # don't build python bindings %bcond_without selinux # build without selinux support %bcond_without suggest_tags # build without Suggest tag (bootstrapping) @@ -53,7 +16,8 @@ %bcond_without db # BerkeleyDB %bcond_without sqlite # build with SQLite support %bcond_with sqlite_dbapi # default database backend is sqlite -%bcond_without system_lua # use system lua +%bcond_without system_lua # use system lua +%bcond_with keyutils # build with keyutils support # force_cc - force using __cc other than "%{_target_cpu}-pld-linux-gcc" # force_cxx - force using __cxx other than "%{_target_cpu}-pld-linux-g++" # force_cpp - force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E" @@ -67,11 +31,16 @@ ERROR %endif +%if %{with sqlite} +# Error: /lib64/librpmio-5.4.so: undefined symbol: sqlite3_enable_load_extension +%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR) +%endif + # versions of required libraries %define reqdb_ver 5.3 %define reqpopt_ver 1.15 %define beecrypt_ver 2:4.1.2-4 -%define sover 5.4 +%define sover 5.4 Summary: RPM Package Manager Summary(de.UTF-8): RPM Packet-Manager @@ -82,12 +51,14 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.10 -Release: 0.1 +Release: 12 License: LGPL Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm Source0: %{name}-%{version}.tar.gz # Source0-md5: 5d099161bdd3203265ab32ffad3360b5 +Source100: cpu-os-macros.tar.gz +# Source100-md5: 928034a5bdceb398881bc14b5f29973b Source1: %{name}.groups Source2: macros.pld.in Source3: %{name}-install-tree @@ -95,83 +66,185 @@ Source4: %{name}-find-spec-bcond Source5: %{name}-hrmib-cache Source6: %{name}-groups-po.awk Source7: %{name}-compress-doc -Source8: %{name}-check-files -Source9: %{name}-php-provides -Source10: %{name}-php-requires -Source11: %{name}.sysinfo -Source12: perl.prov -Source13: %{name}-user_group.sh -Source14: %{name}.sysconfig -Source15: %{name}-macros.java -Source16: %{name}-java-requires +Source8: %{name}-php-provides +Source9: %{name}-php-requires +Source10: %{name}.sysinfo +Source11: perl.prov +Source12: %{name}-user_group.sh +Source13: %{name}.sysconfig +Source14: %{name}-java-requires # http://svn.pld-linux.org/banner.sh/ -Source17: banner.sh -Source19: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc -# Source19-md5: 08b29584dd349aac9caa7610131a0a88 -Source20: %{name}-mimetypedeps -Source21: macros.local -Source22: rpm.noautocompressdoc -Source23: rpm.noautoprov -Source24: rpm.noautoprovfiles -Source25: rpm.noautoreq -Source26: rpm.noautoreqdep -Source27: rpm.noautoreqfiles -Source100: %{name}-macros-athlon -Source101: %{name}-macros-i386 -Source102: %{name}-macros-i486 -Source103: %{name}-macros-i586 -Source104: %{name}-macros-i686 -Source105: %{name}-macros-noarch -Source106: %{name}-macros-pentium3 -Source107: %{name}-macros-pentium4 -Source108: %{name}-macros-ppc -Source109: %{name}-macros-x86_64 -Source110: %{name}-macros-ia32e -Source111: %{name}-macros-amd64 -# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm -Source112: cpu-os-macros.tar.gz -# Source112-md5: 6fc7b779cd5476996fdc7872863e2106 - +Source15: banner.sh +Source16: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc +# Source16-md5: 08b29584dd349aac9caa7610131a0a88 +Source17: %{name}-mimetypedeps +Source18: macros.local +Source19: rpm.noautocompressdoc +Source20: rpm.noautoprov +Source21: rpm.noautoprovfiles +Source22: rpm.noautoreq +Source23: rpm.noautoreqdep +Source24: rpm.noautoreqfiles +Source25: %{name}-php-requires.php +Source26: rpmdb_checkversion.c Patch0: %{name}-branch.patch Patch1: %{name}-man_pl.patch Patch2: %{name}-popt-aliases.patch Patch3: %{name}-rpmpopt.patch Patch4: %{name}-perl-macros.patch Patch5: %{name}-perl-req-perlfile.patch -Patch7: %{name}-scripts-closefds.patch -Patch8: %{name}-php-macros.patch -Patch9: %{name}-gettext-in-header.patch -Patch11: %{name}-lua.patch - -Patch14: %{name}-etc_dir.patch -Patch16: %{name}-php-deps.patch -Patch19: %{name}-glob.patch - -Patch26: %{name}-notsc.patch -Patch27: %{name}-hack-norpmlibdep.patch - -Patch34: %{name}-epoch0.patch -Patch35: %{name}-perl_req-INC_dirs.patch -Patch36: %{name}-debuginfo.patch -Patch37: %{name}-doxygen_hack.patch +Patch6: %{name}-scripts-closefds.patch +Patch7: %{name}-php-macros.patch +Patch8: %{name}-gettext-in-header.patch +Patch9: %{name}-lua.patch +Patch10: %{name}-php-deps.patch +Patch11: %{name}-notsc.patch +Patch12: %{name}-hack-norpmlibdep.patch +Patch13: %{name}-epoch0.patch +Patch14: %{name}-perl_req-INC_dirs.patch +Patch15: %{name}-debuginfo.patch +Patch16: vendor-pld.patch +Patch17: %{name}-old-fileconflicts-behaviour.patch +Patch18: %{name}-javadeps.patch +Patch19: %{name}-truncate-cvslog.patch +Patch20: %{name}-libtool-deps.patch +Patch21: %{name}-mimetype.patch +Patch22: %{name}-sparc64.patch +Patch23: %{name}-gendiff.patch +Patch24: openmp.patch +Patch25: %{name}-URPM-build-fix.patch +Patch26: %{name}-db5.3.patch +Patch27: %{name}-helperEVR-noassert.patch +Patch28: %{name}-unglobal.patch +Patch29: %{name}-builddir-readlink.patch +Patch30: %{name}-changelog_order_check_nonfatal.patch +Patch31: %{name}-cleanbody.patch +Patch32: %{name}-dirdeps-macro.patch +Patch33: %{name}-installbeforeerase.patch +Patch34: %{name}-libmagic-locale.patch +Patch35: %{name}-namespace-compare.patch +Patch36: %{name}-popt-coreutils.patch +Patch37: %{name}-postun-nofail.patch +Patch38: %{name}-silence-RPM_CHAR_TYPE.patch +Patch39: %{name}-fix-missing-types-in-headers.patch +Patch40: %{name}-fix--p-interpreter-and-empty-script.patch +Patch41: %{name}-db_buffer_small.patch +Patch42: %{name}-pattern_Release.patch +Patch43: %{name}-fix-___build_pre-macro.patch +Patch44: %{name}-missing-patch-file-fails-build.patch +Patch45: %{name}-remove-misleading-missing-patch-message.patch +Patch46: %{name}-file-magic-can-be-mixed-case.patch +Patch47: %{name}-query-file-always-noisy.patch +Patch48: %{name}-verify-ghosts-broken-logic.patch +Patch49: %{name}-python-enable-compat-RPMSENSE.patch +Patch50: %{name}-dont-treat-gstreamer-modules-as-font.patch +Patch51: %{name}-gst-inspect-typo.patch + +# Patches imported from Mandriva + +# status: ready to merge, it's already been merged on HEAD, so commiting it to rpm-5_4 +# would basically just mean backporting it.. +Patch1000: rpm-5.4.4-add-_specfile-macro.patch +# status: needs to be cleaned up and properly reviewed together with rest +# of the patches related to dependency generation +Patch1001: rpm-5.4.9-avoid-dependencies-on-self.patch +# status: probably ready to merge +Patch1002: rpm-5.4.4-pkgconfigdeps-check-path.patch +# status: probably okay to merge, but discuss on rpm-devel first +Patch1003: rpm-5.4.4-glob-wildcards-for-loading-macro-files.patch +# status: needs to be discussed +Patch1004: rpm-5.4.4-allow-installation-of-repackaged-rpms.patch +# status: ready to merge +Patch1005: rpm-5.4.8-dont-show-suggests-with-requires.patch +# status: ready for merge +Patch1006: rpm-5.4.9-strip-buildroot-away-from-duplicate-files-list.patch +# status: probably okay to merge, but discuss on rpm-devel first +Patch1007: rpm-5.4.10-duplicate_files_terminate_build.patch +# status: same as above +Patch1008: rpm-5.4.10-unpackaged_subdirs_terminate_build.patch +# mdvbz#64898 +# status: uncertain, might be okay to merge, discuss on rpm-devel first +Patch1009: rpm-5.4.4-rpmbuild-withoutclean.patch +# no sense in having an additional dependency on 'pkgconfig' on all packages that +# have a pkgconfig file, it's not needed for them to be made useful and anything +# actuallly using pkgconfig for this purpose will pull it in as a dependency anyways... +# status: might be okay to merge, but discuss on rpm-devel first +Patch1010: rpm-5.4.4-drop-useless-auto-generated-pkgconfig-dependency.patch +# status: ready for merge +Patch1011: rpm-5.4.4-fix-rpmconstant-to-always-use-LC_CTYPE-C-for-case-conversion.patch +# $RPM_BUILD_DIR isn't necessarily the same as $PWD, it's %%{_builddir}, not +# %%{_builddir}/%%{?buildsubdir}, messing up paths in debug packages created.. +# status: needs to be discussed and investigated a bit better.. +Patch1012: rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch +# status: probably okay to merge, but discuss on rpm-devel first +Patch1013: rpm-5.4.10-files-listed-twice-terminates-build.patch +# status: probably okay to merge +Patch1014: rpm-5.4.9-ruby1.9-fixes.patch +# status: keep locally +Patch1015: rpm-5.4.9-keep-loading-script-macros.patch +# status: same as for other dep gen patches +Patch1016: rpm-5.4.9-update-rpmfc-when-removing-dependencies-on-self.patch +# status: idem +Patch1017: rpm-5.4.9-rpmfc-extract-dependencies-for-all-files.patch +# status: ready for merge +Patch1018: rpm-5.4.5-rubygems-add-missing-newline.patch +# status: probably okay to merge +Patch1019: rpm-5.4.5-python-export-spec-macros.patch +# status: idem +Patch1020: rpm-5.4.9-font-provides.patch +# stauus: idem +Patch1021: rpm-5.4.7-kmod-dependencies.patch +# status: probably okay to merge, discuss on rpm-devel first +Patch1022: rpm-5.4.5-skip-dependencies-for-character-devices.patch +# status: ready to merge +Patch1023: rpm-5.4.5-rpmfc-use-strlen-not-sizeof.patch +# status: probably okay to merge +Patch1024: rpm-5.4.5-rpmfc-apply-python-coloring-from-magic.patch +# status: ready to merge +Patch1025: rpm-5.4.7-rpmfc-fix-invalid-free-if-not-_defaultdocdir-set.patch +# status: probably okay to merge +Patch1026: rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch +# status: ready +Patch1027: rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch +# crash reproducable with 'rpm -qa --triggers' +# status: ready +Patch1028: rpm-5.4.7-hdrfmt-fix-unitialized-argv-element.patch +# status: same as for other dep gen patches +Patch1029: rpm-5.4.7-dont-consider-trigger-dependencies-as-overlapping.patch +# status: ready +Patch1030: rpm-5.4.7-fix-minor-memleaks.patch +# status: ready +Patch1031: rpm-5.4.9-mire-fix-strings-lacking-null-terminator.patch +# status: ready +Patch1032: rpm-5.4.9-rpmpython-fix-input.patch +# status: ready +Patch1033: rpm-5.4.7-no-seqid_init-on-rdonly-database.patch +# status: probably ready for merging +Patch1034: rpm-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch +# status: probably ready to merge, discuss on rpm-devel first +Patch1035: rpm-5.4.9-fix-verify-segfault.patch +# status: ready and should be merged +Patch1036: rpm-5.4.9-fix-typo-in-rpmtag-header.patch +# Due to rpmdav/neon being written in a different fashion than other rpmio clients, +# the inconsistent behaviour affects code elsewhere which expects consistent behaviour, +# with the result being that when unable to download files, neon will save error +# page as the target file. +# status: should go upstream, but uncertain about "correct" fix, ie. this is +# more of a workaround, while rewriting rpmdav code to behave consistently +# would be "the right thing to do". Yet I'm not fully able to grasp all of the +# code and don't want to spend more time just to get the API.. +Patch1037: rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch +# As the transaction flags for ignoring arch & os are no longer used, there's +# currently no way to ignore arch & os of packages anymore. This patch adds +# support for doing this again by defining rpm variables and overriding +# --ignorearch & --ignoreos to set these. +# status: needs to be discussed upstream before thinking about merging +Patch1038: rpm-5.4.10-support-ignore-arch-and-os-again.patch +# status: ready for merge +Patch1039: rpm-5.4.4-fix-same-package-with-epoch-possible-to-upgrade.patch +# we want that patch too, a bit of builder infrastructure relies on NOSIGNATURES +Patch1040: rpm-5.4.9-support-signatures-and-digest-disablers.patch -Patch41: vendor-pld.patch - -Patch42: %{name}-old-fileconflicts-behaviour.patch - -Patch46: %{name}-mono.patch -Patch47: %{name}-javadeps.patch - -Patch55: %{name}-truncate-cvslog.patch - -Patch59: %{name}-libtool-deps.patch -Patch60: %{name}-mimetype.patch -Patch61: %{name}-sparc64.patch -Patch62: %{name}-gendiff.patch -Patch70: %{name}-configure-autoconf.patch -Patch72: openmp.patch -Patch73: rpm-URPM-build-fix.patch -Patch74: rpm-db5.3.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1.4 @@ -181,7 +254,7 @@ BuildRequires: bzip2-devel >= 1.0.2-17 BuildRequires: elfutils-devel >= 0.108 #BuildRequires: gettext-autopoint >= 0.11.4-2 BuildRequires: gettext-devel >= 0.11.4-2 -BuildRequires: keyutils-devel +%{?with_keyutils:BuildRequires: keyutils-devel} BuildRequires: libmagic-devel %{?with_selinux:BuildRequires: libselinux-devel >= 1.18} # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros @@ -191,6 +264,7 @@ BuildRequires: libtool >= 1:1.4.2-9 BuildRequires: libxml2-devel BuildRequires: neon-devel >= 0.25.5 %endif +BuildRequires: ossp-uuid-devel BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} %{?with_system_lua:BuildRequires: lua51-devel >= 5.1.2} @@ -234,7 +308,6 @@ Conflicts: lzma-libs < 4.999.3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _binary_payload w9.gzdio -%define _noPayloadPrefix 1 # don't require very fresh rpm.macros to build %define __gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,} @@ -332,6 +405,7 @@ Requires: beecrypt >= %{beecrypt_ver} Requires: libmagic >= 1.15-2 %{?with_selinux:Requires: libselinux >= 1.18} Requires: popt >= %{reqpopt_ver} +%{?with_sqlite:Requires: sqlite3 >= %{sqlite_build_version}} Obsoletes: rpm-libs # avoid SEGV caused by mixed db versions Conflicts: poldek < 0.18.1-16 @@ -356,7 +430,7 @@ Requires: beecrypt-devel >= %{beecrypt_ver} Requires: bzip2-devel %{?with_db:Requires: db-devel >= %{reqdb_ver}} Requires: elfutils-devel -Requires: keyutils-devel +%{?with_keyutils:Requires: keyutils-devel} Requires: libmagic-devel %{?with_selinux:Requires: libselinux-devel} Requires: popt-devel >= %{reqpopt_ver} @@ -420,7 +494,7 @@ Requires: beecrypt-static >= %{beecrypt_ver} Requires: bzip2-static %{?with_db:Requires: db-static >= %{reqdb_ver}} Requires: elfutils-static -Requires: keyutils-static +%{?with_keyutils:Requires: keyutils-static} Requires: libmagic-static Requires: popt-static >= %{reqpopt_ver} Requires: zlib-static @@ -514,7 +588,7 @@ Summary(ru.UTF-8): Скрипты и утилиты, необходимые дл Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів Group: Applications/File Requires(pre): findutils -Requires: %{name}-build-macros >= 1.433-2 +Requires: %{name}-build-macros >= 1.653 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -613,6 +687,7 @@ Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: python Requires: python-modules +Requires: python-distribute %description pythonprov Python macros, which simplifies creation of RPM packages with Python @@ -683,68 +758,119 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze źrodeł RPM-a przez doxygen. %prep -%setup -q -n %{name}-%{version}%{?subver} +%setup -q -n %{name}-%{version}%{?subver} -a100 #patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%{?with_system_lua:%patch11 -p1} -# CHECK ME - macrofiles: ~/etc could be used -#%%patch14 -p1 +%{?with_system_lua:%patch9 -p1} +%patch10 -p1 +%ifnarch i386 i486 +# enable TSC for capable archs +%patch11 -p1 +%endif +%patch12 -p1 +%patch13 -p1 +%patch14 -p0 +%patch15 -p1 %patch16 -p1 -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 -echo '%%define __php_provides /usr/lib/rpm/php.prov' > macros.php -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 %{SOURCE9} scripts/php.prov.in -install %{SOURCE10} scripts/php.req.in -install %{SOURCE12} scripts/perl.prov - -%ifarch i386 i486 -# disable TSC -%patch26 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%ifarch sparc64 +%patch22 -p1 %endif +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 %patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 %patch34 -p1 -%patch35 -p0 +%patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 %patch41 -p1 %patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 %patch46 -p1 %patch47 -p1 -%patch55 -p1 -%patch59 -p1 -# Maybe, at last we can remove this? -#patch19 -p1 -%patch60 -p1 -%ifarch sparc64 -%patch61 -p1 -%endif -%patch62 -p1 -%patch70 -p1 -%patch72 -p1 -b .wiget -%patch73 -p1 -%patch74 -p1 - -cp -p %{SOURCE2} macros/pld.in - -cd scripts -mv -f perl.req perl.req.in -mv -f perl.prov perl.prov.in -cd .. +%patch48 -p1 +%patch49 -p1 +%patch50 -p1 +%patch51 -p1 + +%patch1000 -p1 +%patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 +%patch1004 -p1 +%patch1005 -p1 +%patch1006 -p1 +%patch1007 -p1 +%patch1008 -p1 +%patch1009 -p1 +%patch1010 -p1 +%patch1011 -p1 +%patch1012 -p1 +%patch1013 -p1 +%patch1014 -p1 +%patch1015 -p1 +%patch1016 -p1 +%patch1017 -p1 +%patch1018 -p1 +%patch1019 -p1 +%patch1020 -p1 +%patch1021 -p1 +%patch1022 -p1 +%patch1023 -p1 +%patch1024 -p1 +%patch1025 -p1 +%patch1026 -p1 +%patch1027 -p1 +%patch1028 -p1 +%patch1029 -p1 +%patch1030 -p1 +%patch1031 -p1 +%patch1032 -p1 +%patch1033 -p1 +%patch1034 -p1 +%patch1035 -p1 +%patch1036 -p1 +%patch1037 -p1 +%patch1038 -p1 +%patch1039 -p1 +%patch1040 -p1 + +install %{SOURCE2} macros/pld.in +install %{SOURCE8} scripts/php.prov.in +install %{SOURCE9} scripts/php.req.in +install %{SOURCE11} scripts/perl.prov.in + +%{__mv} -f scripts/perl.req{,.in} # generate Group translations to *.po awk -f %{SOURCE6} %{SOURCE1} +install %{SOURCE26} tools/rpmdb_checkversion.c + %build %{__libtoolize} #%{__autopoint} @@ -753,6 +879,13 @@ awk -f %{SOURCE6} %{SOURCE1} %{__autoconf} %{__automake} +# rpm checks for CPU type at runtime, but it looks better +sed -i \ + -e 's|@host@|%{_target_cpu}-%{_target_vendor}-%{_target_os}|' \ + -e 's|@host_cpu@|%{_target_cpu}|' \ + -e 's|@host_os@|%{_target_os}|' \ + macros/macros.in + %{?with_system_lua:CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"} # pass CC and CXX too in case of building with some older configure macro %configure \ @@ -760,6 +893,7 @@ awk -f %{SOURCE6} %{SOURCE1} CXX="%{__newcxx}" \ CPP="%{__newcpp}" \ WITH_PERL_VERSION=no \ + __GST_INSPECT=%{_bindir}/gst-inspect-1.0 \ --enable-shared \ --enable-static \ %{!?with_apidocs:--without-apidocs} \ @@ -780,10 +914,10 @@ awk -f %{SOURCE6} %{SOURCE1} --with-dbapi=%{!?with_sqlite_dbapi:db}%{?with_sqlite_dbapi:sqlite} \ --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \ --with-pcre=external \ - --with-keyutils=none \ + --with-keyutils=%{?with_keyutils:external}%{!?with_keyutils:no} \ + --with-uuid=%{_libdir}:%{_includedir}/ossp-uuid \ --without-path-versioned \ - --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \ - --with-extra-path-macros=%{_rpmlibdir}/platform/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.d/pld \ + --with-extra-path-macros='%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:~/etc/.rpmmacros:~/.rpmmacros' \ --with-bugreport="http://bugs.pld-linux.org/" \ --with-vendor=pld @@ -794,11 +928,14 @@ awk -f %{SOURCE6} %{SOURCE1} %{?with_apidocs:%{__make} apidocs} +%{__cc} %{rpmcflags} tools/rpmdb_checkversion.c -o tools/rpmdb_checkversion -ldb + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg} +install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm} \ + $RPM_BUILD_ROOT{/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg} -install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc +install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc %{__make} install \ pkgconfigdir=%{_pkgconfigdir} \ @@ -806,29 +943,29 @@ install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key # install ARCH macros install -d $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux -install %{SOURCE105} $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros +install cpu-os-macros/noarch-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros %ifarch %{ix86} install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{i386,i486,i586,i686,athlon,pentium3,pentium4}-linux -install %{SOURCE100} $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros -install %{SOURCE101} $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros -install %{SOURCE102} $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros -install %{SOURCE103} $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros -install %{SOURCE104} $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros -install %{SOURCE106} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros -install %{SOURCE107} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros +install cpu-os-macros/athlon-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros +install cpu-os-macros/i386-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros +install cpu-os-macros/i486-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros +install cpu-os-macros/i586-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros +install cpu-os-macros/i686-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros +install cpu-os-macros/pentium3-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros +install cpu-os-macros/pentium4-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros %endif %ifarch %{x8664} install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{x86_64,ia32e,amd64}-linux -install %{SOURCE109} $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros -install %{SOURCE110} $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros -install %{SOURCE111} $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros +install cpu-os-macros/x86_64-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros +install cpu-os-macros/ia32e-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros +install cpu-os-macros/amd64-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros %endif %ifarch %{ppc} install -d $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux -install %{SOURCE108} $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros +install cpu-os-macros/ppc-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros %endif cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform @@ -921,44 +1058,45 @@ 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} -install macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl -install macros.python $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python -install macros.php $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php -install macros.mono $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono -install %{SOURCE15} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java - install %{SOURCE1} doc/manual/groups install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc -install %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files -install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh -install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires +install %{SOURCE12} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh +install %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires install scripts/find-php* $RPM_BUILD_ROOT%{_rpmlibdir} install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} -install %{SOURCE20} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh +cp -p %{SOURCE25} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php +install %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache -install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm +install %{SOURCE13} $RPM_BUILD_ROOT/etc/sysconfig/rpm -install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh +install %{SOURCE15} $RPM_BUILD_ROOT%{_bindir}/banner.sh install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo -install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros -install %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc -install %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov -install %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles -install %{SOURCE25} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq -install %{SOURCE26} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep -install %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles +install %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros +install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc +install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov +install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles +install %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq +install %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep +install %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles 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 +install %{SOURCE10} $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 +install tools/rpmdb_checkversion $RPM_BUILD_ROOT%{_rpmlibdir}/bin + +# create macro loading wrappers for backward compatibility +for m in gstreamer java mono perl php python; do + echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m +done + # for rpm -e|-U --repackage install -d $RPM_BUILD_ROOT/var/{spool/repackage,lock/rpm} touch $RPM_BUILD_ROOT/var/lock/rpm/transaction @@ -971,13 +1109,6 @@ for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so librpmbuil ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a done -# remove arch dependant macros which have no use on noarch -%{__sed} -i -e ' -/{__spec_install_post_strip}/d -/{__spec_install_post_chrpath}/d -/{__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 @@ -990,6 +1121,10 @@ mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd} # utils dropped in 4.4.8 -- their manuals %{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/rpmgraph.8 +# utils dropped in 5.4 -- their manuals +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rpmgrep.1 +# script obsoleted by /usr/lib/rpm/bin/dbconvert binary +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/dbconvert.sh %find_lang %{name} @@ -1000,9 +1135,6 @@ cp -a doc/manual manual %clean rm -rf $RPM_BUILD_ROOT -%triggerpostun lib -- %{name}-lib < %{version} -rm -f /var/lib/rpm/__db* - %pretrans # this needs to be a dir if [ -f %{_sysconfdir}/rpm/sysinfo ]; then @@ -1011,6 +1143,25 @@ if [ -f %{_sysconfdir}/rpm/sysinfo ]; then mkdir %{_sysconfdir}/rpm/sysinfo fi +%posttrans +if [ -x %{_rpmlibdir}/bin/rpmdb_checkversion ] && \ + ! %{_rpmlibdir}/bin/rpmdb_checkversion -h /var/lib/rpm -d /var/lib/rpm ; then + if [ ! -e /var/lib/rpm.rpmbackup-%{version}-%{release} ] && \ + /bin/cp -a /var/lib/rpm /var/lib/rpm.rpmbackup-%{version}-%{release} ; then + echo + echo "Backup of the rpm database has been created in /var/lib/rpm.rpmbackup-%{version}-%{release}" + echo + fi + if [ -x %{_rpmlibdir}/bin/dbconvert ]; then + if ! %{_rpmlibdir}/bin/dbconvert --rebuilddb ; then + echo + echo "rpm database conversion failed!" + echo "You have to run %{_rpmlibdir}/bin/dbconvert manually" + echo + fi + fi +fi + %triggerpostun -- %{name} < 4.4.9-44 %{_rpmlibdir}/hrmib-cache @@ -1064,12 +1215,17 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/hrmib-cache +%dir %{_rpmlibdir}/bin +%attr(755,root,root) %{_rpmlibdir}/bin/dbconvert +%attr(755,root,root) %{_rpmlibdir}/bin/rpmdb_checkversion + %files base %defattr(644,root,root,755) %dir %{_sysconfdir}/rpm %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rpm %dir %{_rpmlibdir} %attr(755,root,root) %{_bindir}/banner.sh +%attr(755,root,root) %{_bindir}/multiarch-dispatch %attr(755,root,root) %{_rpmlibdir}/user_group.sh %dir /var/lib/banner @@ -1098,6 +1254,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_libdir}/librpmmisc-%{sover}.so %{_libdir}/librpm*.la %{_includedir}/rpm +%{_includedir}/multiarch-dispatch.h %{_pkgconfigdir}/*.pc %files static @@ -1111,14 +1268,17 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh %attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt %attr(755,root,root) %{_rpmlibdir}/tgpg -%dir %{_rpmlibdir}/bin +%attr(755,root,root) %{_rpmlibdir}/bin/chroot +%attr(755,root,root) %{_rpmlibdir}/bin/cp %attr(755,root,root) %{_rpmlibdir}/bin/debugedit +%attr(755,root,root) %{_rpmlibdir}/bin/find +%attr(755,root,root) %{_rpmlibdir}/bin/mgo %attr(755,root,root) %{_rpmlibdir}/bin/mtree %attr(755,root,root) %{_rpmlibdir}/bin/rpmcache %attr(755,root,root) %{_rpmlibdir}/bin/rpmcmp %attr(755,root,root) %{_rpmlibdir}/bin/rpmdeps %attr(755,root,root) %{_rpmlibdir}/bin/rpmdigest -%attr(755,root,root) %{_rpmlibdir}/bin/rpmkey +%{?with_keyutils:%attr(755,root,root) %{_rpmlibdir}/bin/rpmkey} %attr(755,root,root) %{_rpmlibdir}/bin/rpmrepo %{_mandir}/man8/rpm2cpio.8* %{_mandir}/man8/rpmcache.8* @@ -1160,9 +1320,14 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/mimetypedeps.sh # needs hacked pkg-config to return anything %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh -%dir %{_rpmlibdir}/bin +%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-autotest.pl +%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-checker.pl %attr(755,root,root) %{_rpmlibdir}/bin/install-sh %attr(755,root,root) %{_rpmlibdir}/bin/mkinstalldirs +%attr(755,root,root) %{_rpmlibdir}/bin/pom2spec +%attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump +%attr(755,root,root) %{_rpmlibdir}/bin/sqlite3 +%attr(755,root,root) %{_rpmlibdir}/bin/wget %attr(755,root,root) %{_rpmlibdir}/vcheck %{_rpmlibdir}/noarch-* %ifarch %{ix86} @@ -1190,28 +1355,46 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/ia32e* %{_rpmlibdir}/x86_64* %endif -# must be here for "Requires: rpm-*prov" to work -%{_rpmlibdir}/macros.java -%{_rpmlibdir}/macros.mono -%{_rpmlibdir}/macros.perl -%{_rpmlibdir}/macros.php # not used yet ... these six depend on perl %attr(755,root,root) %{_rpmlibdir}/http.req -%attr(755,root,root) %{_rpmlibdir}/mono* +# we always used scripts provided by mono-devel, maybe move them here +#%attr(755,root,root) %{_rpmlibdir}/mono-find-provides +#%attr(755,root,root) %{_rpmlibdir}/mono-find-requires + +%attr(755,root,root) %{_rpmlibdir}/fontconfig.prov +# must be here for "Requires: rpm-*prov" to work +%{_rpmlibdir}/macros.d/cmake +%{_rpmlibdir}/macros.d/gstreamer %{_rpmlibdir}/macros.d/java +%{_rpmlibdir}/macros.d/kernel %{_rpmlibdir}/macros.d/libtool %{_rpmlibdir}/macros.d/mono %{_rpmlibdir}/macros.d/perl %{_rpmlibdir}/macros.d/php %{_rpmlibdir}/macros.d/pkgconfig %{_rpmlibdir}/macros.d/python +%{_rpmlibdir}/macros.d/ruby %{_rpmlibdir}/macros.d/selinux +%{_rpmlibdir}/macros.d/tcl %{_rpmlibdir}/macros.rpmbuild +# compat wrappers +%{_rpmlibdir}/macros.gstreamer +%{_rpmlibdir}/macros.java +%{_rpmlibdir}/macros.mono +%{_rpmlibdir}/macros.perl +%{_rpmlibdir}/macros.php +%{_rpmlibdir}/macros.python + +%attr(755,root,root) %{_rpmlibdir}/check-multiarch-files +%attr(755,root,root) %{_rpmlibdir}/gem_helper.rb +%attr(755,root,root) %{_rpmlibdir}/gstreamer.sh +%attr(755,root,root) %{_rpmlibdir}/kmod-deps.sh +%attr(755,root,root) %{_rpmlibdir}/mkmultiarch +%attr(755,root,root) %{_rpmlibdir}/rubygems.rb %attr(755,root,root) %{_bindir}/gendiff +%attr(755,root,root) %{_bindir}/multiarch-platform %attr(755,root,root) %{_bindir}/rpmbuild -%attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump -%attr(755,root,root) %{_rpmlibdir}/bin/wget %dir %{_rpmlibdir}/helpers %attr(755,root,root) %{_rpmlibdir}/helpers/makeshlibs @@ -1236,7 +1419,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %files pythonprov %defattr(644,root,root,755) -%{_rpmlibdir}/macros.python +%attr(755,root,root) %{_rpmlibdir}/pythoneggs.py %attr(755,root,root) %{_rpmlibdir}/pythondeps.sh %files php-pearprov