|
@@ -8,7 +8,7 @@
|
|
|
%define with_python_version 2.7%{nil}
|
|
|
%define with_apidocs 1%{nil}
|
|
|
|
|
|
-%bcond_without int_bdb
|
|
|
+%bcond_with int_bdb
|
|
|
%define bdbver 5.3.28
|
|
|
|
|
|
# XXX legacy requires './' payload prefix to be omitted from rpm packages.
|
|
@@ -29,13 +29,13 @@
|
|
|
Summary: The RPM package management system.
|
|
|
Summary(ja): RPM パッケージ管理システム
|
|
|
Name: rpm
|
|
|
-Version: 4.11.2
|
|
|
+Version: 4.12.0.1
|
|
|
%define rpm_version %{version}
|
|
|
-Release: 1%{_dist_release}
|
|
|
+Release: 2%{_dist_release}
|
|
|
Group: System Environment/Base
|
|
|
License: GPL
|
|
|
|
|
|
-Source: http://rpm.org/releases/rpm-4.11.x/rpm-%{version}%{?_prever}.tar.bz2
|
|
|
+Source: http://rpm.org/releases/rpm-4.12.x/rpm-%{version}%{?_prever}.tar.bz2
|
|
|
%if %{with int_bdb}
|
|
|
Source1: db-%{bdbver}.tar.gz
|
|
|
%endif
|
|
@@ -47,10 +47,6 @@ Source130: COMPAT32_for_vine
|
|
|
Source200: rpm44-perldeps.pl
|
|
|
|
|
|
|
|
|
-#conditionally applied patch for arm hardware floating point
|
|
|
-Patch5: rpm-4.9.90-armhfp.patch
|
|
|
-Patch6: rpm-4.9.0-armhfp-logic.patch
|
|
|
-
|
|
|
# Patches already in upstream
|
|
|
|
|
|
# These are not yet upstream
|
|
@@ -66,8 +62,8 @@ Patch306: rpm-4.10.0-minidebuginfo.patch
|
|
|
Patch400: rpm-4.10.90-rpmlib-filesystem-check.patch
|
|
|
|
|
|
# Patches for Vine Linux
|
|
|
-Patch1100: rpm-4.10.0-vine.patch
|
|
|
-Patch1120: rpm-4.0.4-langC.patch
|
|
|
+Patch1100: rpm-4.12.0.1-vine.patch
|
|
|
+#Patch1120: rpm-4.0.4-langC.patch
|
|
|
#Patch1130: rpm-4.8.0-home.patch
|
|
|
Patch1140: rpm-4.9.1.2-shortcircuit.patch
|
|
|
Patch1170: rpm-4.9.1.2-legacyaliases.patch
|
|
@@ -75,12 +71,12 @@ Patch1180: rpm-4.4.3-no-terminate_build.patch
|
|
|
Patch1190: rpm-4.9.1.2-disable-python-requires.patch
|
|
|
#Patch1200: rpm-4.4.2-use-external-depgen.patch
|
|
|
Patch1210: rpm-4.4.2-deadlock-ppc.patch
|
|
|
-Patch1220: rpm-4.11.2-disable-debug.patch
|
|
|
-Patch1230: rpm-4.11.2-optflags.patch
|
|
|
+Patch1220: rpm-4.12.0.1-disable-debug.patch
|
|
|
+Patch1230: rpm-4.12.0.1-optflags.patch
|
|
|
Patch1240: rpm-4.8.0-default-buildarch.patch
|
|
|
Patch1250: rpm-4.4.2-add-default-srcdefattr.patch
|
|
|
Patch1270: rpm-4.4.2-vine-groups.patch
|
|
|
-Patch1290: rpm-4.4.2.3-find-mono-dependencies.patch
|
|
|
+#Patch1290: rpm-4.4.2.3-find-mono-dependencies.patch
|
|
|
Patch1310: rpm-4.10.0-brp-strip-static-archive-find-a-only.patch
|
|
|
Patch1320: rpm-4.9.1.2-force-v3-sigs.patch
|
|
|
Patch1330: rpm-4.9.1.2-enable-xz-payload.patch
|
|
@@ -93,7 +89,7 @@ Requires: popt >= 1.10.2.1
|
|
|
Requires: nss >= 3.12.5
|
|
|
Requires: rpm-libs = %{version}
|
|
|
%if %{without int_bdb}
|
|
|
-Requires: db4-utils
|
|
|
+Requires: libdb-utils
|
|
|
%endif
|
|
|
|
|
|
Obsoletes: rpm-perl < %{version}
|
|
@@ -117,10 +113,11 @@ BuildRequires: libcap-devel
|
|
|
BuildRequires: libacl-devel
|
|
|
BuildRequires: nss-devel
|
|
|
%if %{without int_bdb}
|
|
|
-BuildRequires: db4-devel >= 4.8
|
|
|
+BuildRequires: libdb-devel >= 5.3.28
|
|
|
%endif
|
|
|
BuildRequires: xz-devel
|
|
|
BuildRequires: file-devel
|
|
|
+BuildRequires: libarchive-devel
|
|
|
|
|
|
%if %{with_python_subpackage}
|
|
|
BuildRequires: python-devel >= %{with_python_version}
|
|
@@ -244,15 +241,9 @@ that will manipulate RPM packages and databases.
|
|
|
%patch306 -p1 -b .minidebuginfo
|
|
|
%patch400 -p1 -b .rpmlib-filesystem-check
|
|
|
|
|
|
-%patch5 -p1 -b .armhfp
|
|
|
-# this patch cant be applied on softfp builds
|
|
|
-%ifnarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
|
|
|
-%patch6 -p1 -b .armhfp-logic
|
|
|
-%endif
|
|
|
-
|
|
|
# vine patch
|
|
|
%patch1100 -p1 -b .vine
|
|
|
-%patch1120 -p1 -b .langC
|
|
|
+#%patch1120 -p1 -b .langC
|
|
|
#%patch1130 -p1 -b .home
|
|
|
%patch1140 -p1 -b .shortcircuit
|
|
|
%patch1170 -p1 -b .legacyaliases
|
|
@@ -267,7 +258,7 @@ that will manipulate RPM packages and databases.
|
|
|
%patch1240 -p1 -b .default-buildarch
|
|
|
%patch1250 -p1 -b .default-srcdefattr
|
|
|
%patch1270 -p1 -b .vine-groups
|
|
|
-%patch1290 -p1 -b .mono-dependencies
|
|
|
+#%patch1290 -p1 -b .mono-dependencies
|
|
|
%patch1310 -p1 -b .find-a-only
|
|
|
%patch1320 -p1 -b .force-v3-sigs
|
|
|
%patch1330 -p1 -b .enable-xz-payload
|
|
@@ -362,13 +353,10 @@ done
|
|
|
|
|
|
# plant links to db utils as rpmdb_foo so existing documantion is usable
|
|
|
%if %{without int_bdb}
|
|
|
-for dbutil in \
|
|
|
- archive deadlock dump load printlog \
|
|
|
- recover stat upgrade verify
|
|
|
+for dbutil in dump load recover stat upgrade verify
|
|
|
do
|
|
|
ln -s ../../bin/db_${dbutil} $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_${dbutil}
|
|
|
done
|
|
|
-#ln -s ../../bin/berkeley_db_svc $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_svc
|
|
|
%endif
|
|
|
|
|
|
# set i386 for _arch in i?86-linux/macros
|
|
@@ -414,7 +402,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
# XXX this is klunky and ugly, rpm itself should handle this
|
|
|
dbstat=/usr/lib/rpm/rpmdb_stat
|
|
|
if [ -x "$dbstat" ]; then
|
|
|
- if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "doesn't match environment version \| Invalid argument"; then
|
|
|
+ if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "doesn't match environment"; then
|
|
|
rm -f /var/lib/rpm/__db.*
|
|
|
fi
|
|
|
fi
|
|
@@ -475,6 +463,7 @@ exit 0
|
|
|
%define rpmdbattr %attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace)
|
|
|
%rpmdbattr /var/lib/rpm/*
|
|
|
|
|
|
+%rpmattr %{__bindir}/rpm2archive
|
|
|
%rpmattr %{__bindir}/rpm2cpio
|
|
|
%rpmattr %{__bindir}/gendiff
|
|
|
%rpmattr %{__bindir}/rpmdb
|
|
@@ -502,10 +491,15 @@ exit 0
|
|
|
|
|
|
%rpmattr %{__prefix}/lib/rpm/rpmdb_*
|
|
|
|
|
|
+%lang(ar) %{__prefix}/*/locale/ar/LC_MESSAGES/rpm.mo
|
|
|
+%lang(br) %{__prefix}/*/locale/br/LC_MESSAGES/rpm.mo
|
|
|
%lang(ca) %{__prefix}/*/locale/ca/LC_MESSAGES/rpm.mo
|
|
|
+%lang(cmn) %{__prefix}/*/locale/cmn/LC_MESSAGES/rpm.mo
|
|
|
%lang(cs) %{__prefix}/*/locale/cs/LC_MESSAGES/rpm.mo
|
|
|
%lang(da) %{__prefix}/*/locale/da/LC_MESSAGES/rpm.mo
|
|
|
%lang(de) %{__prefix}/*/locale/de/LC_MESSAGES/rpm.mo
|
|
|
+%lang(el) %{__prefix}/*/locale/el/LC_MESSAGES/rpm.mo
|
|
|
+%lang(eo) %{__prefix}/*/locale/eo/LC_MESSAGES/rpm.mo
|
|
|
%lang(es) %{__prefix}/*/locale/es/LC_MESSAGES/rpm.mo
|
|
|
%lang(fi) %{__prefix}/*/locale/fi/LC_MESSAGES/rpm.mo
|
|
|
%lang(fr) %{__prefix}/*/locale/fr/LC_MESSAGES/rpm.mo
|
|
@@ -525,7 +519,11 @@ exit 0
|
|
|
%lang(sr) %{__prefix}/*/locale/sr/LC_MESSAGES/rpm.mo
|
|
|
%lang(sr@latin) %{__prefix}/*/locale/sr@latin/LC_MESSAGES/rpm.mo
|
|
|
%lang(sv) %{__prefix}/*/locale/sv/LC_MESSAGES/rpm.mo
|
|
|
+%lang(te) %{__prefix}/*/locale/te/LC_MESSAGES/rpm.mo
|
|
|
%lang(tr) %{__prefix}/*/locale/tr/LC_MESSAGES/rpm.mo
|
|
|
+%lang(uk) %{__prefix}/*/locale/uk/LC_MESSAGES/rpm.mo
|
|
|
+%lang(vi) %{__prefix}/*/locale/vi/LC_MESSAGES/rpm.mo
|
|
|
+%lang(zh_CN) %{__prefix}/*/locale/zh_CN/LC_MESSAGES/rpm.mo
|
|
|
%lang(zh_TW) %{__prefix}/*/locale/zh_TW/LC_MESSAGES/rpm.mo
|
|
|
|
|
|
%{__mandir}/man1/gendiff.1*
|
|
@@ -550,6 +548,7 @@ exit 0
|
|
|
%defattr(-,root,root)
|
|
|
%rpmattr %{__bindir}/rpmbuild
|
|
|
%rpmattr %{__bindir}/rpmspec
|
|
|
+%rpmattr %{__prefix}/lib/rpm/appdata.prov
|
|
|
%rpmattr %{__prefix}/lib/rpm/brp-*
|
|
|
%rpmattr %{__prefix}/lib/rpm/check-files
|
|
|
%rpmattr %{__prefix}/lib/rpm/check-prereqs
|
|
@@ -609,6 +608,14 @@ exit 0
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Nov 24 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 4.12.0.1-2
|
|
|
+- add new utils (rpm2archive)
|
|
|
+
|
|
|
+* Mon Nov 23 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 4.12.0.1-1
|
|
|
+- update to 4.12.0.1
|
|
|
+- add BR: libarchive-devel
|
|
|
+- use external bdb by default
|
|
|
+
|
|
|
* Mon Jun 23 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 4.11.2-1
|
|
|
- update to 4.11.2
|
|
|
- update internal bdb to 5.3.28
|