commit 38fbb7615ab5446a12ee2e1352f8d88425c69e42
Author: Elan Ruusamäe <[email protected]>
Date: Sun Jun 15 23:41:17 2014 +0300
trivial rpm5 fixes
dnf.spec | 6 ++++--
rpm5.patch | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/dnf.spec b/dnf.spec
index 207996d..d409066 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -8,13 +8,14 @@
Summary: Package manager forked from Yum, using libsolv as a dependency
resolver
Name: dnf
Version: 0.5.1
-Release: 0.2
+Release: 0.5
Group: Base
# For a breakdown of the licensing, see PACKAGE-LICENSING
-License: GPLv2+ and GPLv2 and GPL
+License: GPL v2+ and GPL v2 and GPL
#Source0: http://akozumpl.fedorapeople.org/%{name}-%{gitrev}.tar.xz
Source0:
http://pkgs.fedoraproject.org/repo/pkgs/dnf/%{name}-%{gitrev}.tar.xz/fdf85937f979702e1968150e8e150666/dnf-%{gitrev}.tar.xz
# Source0-md5: fdf85937f979702e1968150e8e150666
+Patch0: rpm5.patch
URL: https://github.com/akozumpl/dnf
BuildRequires: cmake
BuildRequires: gettext
@@ -48,6 +49,7 @@ resolver.
%prep
%setup -q -n %{name}
+%patch0 -p1
# the -D doesn't work
%{__sed} -i -e '/SYSTEMD_DIR/ s#/usr/lib/systemd/system#%{systemdunitdir}#'
CMakeLists.txt
diff --git a/rpm5.patch b/rpm5.patch
new file mode 100644
index 0000000..af2a311
--- /dev/null
+++ b/rpm5.patch
@@ -0,0 +1,41 @@
+--- dnf/dnf/base.py~ 2014-05-02 11:00:42.000000000 +0300
++++ dnf/dnf/base.py 2014-06-15 20:38:11.739642641 +0300
+@@ -347,8 +347,7 @@
+ 'justdb': rpm.RPMTRANS_FLAG_JUSTDB,
+ 'nocontexts': rpm.RPMTRANS_FLAG_NOCONTEXTS,
+ 'nocrypto' : rpm.RPMTRANS_FLAG_NOFILEDIGEST}
+- _TS_VSFLAGS_TO_RPM = {'nocrypto' : rpm._RPMVSF_NOSIGNATURES |
+- rpm._RPMVSF_NODIGESTS }
++ _TS_VSFLAGS_TO_RPM = {'nocrypto' : rpm.RPMVSF_NODSAHEADER }
+
+ @property
+ def ts(self):
+@@ -1455,7 +1454,7 @@
+ return 1
+
+ myts =
dnf.rpmUtils.transaction.initReadOnlyTransaction(root=self.conf.installroot)
+- myts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
++ myts.pushVSFlags(~rpm.RPMVSF_NODSAHEADER)
+ idx = myts.dbMatch('name', 'gpg-pubkey')
+ keys = len(idx)
+ del idx
+--- dnf/dnf/rpmUtils/transaction.py~ 2014-05-02 11:00:42.000000000 +0300
++++ dnf/dnf/rpmUtils/transaction.py 2014-06-15 20:38:31.170535603 +0300
+@@ -118,5 +118,5 @@
+
+ def initReadOnlyTransaction(root='/'):
+ read_ts = TransactionWrapper(root=root)
+- read_ts.pushVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
++ read_ts.pushVSFlags(rpm.RPMVSF_NODSAHEADER)
+ return read_ts
+--- dnf/dnf/yum/config.py~ 2014-05-02 11:00:42.000000000 +0300
++++ dnf/dnf/yum/config.py 2014-06-15 20:38:49.048023852 +0300
+@@ -1036,7 +1036,7 @@
+ @return: The release version as a string (eg. '4' for FC4)
+ '''
+ ts = dnf.rpmUtils.transaction.initReadOnlyTransaction(root=installroot)
+- ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
++ ts.pushVSFlags(~rpm.RPMVSF_NODSAHEADER)
+ try:
+ idx = ts.dbMatch('provides', distroverpkg)
+ except TypeError as e:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dnf.git/commitdiff/ce7d4706b45ca82f4b992c344e370da65288035b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
