From 52f18d8b8bcab0a39f4e936463a585ac87f45184 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Apr 24 2023 10:04:50 +0000 Subject: Rebase to rpm 4.18.1 (https://rpm.org/wiki/Releases/4.18.1) --- diff --git a/.gitignore b/.gitignore index 9580bae..41a57b5 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /rpm-4.18.0-beta1.tar.bz2 /rpm-4.18.0-rc1.tar.bz2 /rpm-4.18.0.tar.bz2 +/rpm-4.18.1.tar.bz2 diff --git a/rpm-4.15.x-ldflags.patch b/rpm-4.15.x-ldflags.patch deleted file mode 100644 index c781ca8..0000000 --- a/rpm-4.15.x-ldflags.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up rpm-4.9.1.1/macros.in.jx rpm-4.9.1.1/macros.in ---- rpm-4.9.1.1/macros.in.jx 2011-08-03 16:19:05.000000000 -0400 -+++ rpm-4.9.1.1/macros.in 2011-08-08 09:41:52.981064316 -0400 -@@ -674,9 +674,10 @@ print (t)\ - RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\ - RPM_OPT_FLAGS=\"%{optflags}\"\ -+ RPM_LD_FLAGS=\"%{?build_ldflags}\"\ - RPM_ARCH=\"%{_arch}\"\ - RPM_OS=\"%{_os}\"\ - RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\ -- export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\ -+ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_LD_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_LD_FLAGS\ - RPM_DOC_DIR=\"%{_docdir}\"\ - export RPM_DOC_DIR\ - RPM_PACKAGE_NAME=\"%{NAME}\"\ diff --git a/rpm-4.17.x-siteconfig.patch b/rpm-4.17.x-siteconfig.patch deleted file mode 100644 index 7d38151..0000000 --- a/rpm-4.17.x-siteconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up rpm-4.11.1-rc1/macros.in.siteconfig rpm-4.11.1-rc1/macros.in ---- rpm-4.11.1-rc1/macros.in.siteconfig 2013-06-07 13:19:21.000000000 +0300 -+++ rpm-4.11.1-rc1/macros.in 2013-06-11 15:06:59.525747503 +0300 -@@ -647,6 +647,8 @@ package or when debugging this package.\ - export CLASSPATH}\ - PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\ - export PKG_CONFIG_PATH\ -+ CONFIG_SITE=${CONFIG_SITE:-NONE}\ -+ export CONFIG_SITE\ - \ - %[%{verbose}?"set -x":""]\ - umask 022\ diff --git a/rpm-4.18.x-ldflags.patch b/rpm-4.18.x-ldflags.patch new file mode 100644 index 0000000..8f62c45 --- /dev/null +++ b/rpm-4.18.x-ldflags.patch @@ -0,0 +1,16 @@ +diff -up rpm-4.18.1/macros.in.orig rpm-4.18.1/macros.in +--- rpm-4.18.1/macros.in.orig 2023-03-15 13:57:06.385361527 +0100 ++++ rpm-4.18.1/macros.in 2023-03-15 13:58:09.613971713 +0100 +@@ -727,10 +727,11 @@ package or when debugging this package.\ + RPM_SOURCE_DIR=\"%{_sourcedir}\"\ + RPM_BUILD_DIR=\"%{_builddir}\"\ + RPM_OPT_FLAGS=\"%{optflags}\"\ ++ RPM_LD_FLAGS=\"%{?build_ldflags}\"\ + RPM_ARCH=\"%{_arch}\"\ + RPM_OS=\"%{_os}\"\ + RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\ +- export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\ ++ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_LD_FLAGS\ + RPM_DOC_DIR=\"%{_docdir}\"\ + export RPM_DOC_DIR\ + RPM_PACKAGE_NAME=\"%{NAME}\"\ diff --git a/rpm-4.18.x-revert-custom-egg-info.patch b/rpm-4.18.x-revert-custom-egg-info.patch new file mode 100644 index 0000000..c0065c4 --- /dev/null +++ b/rpm-4.18.x-revert-custom-egg-info.patch @@ -0,0 +1,64 @@ +commit 568d26cc0b523a4ab4423c0128d90893ba0c74b7 +Author: Michal Domonkos +Date: Mon Apr 24 11:55:03 2023 +0200 + + Revert "Generate Python egg-info from automake builds" + + This reverts commits: + ab77e0dfb3c683ced4c7f6e3f72293c49550ff89 + 35c62dce0a327600bc0d947a8c01cc649c6e8646 + +diff --git a/configure.ac b/configure.ac +index e6676c581..6773ef8aa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -964,6 +964,5 @@ AC_CONFIG_FILES([Makefile + tests/Makefile + plugins/Makefile + python/setup.py +- python/rpm.egg-info + ]) + AC_OUTPUT +diff --git a/python/Makefile.am b/python/Makefile.am +index 04168406d..ec3608134 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -3,21 +3,14 @@ + include $(top_srcdir)/rpm.am + AM_CFLAGS = @RPMCFLAGS@ + +-CLEANFILES = +-EXTRA_DIST = rpm/__init__.py rpm/transaction.py rpm.egg-info.in ++EXTRA_DIST = rpm/__init__.py rpm/transaction.py + + AM_CPPFLAGS = -I$(top_srcdir)/include/ + AM_CPPFLAGS += -I$(top_srcdir)/python + AM_CPPFLAGS += @PYTHON_CFLAGS@ + +-egginfo = $(PACKAGE_NAME)-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg-info +-$(egginfo): +- cat rpm.egg-info > $(egginfo) +-CLEANFILES += $(egginfo) +- + pkgpyexec_LTLIBRARIES = _rpm.la + pkgpyexec_DATA = rpm/__init__.py rpm/transaction.py +-pyexec_DATA = $(egginfo) + + _rpm_la_LDFLAGS = -module -avoid-version -shared + _rpm_la_LIBADD = \ +diff --git a/python/rpm.egg-info.in b/python/rpm.egg-info.in +deleted file mode 100644 +index 0fb0922a3..000000000 +--- a/python/rpm.egg-info.in ++++ /dev/null +@@ -1,10 +0,0 @@ +-Metadata-Version: 1.0 +-Name: @PACKAGE_NAME@ +-Version: @PACKAGE_VERSION@ +-Summary: Python bindings for rpm +-Home-page: http://www.rpm.org/ +-Author: Rpm community +-Author-email: rpm-maint@lists.rpm.org +-License: GNU General Public License v2 +-Description: Python bindings for rpm +-Platform: UNKNOWN diff --git a/rpm-4.18.x-siteconfig.patch b/rpm-4.18.x-siteconfig.patch new file mode 100644 index 0000000..af6ebf0 --- /dev/null +++ b/rpm-4.18.x-siteconfig.patch @@ -0,0 +1,14 @@ +diff -up rpm-4.18.1/macros.in.orig rpm-4.18.1/macros.in +--- rpm-4.18.1/macros.in.orig 2023-03-15 13:52:55.211928040 +0100 ++++ rpm-4.18.1/macros.in 2023-03-15 13:55:04.113129930 +0100 +@@ -746,7 +746,9 @@ package or when debugging this package.\ + %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ + export CLASSPATH}\ + PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\ +- export PKG_CONFIG_PATH ++ export PKG_CONFIG_PATH\ ++ CONFIG_SITE=${CONFIG_SITE:-NONE}\ ++ export CONFIG_SITE + + %___build_pre \ + %{___build_pre_env} \ diff --git a/rpm.spec b/rpm.spec index 535c346..995cf5f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -28,7 +28,7 @@ %define rpmhome /usr/lib/rpm -%global rpmver 4.18.0 +%global rpmver 4.18.1 #global snapver rc1 %global baserelease 1 %global sover 9 @@ -51,16 +51,18 @@ Source21: rpmdb_migrate # Set rpmdb path to /usr/lib/sysimage/rpm Patch0: rpm-4.17.x-rpm_dbpath.patch # Disable autoconf config.site processing (#962837) -Patch1: rpm-4.17.x-siteconfig.patch +Patch1: rpm-4.18.x-siteconfig.patch # In current Fedora, man-pages pkg owns all the localized man directories Patch3: rpm-4.9.90-no-man-dirs.patch +# We still ship setup.py generated Python bindings in F37 +Patch4: rpm-4.18.x-revert-custom-egg-info.patch # Patches already upstream: # These are not yet upstream Patch906: rpm-4.7.1-geode-i686.patch # Probably to be upstreamed in slightly different form -Patch907: rpm-4.15.x-ldflags.patch +Patch907: rpm-4.18.x-ldflags.patch # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD @@ -610,6 +612,9 @@ fi %doc docs/librpm/html/* %changelog +* Mon Apr 24 2023 Michal Domonkos - 4.18.1-1 +- Rebase to rpm 4.18.1 (https://rpm.org/wiki/Releases/4.18.1) + * Wed Sep 21 2022 Panu Matilainen - 4.18.0-1 - Rebase to rpm 4.18.0 (https://rpm.org/wiki/Releases/4.18.0) diff --git a/sources b/sources index 51b6aac..fee455b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-4.18.0.tar.bz2) = c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec +SHA512 (rpm-4.18.1.tar.bz2) = 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c