From 81c625136edda63110292d87e1a35be6bbeecd68 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Jun 10 2019 21:40:51 +0000 Subject: Switch back to 4.15-alpha Signed-off-by: Igor Gnatenko --- diff --git a/0001-python-Reference-proper-spec-py.c-filename.patch b/0001-python-Reference-proper-spec-py.c-filename.patch deleted file mode 100644 index 51b5e1e..0000000 --- a/0001-python-Reference-proper-spec-py.c-filename.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c4f7f871e0d0b7faaaa16e93736b8dd39db200e2 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 2 Jun 2019 15:47:42 +0200 -Subject: [PATCH] python: Reference proper spec-py.c filename - -Fixes: 73a41da965337aaacabd53924f1b67b967e0476e -Signed-off-by: Igor Gnatenko ---- - python/setup.py.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/setup.py.in b/python/setup.py.in -index 4d507c24e..0ecb7a9b9 100644 ---- a/python/setup.py.in -+++ b/python/setup.py.in -@@ -31,7 +31,7 @@ rpmmod = Extension('rpm._rpm', - 'rpmstrpool-py.c', 'rpmfiles-py.c', - 'rpmarchive-py.c', 'rpmtd-py.c', - 'rpmte-py.c', 'rpmts-py.c', -- 'spec-py', -+ 'spec-py.c', - 'rpmmodule.c'], - include_dirs = pkgconfig('--cflags'), - library_dirs = pkgconfig('--libs-only-L'), --- -2.22.0.rc3 - diff --git a/rpm.spec b/rpm.spec index 8fdc555..5ada8b3 100644 --- a/rpm.spec +++ b/rpm.spec @@ -21,7 +21,7 @@ %global rpmver 4.14.90 %global snapver git14653 -%global rel 8 +%global rel 9 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -42,8 +42,7 @@ Source1: db-%{bdbver}.tar.gz %endif # Disable autoconf config.site processing (#962837) -#Patch1: rpm-4.15.x-siteconfig.patch -Patch1: 0001-python-Reference-proper-spec-py.c-filename.patch +Patch1: rpm-4.15.x-siteconfig.patch # In current Fedora, man-pages pkg owns all the localized man directories Patch3: rpm-4.9.90-no-man-dirs.patch # Temporary band-aid for rpm2cpio whining on payload size mismatch (#1142949) diff --git a/sources b/sources index 30b353b..6ab2eae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-4.14.90-git14653.tar.bz2) = 63a3b2460bc6336def35fcf2aa4424f881cd9fe3b608dbf417192b41038d4880287ceef8b595fca755d913b41f79f1b401c8549d1eda71027d22f6076adec5f9 +SHA512 (rpm-4.14.90-git14653.tar.bz2) = 4c4051c405378ace00704991ab4204e59a7ca05a5b24d6f630244d8a27cb02aa5b51b7d029ca1f65e6795ca0f8a0da919ac07b103f0ec0dec23771b11c9d1c2a