108 lines
4.9 KiB
Diff
108 lines
4.9 KiB
Diff
|
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 = \
|
||
|
|
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
|
||
|
|
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 = \
|
||
|
|
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
|
||
|
|
|
||
|
|
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=<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=<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=<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
|
||
|
|
@@ -0,0 +1,43 @@
|
||
|
|
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
|
||
|
|
+ *
|
||
|
|
+ * Copyright (C) 2016 Neal Gompa <ngompa13@gmail.com>
|
||
|
|
+ * Copyright (C) 2018 Kalev Lember <klember@redhat.com>
|
||
|
|
+ *
|
||
|
|
+ * Licensed under the GNU Lesser General Public License Version 2.1
|
||
|
|
+ *
|
||
|
|
+ * This library is free software; you can redistribute it and/or
|
||
|
|
+ * modify it under the terms of the GNU Lesser General Public
|
||
|
|
+ * License as published by the Free Software Foundation; either
|
||
|
|
+ * version 2.1 of the License, or (at your option) any later version.
|
||
|
|
+ *
|
||
|
|
+ * This library is distributed in the hope that it will be useful,
|
||
|
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
|
|
+ * Lesser General Public License for more details.
|
||
|
|
+ *
|
||
|
|
+ * You should have received a copy of the GNU Lesser General Public
|
||
|
|
+ * License along with this library; if not, write to the Free Software
|
||
|
|
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||
|
|
+ */
|
||
|
|
+
|
||
|
|
+#include "dnf-backend-vendor.h"
|
||
|
|
+
|
||
|
|
+gboolean
|
||
|
|
+dnf_validate_supported_repo (const gchar *id)
|
||
|
|
+{
|
||
|
|
+ const gchar *default_repos[] = { "rolling",
|
||
|
|
+ "rolling-games",
|
||
|
|
+ "rolling-i586",
|
||
|
|
+ "rolling-games-i586",
|
||
|
|
+ "unstable-makedist",
|
||
|
|
+ "unstable-makedist-i586",
|
||
|
|
+ NULL };
|
||
|
|
+
|
||
|
|
+ /* core repos that users shouldn't play with */
|
||
|
|
+ for (guint i = 0; default_repos[i] != NULL; i++) {
|
||
|
|
+ if (g_strcmp0 (id, default_repos[i]) == 0)
|
||
|
|
+ return TRUE;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return FALSE;
|
||
|
|
+}
|