Merge branch 'rpm_python_source_read_from_spec' [#15]

rpm/rpm-python.spec

@@ -2,34 +2,12 @@ Summary: The RPM package management system python3 support
 Name: rpm-python
 Version: 4.16.1.3
 Release: 1
-Source0: %{name}-%{version}.tar.bz2
-Source1: libsymlink.attr
-Source2: rpmdb-rebuild.service
-Patch1:  0001-openSUSE-finddebuginfo-patch.patch
-Patch2:  0002-OpenSUSE-finddebuginfo-absolute-links.patch
-Patch3:  0003-OpenSUSE-debugsubpkg.patch
-Patch4:  0004-OpenSUSE-fileattrs.patch
-Patch5:  0005-OpenSUSE-elfdeps.patch
-Patch8:  0008-rpmbuild-Add-nobuildstage-to-not-execute-build-stage.patch
-Patch9:  0009-Compatibility-with-older-dd.patch
-Patch10: 0010-Omit-debug-info-from-main-package-and-enable-debugso.patch
-Patch11: 0011-Disable-systemdinhibit-plugin-to-minimize-dependenci.patch
-Patch13: 0013-Use-POSIX-compatible-arguments-for-find.patch
-Patch17: 0017-rpmsign-Close-file-before-replacing.patch
-Patch18: 0018-include-plugin-header.patch
-# Fix for error: liblzma: Memory allocation failed
-# Next version of rpm should have better handling of parallel processes
-# so then it could probably be removed.
-Patch19: 0019-Limit-to-4-threads-for-lzma-compression-to-make-sure.patch
-Patch20: 0020-Do-not-fail-on-magic-errors.patch
-Patch21: 0021-Revert-Don-t-set-target-in-configure-RhBug-458648.patch
-Patch22: 0022-brp-python-bytecompile-Ensure-reproducibility-of-inv.patch
+# Normally we could just read rpm.spec
+# for our sources but tar_git doesn't include rpm.spec
+# into this package
+%include rpm/shared.inc
 
-Url: https://github.com/sailfishos/rpm
 
-# Partially GPL/LGPL dual-licensed and some bits with BSD
-# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
-License: GPLv2+
 
 Requires: rpm = %{version}
 Requires: python3-base

rpm/rpm.spec

@@ -4,37 +4,7 @@ Summary: The RPM package management system
 Name: rpm
 Version: 4.16.1.3
 Release: 1
-Source0: %{name}-%{version}.tar.bz2
-Source1: libsymlink.attr
-Source2: rpmdb-rebuild.service
-Patch1:  0001-openSUSE-finddebuginfo-patch.patch
-Patch2:  0002-OpenSUSE-finddebuginfo-absolute-links.patch
-Patch3:  0003-OpenSUSE-debugsubpkg.patch
-Patch4:  0004-OpenSUSE-fileattrs.patch
-Patch5:  0005-OpenSUSE-elfdeps.patch
-Patch8:  0008-rpmbuild-Add-nobuildstage-to-not-execute-build-stage.patch
-Patch9:  0009-Compatibility-with-older-dd.patch
-Patch10: 0010-Omit-debug-info-from-main-package-and-enable-debugso.patch
-Patch11: 0011-Disable-systemdinhibit-plugin-to-minimize-dependenci.patch
-Patch13: 0013-Use-POSIX-compatible-arguments-for-find.patch
-Patch17: 0017-rpmsign-Close-file-before-replacing.patch
-Patch18: 0018-include-plugin-header.patch
-# Fix for error: liblzma: Memory allocation failed
-# Next version of rpm should have better handling of parallel processes
-# so then it could probably be removed.
-Patch19: 0019-Limit-to-4-threads-for-lzma-compression-to-make-sure.patch
-Patch20: 0020-Do-not-fail-on-magic-errors.patch
-Patch21: 0021-Revert-Don-t-set-target-in-configure-RhBug-458648.patch
-Patch22: 0022-brp-python-bytecompile-Ensure-reproducibility-of-inv.patch
-Patch23: 0023-Add-brp-remove-la-files-script.patch
-Patch24: 0024-Also-delete-symbol-links-that-could-point-to-la-file.patch
-
-Url: https://github.com/sailfishos/rpm
-
-# Partially GPL/LGPL dual-licensed and some bits with BSD
-# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
-License: GPLv2+
-##END_OF_INCLUDE_IN_PYTHON_SPEC##
+%include rpm/shared.inc
 
 Requires: curl
 Requires: coreutils

rpm/shared.inc

@@ -0,0 +1,31 @@
+Source0: %{name}-%{version}.tar.bz2
+Source1: libsymlink.attr
+Source2: rpmdb-rebuild.service
+Source100: shared.inc
+Patch1:  0001-openSUSE-finddebuginfo-patch.patch
+Patch2:  0002-OpenSUSE-finddebuginfo-absolute-links.patch
+Patch3:  0003-OpenSUSE-debugsubpkg.patch
+Patch4:  0004-OpenSUSE-fileattrs.patch
+Patch5:  0005-OpenSUSE-elfdeps.patch
+Patch8:  0008-rpmbuild-Add-nobuildstage-to-not-execute-build-stage.patch
+Patch9:  0009-Compatibility-with-older-dd.patch
+Patch10: 0010-Omit-debug-info-from-main-package-and-enable-debugso.patch
+Patch11: 0011-Disable-systemdinhibit-plugin-to-minimize-dependenci.patch
+Patch13: 0013-Use-POSIX-compatible-arguments-for-find.patch
+Patch17: 0017-rpmsign-Close-file-before-replacing.patch
+Patch18: 0018-include-plugin-header.patch
+# Fix for error: liblzma: Memory allocation failed
+# Next version of rpm should have better handling of parallel processes
+# so then it could probably be removed.
+Patch19: 0019-Limit-to-4-threads-for-lzma-compression-to-make-sure.patch
+Patch20: 0020-Do-not-fail-on-magic-errors.patch
+Patch21: 0021-Revert-Don-t-set-target-in-configure-RhBug-458648.patch
+Patch22: 0022-brp-python-bytecompile-Ensure-reproducibility-of-inv.patch
+Patch23: 0023-Add-brp-remove-la-files-script.patch
+Patch24: 0024-Also-delete-symbol-links-that-could-point-to-la-file.patch
+
+# Partially GPL/LGPL dual-licensed and some bits with BSD
+# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
+License: GPLv2+
+
+Url: https://github.com/sailfishos/rpm