diff --git a/PackageKit-1.1.12-dnf-openmamba.patch b/PackageKit-1.1.13-dnf-openmamba.patch similarity index 56% rename from PackageKit-1.1.12-dnf-openmamba.patch rename to PackageKit-1.1.13-dnf-openmamba.patch index 12ec51a..2c47db0 100644 --- a/PackageKit-1.1.12-dnf-openmamba.patch +++ b/PackageKit-1.1.13-dnf-openmamba.patch @@ -1,66 +1,28 @@ -diff -Nru PackageKit-1.1.12.orig/backends/dnf/Makefile.am PackageKit-1.1.12/backends/dnf/Makefile.am ---- PackageKit-1.1.12.orig/backends/dnf/Makefile.am 2018-10-02 10:48:01.000000000 +0200 -+++ PackageKit-1.1.12/backends/dnf/Makefile.am 2019-06-02 14:29:17.819392100 +0200 -@@ -3,7 +3,8 @@ - EXTRA_DIST = \ +diff -Nru PackageKit-1.1.13.orig/backends/dnf/Makefile.am PackageKit-1.1.13/backends/dnf/Makefile.am +--- PackageKit-1.1.13.orig/backends/dnf/Makefile.am 2020-01-08 14:56:23.000000000 +0100 ++++ PackageKit-1.1.13/backends/dnf/Makefile.am 2020-01-08 16:43:25.929000000 +0100 +@@ -4,6 +4,7 @@ dnf-backend-vendor-fedora.c \ dnf-backend-vendor-mageia.c \ -- dnf-backend-vendor-openmandriva.c -+ dnf-backend-vendor-openmandriva.c \ -+ dnf-backend-vendor-openmamba.c + dnf-backend-vendor-openmandriva.c \ ++ dnf-backend-vendor-openmamba.c \ + dnf-backend-vendor-rosa.c libpk_backend_dnf_la_SOURCES = \ dnf-backend-vendor.h \ - dnf-backend.c \ -diff -Nru PackageKit-1.1.12.orig/backends/dnf/Makefile.in PackageKit-1.1.12/backends/dnf/Makefile.in ---- PackageKit-1.1.12.orig/backends/dnf/Makefile.in 2018-11-28 09:00:22.000000000 +0100 -+++ PackageKit-1.1.12/backends/dnf/Makefile.in 2019-06-02 14:29:39.412510430 +0200 -@@ -482,7 +482,8 @@ - EXTRA_DIST = \ +diff -Nru PackageKit-1.1.13.orig/backends/dnf/Makefile.in PackageKit-1.1.13/backends/dnf/Makefile.in +--- PackageKit-1.1.13.orig/backends/dnf/Makefile.in 2020-01-08 15:01:27.000000000 +0100 ++++ PackageKit-1.1.13/backends/dnf/Makefile.in 2020-01-08 16:43:50.249000000 +0100 +@@ -489,6 +489,7 @@ dnf-backend-vendor-fedora.c \ dnf-backend-vendor-mageia.c \ -- dnf-backend-vendor-openmandriva.c -+ dnf-backend-vendor-openmandriva.c \ -+ dnf-backend-vendor-openmamba.c + dnf-backend-vendor-openmandriva.c \ ++ dnf-backend-vendor-openmamba.c \ + dnf-backend-vendor-rosa.c libpk_backend_dnf_la_SOURCES = \ - dnf-backend-vendor.h \ -diff -Nru PackageKit-1.1.12.orig/configure PackageKit-1.1.12/configure ---- PackageKit-1.1.12.orig/configure 2018-11-28 09:00:21.000000000 +0100 -+++ PackageKit-1.1.12/configure 2019-06-02 14:31:03.464965583 +0200 -@@ -1783,7 +1783,7 @@ - where D-BUS system-services directory is - --with-dnf-vendor= - select a vendor configuration (fedora, mageia, -- openmandriva; default is fedora) -+ openmandriva, openmamba; default is fedora) - - Some influential environment variables: - PKG_CONFIG path to pkg-config utility -@@ -22243,7 +22243,7 @@ - withval=$with_dnf_vendor; - fi - -- if test "$with_dnf_vendor" = "fedora" -o "$with_dnf_vendor" = "mageia" -o "$with_dnf_vendor" = "openmandriva"; then -+ if test "$with_dnf_vendor" = "fedora" -o "$with_dnf_vendor" = "mageia" -o "$with_dnf_vendor" = "openmandriva" -o "$with_dnf_vendor" = "openmamba"; then - with_dnf_vendor="$with_dnf_vendor" - else - with_dnf_vendor="fedora" -diff -Nru PackageKit-1.1.12.orig/configure.ac PackageKit-1.1.12/configure.ac ---- PackageKit-1.1.12.orig/configure.ac 2018-11-24 09:40:55.000000000 +0100 -+++ PackageKit-1.1.12/configure.ac 2019-06-02 14:30:31.679794436 +0200 -@@ -394,8 +394,8 @@ - if test x$enable_dnf = xyes; then - PKG_CHECK_MODULES(DNF, appstream-glib libdnf >= 0.22.0 rpm) - AC_ARG_WITH(dnf-vendor, -- [AS_HELP_STRING([--with-dnf-vendor=],[select a vendor configuration (fedora, mageia, openmandriva; default is fedora)])]) -- if test "$with_dnf_vendor" = "fedora" -o "$with_dnf_vendor" = "mageia" -o "$with_dnf_vendor" = "openmandriva"; then -+ [AS_HELP_STRING([--with-dnf-vendor=],[select a vendor configuration (fedora, mageia, openmandriva, openmamba; default is fedora)])]) -+ if test "$with_dnf_vendor" = "fedora" -o "$with_dnf_vendor" = "mageia" -o "$with_dnf_vendor" = "openmandriva" -o "$with_dnf_vendor" = "openmamba"; then - with_dnf_vendor="$with_dnf_vendor" - else - with_dnf_vendor="fedora" ---- /dev/null 2019-03-18 22:35:13.859000000 +0100 -+++ PackageKit-1.1.12/backends/dnf/dnf-backend-vendor-openmamba.c 2019-06-04 18:34:35.213036497 +0200 +diff -Nru PackageKit-1.1.13.orig/backends/dnf/dnf-backend-vendor-openmamba.c PackageKit-1.1.13/backends/dnf/dnf-backend-vendor-openmamba.c +--- PackageKit-1.1.13.orig/backends/dnf/dnf-backend-vendor-openmamba.c 1970-01-01 01:00:00.000000000 +0100 ++++ PackageKit-1.1.13/backends/dnf/dnf-backend-vendor-openmamba.c 2020-01-08 16:42:42.017000000 +0100 @@ -0,0 +1,43 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * @@ -105,3 +67,29 @@ diff -Nru PackageKit-1.1.12.orig/configure.ac PackageKit-1.1.12/configure.ac + + return FALSE; +} +diff -Nru PackageKit-1.1.13.orig/configure PackageKit-1.1.13/configure +--- PackageKit-1.1.13.orig/configure 2020-01-08 15:01:26.000000000 +0100 ++++ PackageKit-1.1.13/configure 2020-01-08 16:44:25.417000000 +0100 +@@ -1799,7 +1799,7 @@ + where D-BUS system-services directory is + --with-dnf-vendor= + select a vendor configuration (fedora, mageia, +- openmandriva, rosa; default is fedora) ++ openmandriva, openmamba, rosa; default is fedora) + + Some influential environment variables: + PKG_CONFIG path to pkg-config utility +diff -Nru PackageKit-1.1.13.orig/configure.ac PackageKit-1.1.13/configure.ac +--- PackageKit-1.1.13.orig/configure.ac 2020-01-08 14:56:23.000000000 +0100 ++++ PackageKit-1.1.13/configure.ac 2020-01-08 16:45:25.496000000 +0100 +@@ -426,8 +426,8 @@ + if test x$enable_dnf = xyes; then + PKG_CHECK_MODULES(DNF, appstream-glib libdnf >= 0.22.0 rpm) + AC_ARG_WITH(dnf-vendor, +- [AS_HELP_STRING([--with-dnf-vendor=],[select a vendor configuration (fedora, mageia, openmandriva, rosa; default is fedora)])]) +- if test "$with_dnf_vendor" = "fedora" -o "$with_dnf_vendor" = "mageia" -o "$with_dnf_vendor" = "openmandriva" -o "$with_dnf_vendor" = "rosa"; then ++ [AS_HELP_STRING([--with-dnf-vendor=],[select a vendor configuration (fedora, mageia, openmandriva, openmamba, rosa; default is fedora)])]) ++ if test "$with_dnf_vendor" = "fedora" -o "$with_dnf_vendor" = "mageia" -o "$with_dnf_vendor" = "openmandriva" -o "$with_dnf_vendor" = "openmamba" -o "$with_dnf_vendor" = "rosa"; then + with_dnf_vendor="$with_dnf_vendor" + else + with_dnf_vendor="fedora" diff --git a/PackageKit.spec b/PackageKit.spec index c769d1a..0448af1 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -1,6 +1,6 @@ Name: PackageKit -Version: 1.1.12 -Release: 7mamba +Version: 1.1.13 +Release: 1mamba Summary: A system designed to make installing and updating software on your computer easier Group: System/Management Vendor: openmamba @@ -23,7 +23,7 @@ Patch11: PackageKit-0.6.22-display_smart_errors_as_html.patch Patch12: PackageKit-0.8.11-smartBackend-fix-remove-packages.patch Patch13: PackageKit-0.9.5-smartBackend-correctly-raise-exceptions.patch Patch14: PackageKit-1.1.6-yumBackend-override_sigchecks.patch -Patch15: PackageKit-1.1.12-dnf-openmamba.patch +Patch15: PackageKit-1.1.13-dnf-openmamba.patch Patch16: PackageKit-1.1.12-dnf-repos-dir.patch Patch17: PackageKit-1.1.12-dnf-disable-trusted-packages-check.patch Patch18: PackageKit-1.1.12-upstream-dnf-invalidate-the-sack-cache-after-downloading-new-metadata.patch @@ -204,7 +204,7 @@ This package contains static libraries and header files need for development. %patch15 -p1 %patch16 -p1 %patch17 -p1 -%patch18 -p1 +#%patch18 -p1 %build %configure \ @@ -312,6 +312,9 @@ rm -f %{buildroot}/var/lib/PackageKit/transactions.db #%{_libdir}/pkgconfig/packagekit-plugin.pc %changelog +* Wed Jan 08 2020 Silvan Calarco 1.1.13-1mamba +- update to 1.1.13 + * Thu Aug 15 2019 Silvan Calarco 1.1.12-7mamba - removed invalid systemd post etc. scripts