]> git.pld-linux.org Git - packages/rpm.git/blobdiff - rpm.spec
- disabling dirname_deps was a typo, we use them for a long time now
[packages/rpm.git] / rpm.spec
index d3ea26f365d2a5cef3adfb620dca0e00fc8bc1e6..cff8c02e83044ae7b1eaf940d64cae275ae95f4a 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,19 +1,7 @@
 #
 # 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
 # - add macros for some ppc, mipsel, alpha and sparc
 #
-# - 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:
 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
@@ -55,7 +48,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.10
-Release:       0.10
+Release:       4
 License:       LGPL
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -90,6 +83,7 @@ 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
@@ -99,41 +93,45 @@ Patch5:             %{name}-perl-req-perlfile.patch
 Patch6:                %{name}-scripts-closefds.patch
 Patch7:                %{name}-php-macros.patch
 Patch8:                %{name}-gettext-in-header.patch
-Patch9:        %{name}-lua.patch
-Patch10:       %{name}-etc_dir.patch
-Patch11:       %{name}-php-deps.patch
-Patch12:       %{name}-glob.patch
-Patch13:       %{name}-notsc.patch
-Patch14:       %{name}-hack-norpmlibdep.patch
-Patch15:       %{name}-epoch0.patch
-Patch16:       %{name}-perl_req-INC_dirs.patch
-Patch17:       %{name}-debuginfo.patch
-Patch18:       vendor-pld.patch
-Patch19:       %{name}-old-fileconflicts-behaviour.patch
-Patch20:       %{name}-javadeps.patch
-Patch21:       %{name}-truncate-cvslog.patch
-Patch22:       %{name}-libtool-deps.patch
-Patch23:       %{name}-mimetype.patch
-Patch24:       %{name}-sparc64.patch
-Patch25:       %{name}-gendiff.patch
-Patch26:       openmp.patch
-Patch27:       %{name}-URPM-build-fix.patch
-Patch28:       %{name}-db5.3.patch
-Patch29:       %{name}-helperEVR-noassert.patch
-Patch30:       %{name}-unglobal.patch
-Patch31:       %{name}-builddir-readlink.patch
-Patch32:       %{name}-changelog_order_check_nonfatal.patch
-Patch33:       %{name}-cleanbody.patch
-Patch34:       %{name}-dirdeps-macro.patch
-Patch35:       %{name}-installbeforeerase.patch
-Patch36:       %{name}-libmagic-locale.patch
-Patch37:       %{name}-namespace-probe.patch
-Patch38:       %{name}-popt-coreutils.patch
-Patch39:       %{name}-postun-nofail.patch
-Patch40:       %{name}-silence-RPM_CHAR_TYPE.patch
-Patch41:       %{name}-fix-missing-types-in-headers.patch
-Patch42:       %{name}-disable-ldconfig-optimization.patch
-Patch43:       %{name}-fix--p-interpreter-and-empty-script.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
 
 # Patches imported from Mandriva
 
@@ -237,6 +235,8 @@ Patch1037:  rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
 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
 
 URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.60
@@ -301,7 +301,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,}
@@ -399,6 +398,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
@@ -581,7 +581,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
@@ -762,30 +762,28 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch7 -p1
 %patch8 -p1
 %{?with_system_lua:%patch9 -p1}
-# CHECK ME - macrofiles: ~/etc could be used
-#%%patch10 -p1
-%patch11 -p1
+%patch10 -p1
 %ifnarch i386 i486
 # enable TSC for capable archs
-%patch13 -p1
+%patch11 -p1
 %endif
-%patch14 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p0
 %patch15 -p1
-%patch16 -p0
+%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%ifarch sparc64
 %patch22 -p1
-# Maybe, at last we can remove this?
-#patch12 -p1
+%endif
 %patch23 -p1
-%ifarch sparc64
 %patch24 -p1
-%endif
 %patch25 -p1
-%patch26 -p1 -b .wiget
+%patch26 -p1
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
@@ -801,8 +799,12 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
-#%patch42 -p1
+%patch42 -p1
 %patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -844,6 +846,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1037 -p1
 %patch1038 -p1
 %patch1039 -p1
+%patch1040 -p1
 
 install %{SOURCE2} macros/pld.in
 install %{SOURCE8} scripts/php.prov.in
@@ -855,6 +858,8 @@ install %{SOURCE11} scripts/perl.prov.in
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE1}
 
+install %{SOURCE26} tools/rpmdb_checkversion.c
+
 %build
 %{__libtoolize}
 #%{__autopoint}
@@ -900,7 +905,7 @@ sed -i \
        --with-keyutils=none \
        --with-uuid=%{_libdir}:%{_includedir}/ossp-uuid \
        --without-path-versioned \
-       --with-extra-path-macros='%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
+       --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
 
@@ -911,9 +916,12 @@ sed -i \
 
 %{?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 %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
 
@@ -1070,6 +1078,13 @@ 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
@@ -1108,9 +1123,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
@@ -1119,6 +1131,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
 
@@ -1174,6 +1205,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %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)
@@ -1333,6 +1365,13 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_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
This page took 0.05462 seconds and 4 git commands to generate.