From: Jakub Bogusz Date: Sat, 31 Jan 2015 21:17:21 +0000 (+0100) Subject: - started update to 1.0.4 (0.8.x left on PackageKit-0.8 branch) X-Git-Tag: auto/th/PackageKit-1.0.5-1~5 X-Git-Url: http://git.pld-linux.org/?p=packages%2FPackageKit.git;a=commitdiff_plain;h=02b3d2d3ee303fb57c692ff723ae6c5f3ff5a931 - started update to 1.0.4 (0.8.x left on PackageKit-0.8 branch) - removed outdated hawkey-rpm5,smart-at-fix,gstreamer,connman patches - added poldek patch (avoid using removed API) - hawkey,smart,yum backends are gone --- diff --git a/PackageKit-connman.patch b/PackageKit-connman.patch deleted file mode 100644 index fe70ba4..0000000 --- a/PackageKit-connman.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- PackageKit-0.8.11/configure.ac.orig 2013-09-30 19:41:13.749012674 +0200 -+++ PackageKit-0.8.11/configure.ac 2013-09-30 20:07:40.942279385 +0200 -@@ -254,7 +254,7 @@ - dnl --------------------------------------------------------------------------- - AC_ARG_ENABLE(connman, AS_HELP_STRING([--disable-connman],[Disable ConnMan support]), enable_connman=$enableval) - if test x$enable_connman != xno; then -- PKG_CHECK_MODULES(CONNMAN, connman, PK_BUILD_CONNMAN="yes", PK_BUILD_CONNMAN="no") -+ PKG_CHECK_MODULES(CONNMAN, [connman dbus-glib-1], PK_BUILD_CONNMAN="yes", PK_BUILD_CONNMAN="no") - if test "x$PK_BUILD_CONNMAN" = "xyes"; then - networking_apis="${networking_apis},ConnMan" - AC_DEFINE(PK_BUILD_CONNMAN, 1, [define if Connection Manager is installed]) diff --git a/PackageKit-gstreamer.patch b/PackageKit-gstreamer.patch deleted file mode 100644 index 13b3c8f..0000000 --- a/PackageKit-gstreamer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- PackageKit-0.8.4/configure.ac.old 2012-10-07 18:17:22.017654117 +0200 -+++ PackageKit-0.8.4/configure.ac 2012-10-07 18:17:38.374232181 +0200 -@@ -419,7 +419,7 @@ dnl ------------------------------------ - AC_ARG_ENABLE(gstreamer_plugin, AS_HELP_STRING([--enable-gstreamer-plugin],[Build gstreamer plugin functionality]), - enable_gstreamer_plugin=$enableval,enable_gstreamer_plugin=yes) - if test x$enable_gstreamer_plugin = xyes; then -- PKG_CHECK_MODULES(PK_GSTREAMER_PLUGIN, gstreamer-0.10 gstreamer-plugins-base-0.10 glib-2.0 gio-2.0, -+ PKG_CHECK_MODULES(PK_GSTREAMER_PLUGIN, gstreamer-1.0 gstreamer-plugins-base-1.0 glib-2.0 gio-2.0, - build_gstreamer_plugin=yes, build_gstreamer_plugin=no) - else - build_gstreamer_plugin=no diff --git a/PackageKit-hawkey-rpm5.patch b/PackageKit-hawkey-rpm5.patch deleted file mode 100644 index 71b3f3f..0000000 --- a/PackageKit-hawkey-rpm5.patch +++ /dev/null @@ -1,514 +0,0 @@ ---- PackageKit-0.8.15/backends/hawkey/hif-keyring.c.orig 2013-12-05 14:36:16.000000000 +0100 -+++ PackageKit-0.8.15/backends/hawkey/hif-keyring.c 2014-01-19 17:21:44.407060059 +0100 -@@ -27,8 +27,12 @@ - - #include - #include --#include -+#include "rpmorg-compat.h" -+#include -+#include -+#include - #include -+#include - - #include "hif-keyring.h" - #include "hif-utils.h" -@@ -37,17 +41,14 @@ - * hif_keyring_add_public_key: - **/ - gboolean --hif_keyring_add_public_key (rpmKeyring keyring, -+hif_keyring_add_public_key (const rpmts ts, - const gchar *filename, - GError **error) - { - gboolean ret = TRUE; -- gchar *data = NULL; - gint rc; - gsize len; - pgpArmor armor; -- pgpDig dig = NULL; -- rpmPubkey pubkey = NULL; - uint8_t *pkt = NULL; - - /* ignore symlinks and directories */ -@@ -56,13 +57,8 @@ hif_keyring_add_public_key (rpmKeyring k - if (g_file_test (filename, G_FILE_TEST_IS_SYMLINK)) - goto out; - -- /* get data */ -- ret = g_file_get_contents (filename, &data, &len, error); -- if (!ret) -- goto out; -- - /* rip off the ASCII armor and parse it */ -- armor = pgpParsePkts (data, &pkt, &len); -+ armor = pgpReadPkts (filename, &pkt, &len); - if (armor < 0) { - ret = FALSE; - g_set_error (error, -@@ -85,7 +81,7 @@ hif_keyring_add_public_key (rpmKeyring k - } - - /* test each one */ -- pubkey = rpmPubkeyNew (pkt, len); -+/* pubkey = rpmPubkeyNew (pkt, len); - if (pubkey == NULL) { - ret = FALSE; - g_set_error (error, -@@ -94,19 +90,19 @@ hif_keyring_add_public_key (rpmKeyring k - "failed to parse public key for %s", - filename); - goto out; -- } -+ } */ - - /* does the key exist in the keyring */ -- dig = rpmPubkeyDig (pubkey); -+/* dig = rpmPubkeyDig (pubkey); - rc = rpmKeyringLookup (keyring, dig); - if (rc == RPMRC_OK) { - ret = TRUE; - g_debug ("%s is already present", filename); - goto out; -- } -+ } */ - - /* add to rpmdb automatically, without a prompt */ -- rc = rpmKeyringAddKey (keyring, pubkey); -+ rc = rpmcliImportPubkey (ts, pkt, len); - if (rc == 1) { - ret = TRUE; - g_debug ("%s is already added", filename); -@@ -128,11 +124,6 @@ hif_keyring_add_public_key (rpmKeyring k - out: - if (pkt != NULL) - free (pkt); /* yes, free() */ -- if (pubkey != NULL) -- rpmPubkeyFree (pubkey); -- if (dig != NULL) -- pgpFreeDig (dig); -- g_free (data); - return ret; - } - -@@ -140,7 +131,7 @@ out: - * hif_keyring_add_public_keys: - **/ - gboolean --hif_keyring_add_public_keys (rpmKeyring keyring, GError **error) -+hif_keyring_add_public_keys (rpmts ts, GError **error) - { - const gchar *filename; - const gchar *gpg_dir = "/etc/pki/rpm-gpg"; -@@ -159,7 +150,7 @@ hif_keyring_add_public_keys (rpmKeyring - if (filename == NULL) - break; - path_tmp = g_build_filename (gpg_dir, filename, NULL); -- ret = hif_keyring_add_public_key (keyring, path_tmp, error); -+ ret = hif_keyring_add_public_key (ts, path_tmp, error); - g_free (path_tmp); - } while (ret); - out: -@@ -172,8 +163,7 @@ out: - * hif_keyring_check_untrusted_file: - */ - gboolean --hif_keyring_check_untrusted_file (rpmKeyring keyring, -- const gchar *filename, -+hif_keyring_check_untrusted_file (const gchar *filename, - GError **error) - { - FD_t fd = NULL; -@@ -216,10 +206,10 @@ hif_keyring_check_untrusted_file (rpmKey - } - - /* convert and upscale */ -- headerConvert (hdr, HEADERCONV_RETROFIT_V3); -+ /* headerConvert (hdr, HEADERCONV_RETROFIT_V3); */ - - /* get RSA key */ -- td = rpmtdNew (); -+ td = malloc (sizeof (*td) ); - rc = headerGet (hdr, - RPMTAG_RSAHEADER, - td, -@@ -243,7 +233,7 @@ hif_keyring_check_untrusted_file (rpmKey - } - - /* make it into a digest */ -- dig = pgpNewDig (); -+ dig = rpmtsDig (ts); - rc = pgpPrtPkts (td->data, td->count, dig, 0); - if (rc != 0) { - g_set_error (error, -@@ -255,7 +245,7 @@ hif_keyring_check_untrusted_file (rpmKey - } - - /* does the key exist in the keyring */ -- rc = rpmKeyringLookup (keyring, dig); -+ rc = rpmtsFindPubkey (ts, dig); - if (rc != RPMRC_OK) { - g_set_error_literal (error, - HIF_ERROR, -@@ -269,18 +259,18 @@ hif_keyring_check_untrusted_file (rpmKey - ret = TRUE; - out: - if (dig != NULL) -- pgpFreeDig (dig); -+ dig = pgpDigFree (dig); - if (td != NULL) { - rpmtdFreeData (td); -- rpmtdFree (td); -+ free (td); - } - if (ts != NULL) -- rpmtsFree (ts); -+ ts = rpmtsFree (ts); - if (hdr != NULL) -- headerFree (hdr); -+ hdr = headerFree (hdr); - if (fd != NULL) - Fclose (fd); - if (header != NULL) -- headerFree (header); -+ header = headerFree (header); - return ret; - } ---- PackageKit-0.8.15/backends/hawkey/hif-keyring.h.orig 2013-12-05 14:36:16.000000000 +0100 -+++ PackageKit-0.8.15/backends/hawkey/hif-keyring.h 2014-01-19 16:52:38.130466677 +0100 -@@ -24,14 +24,14 @@ - - #include - --#include -+#include - --gboolean hif_keyring_add_public_key (rpmKeyring keyring, -+gboolean hif_keyring_add_public_key (const rpmts ts, - const gchar *filename, - GError **error); --gboolean hif_keyring_add_public_keys (rpmKeyring keyring, -+gboolean hif_keyring_add_public_keys (rpmts ts, - GError **error); --gboolean hif_keyring_check_untrusted_file (rpmKeyring keyring, -+gboolean hif_keyring_check_untrusted_file ( - const gchar *filename, - GError **error); - ---- PackageKit-0.8.15/backends/hawkey/hif-rpmts.c.orig 2013-12-12 16:08:37.000000000 +0100 -+++ PackageKit-0.8.15/backends/hawkey/hif-rpmts.c 2014-01-19 17:35:21.507025769 +0100 -@@ -26,9 +26,11 @@ - #endif - - #include --#include -+#include -+#include - #include - #include -+#include - - #include "hif-rpmts.h" - #include "hif-utils.h" -@@ -212,10 +214,17 @@ hif_rpmts_get_problem_str (rpmProblem pr - diskspace, - generic_str); - break; -- case RPMPROB_OBSOLETES: -- str = g_strdup_printf ("package %s is obsoleted by %s", -- pkg_nevr, -- pkg_nevr_alt); -+ case RPMPROB_RDONLY: -+ str = g_strdup_printf ("tried to install package on read-only filesystem"); -+ break; -+ case RPMPROB_BADPRETRANS: -+ str = g_strdup_printf ("bad %%pretrans?"); // unimplemented acc. to rpmps.h -+ break; -+ case RPMPROB_BADPLATFORM: -+ str = g_strdup_printf ("package %s is for a different platform", pkg_nevr); -+ break; -+ case RPMPROB_NOREPACKAGE: -+ str = g_strdup_printf ("re-packaged package %s is missing", pkg_nevr); - break; - } - return str; -@@ -273,7 +282,7 @@ hif_rpmts_look_for_problems (rpmts ts, G - out: - if (string != NULL) - g_string_free (string, TRUE); -- rpmpsFree (probs); -+ probs = rpmpsFree (probs); - return ret; - } - -@@ -349,7 +358,7 @@ hif_rpmts_find_package (rpmts ts, HyPack - } - - /* success */ -- headerLink (hdr); -+ hdr = headerLink (hdr); - out: - rpmlogSetCallback (NULL, NULL); - if (rpm_error != NULL) -@@ -388,6 +397,6 @@ hif_rpmts_add_remove_pkg (rpmts ts, HyPa - } - out: - if (hdr != NULL) -- headerFree (hdr); -+ hdr = headerFree (hdr); - return ret; - } ---- PackageKit-0.8.15/backends/hawkey/hif-state.c.orig 2013-12-12 16:07:44.000000000 +0100 -+++ PackageKit-0.8.15/backends/hawkey/hif-state.c 2014-01-19 17:36:10.177023726 +0100 -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - - #include "hif-utils.h" - #include "hif-state.h" ---- PackageKit-0.8.17/backends/hawkey/pk-backend-hawkey.c.orig 2014-03-21 12:37:15.000000000 +0100 -+++ PackageKit-0.8.17/backends/hawkey/pk-backend-hawkey.c 2014-03-27 20:41:39.122471856 +0100 -@@ -39,12 +39,14 @@ - #include - #include - #include --#include -+#include "rpmorg-compat.h" - #include -+#include - #include -+#include - #include -+#include - #include --#include - - #include "hif-db.h" - #include "hif-goal.h" -@@ -79,7 +81,6 @@ typedef struct { - HifDb *db; - HifState *state; - rpmts ts; -- rpmKeyring keyring; - GPtrArray *packages_to_download; - PkBitfield transaction_flags; - HyGoal goal; -@@ -289,29 +290,32 @@ pk_backend_initialize (PkBackend *backen - G_CALLBACK (pk_backend_yum_repos_changed_cb), backend); - - /* get info from RPM */ -- rpmGetOsInfo (&value, NULL); -+ value = rpmExpand ("%{_target_os}", NULL); - g_key_file_set_string (priv->config, - HIF_CONFIG_GROUP_NAME, - "OsInfo", value); -- rpmGetArchInfo (&value, NULL); -+ value = rpmExpand ("%{_target_cpu}", NULL); - g_key_file_set_string (priv->config, - HIF_CONFIG_GROUP_NAME, - "ArchInfo", value); -- rpmGetArchInfo (&value, NULL); - priv->native_arches = g_new0 (gchar *, 3); - priv->native_arches[0] = g_strdup (value); - priv->native_arches[1] = g_strdup ("noarch"); -- if (g_strcmp0 (value, "i486") == 0 || -- g_strcmp0 (value, "i586") == 0 || -- g_strcmp0 (value, "i686") == 0) { -+ if (strcmp (value, "i486") == 0 || -+ strcmp (value, "i586") == 0 || -+ strcmp (value, "i686") == 0 || -+ strcmp (value, "athlon") == 0 || -+ strcmp (value, "pentium2") == 0 || -+ strcmp (value, "pentium3") == 0 || -+ strcmp (value, "pentium4") == 0) { - value = "i386"; -- } else if (g_strcmp0 (value, "armv7l") == 0 || -- g_strcmp0 (value, "armv6l") == 0 || -- g_strcmp0 (value, "armv5tejl") == 0 || -- g_strcmp0 (value, "armv5tel") == 0) { -+ } else if (strcmp (value, "armv7l") == 0 || -+ strcmp (value, "armv6l") == 0 || -+ strcmp (value, "armv5tejl") == 0 || -+ strcmp (value, "armv5tel") == 0) { - value = "arm"; -- } else if (g_strcmp0 (value, "armv7hnl") == 0 || -- g_strcmp0 (value, "armv7hl") == 0) { -+ } else if (strcmp (value, "armv7hnl") == 0 || -+ strcmp (value, "armv7hl") == 0) { - value = "armhfp"; - } - g_key_file_set_string (priv->config, -@@ -458,7 +462,6 @@ pk_backend_start_job (PkBackend *backend - - /* setup RPM */ - job_data->ts = rpmtsCreate (); -- job_data->keyring = rpmtsGetKeyring (job_data->ts, 1); - - /* HifState */ - job_data->packages_to_download = -@@ -530,8 +533,7 @@ pk_backend_stop_job (PkBackend *backend, - g_ptr_array_unref (job_data->packages_to_download); - if (job_data->goal != NULL) - hy_goal_free (job_data->goal); -- rpmtsFree (job_data->ts); -- rpmKeyringFree (job_data->keyring); -+ job_data->ts = rpmtsFree (job_data->ts); - g_object_unref (job_data->db); - g_free (job_data); - pk_backend_job_set_user_data (job, NULL); -@@ -1989,7 +1991,7 @@ out: - * pk_backend_transaction_check_untrusted: - */ - static gboolean --pk_backend_transaction_check_untrusted (rpmKeyring keyring, -+pk_backend_transaction_check_untrusted ( - GPtrArray *sources, - HyGoal goal, - GError **error) -@@ -2035,7 +2037,7 @@ pk_backend_transaction_check_untrusted ( - } - - /* check file */ -- ret = hif_keyring_check_untrusted_file (keyring, -+ ret = hif_keyring_check_untrusted_file ( - filename, - error); - if (!ret) -@@ -2123,15 +2125,6 @@ hif_commit_rpmcb_type_to_string (const r - case RPMCALLBACK_SCRIPT_ERROR: - type = "script-error"; - break; -- case RPMCALLBACK_SCRIPT_START: -- type = "script-start"; -- break; -- case RPMCALLBACK_SCRIPT_STOP: -- type = "script-stop"; -- break; -- case RPMCALLBACK_INST_STOP: -- type = "install-stop"; -- break; - } - return type; - } -@@ -2407,7 +2400,6 @@ hif_commit_ts_progress_cb (const void *a - /* don't do anything */ - break; - -- case RPMCALLBACK_INST_STOP: - case RPMCALLBACK_UNINST_STOP: - - /* phase complete */ -@@ -2422,8 +2414,6 @@ hif_commit_ts_progress_cb (const void *a - case RPMCALLBACK_UNPACK_ERROR: - case RPMCALLBACK_CPIO_ERROR: - case RPMCALLBACK_SCRIPT_ERROR: -- case RPMCALLBACK_SCRIPT_START: -- case RPMCALLBACK_SCRIPT_STOP: - case RPMCALLBACK_UNKNOWN: - case RPMCALLBACK_REPACKAGE_PROGRESS: - case RPMCALLBACK_REPACKAGE_START: -@@ -2816,14 +2806,14 @@ pk_backend_transaction_commit (PkBackend - goto out; - - /* import all GPG keys */ -- ret = hif_keyring_add_public_keys (job_data->keyring, error); -+ ret = hif_keyring_add_public_keys (job_data->ts, error); - if (!ret) - goto out; - - /* find any packages without valid GPG signatures */ - if (pk_bitfield_contain (job_data->transaction_flags, - PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED)) { -- ret = pk_backend_transaction_check_untrusted (job_data->keyring, -+ ret = pk_backend_transaction_check_untrusted ( - job_data->sources, - job_data->goal, - error); -@@ -2843,15 +2833,7 @@ pk_backend_transaction_commit (PkBackend - /* setup the transaction */ - commit = g_new0 (HifTransactionCommit, 1); - commit->timer = g_timer_new (); -- rc = rpmtsSetRootDir (job_data->ts, "/"); -- if (rc < 0) { -- ret = FALSE; -- g_set_error_literal (error, -- HIF_ERROR, -- PK_ERROR_ENUM_INTERNAL_ERROR, -- "failed to set root"); -- goto out; -- } -+ rpmtsSetRootDir (job_data->ts, "/"); - rpmtsSetNotifyCallback (job_data->ts, - hif_commit_ts_progress_cb, - commit); ---- PackageKit-0.8.15/backends/hawkey/rpmorg-compat.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ PackageKit-0.8.15/backends/hawkey/rpmorg-compat.h 2014-01-19 19:40:00.416711909 +0100 -@@ -0,0 +1,64 @@ -+#ifndef RPMORG_COMPAT_H -+#define RPMORG_COMPAT_H -+ -+#include -+ -+#define _RPMVSF_NOSIGNATURES (RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER | RPMVSF_NODSA | RPMVSF_NORSA) -+#define _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5) -+ -+static inline const char * headerGetString(Header h, int32_t tag) -+{ -+ const char *res = NULL; -+ struct rpmtd_s td; -+ -+ if (headerGet(h, tag, &td, HEADERGET_MINMEM)) { -+ if (rpmtdCount(&td) == 1) { -+ res = rpmtdGetString(&td); -+ } -+ rpmtdFreeData(&td); -+ } -+ return res; -+} -+ -+static inline uint64_t rpmtdGetNumber(rpmtd td) -+{ -+ uint64_t val = 0; -+ int ix; -+ assert(td != NULL); -+ ix = (td->ix >= 0 ? td->ix : 0); -+ -+ switch (td->type) { -+ case RPM_INT64_TYPE: -+ val = *((uint64_t *) td->data + ix); -+ break; -+ case RPM_INT32_TYPE: -+ val = *((uint32_t *) td->data + ix); -+ break; -+ case RPM_INT16_TYPE: -+ val = *((uint16_t *) td->data + ix); -+ break; -+ case RPM_INT8_TYPE: -+ case RPM_CHAR_TYPE: -+ val = *((uint8_t *) td->data + ix); -+ break; -+ default: -+ break; -+ } -+ return val; -+} -+ -+static inline uint64_t headerGetNumber(Header h, int32_t tag) -+{ -+ uint64_t res = 0; -+ struct rpmtd_s td; -+ -+ if (headerGet(h, tag, &td, HEADERGET_EXT)) { -+ if (rpmtdCount(&td) == 1) { -+ res = rpmtdGetNumber(&td); -+ } -+ rpmtdFreeData(&td); -+ } -+ return res; -+} -+ -+#endif /* RPMORG_COMPAT_H */ diff --git a/PackageKit.spec b/PackageKit.spec index b9e2b3f..6db2d62 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -6,28 +6,20 @@ %bcond_without doc # build without docs %bcond_without introspection # gobject introspection, time to time broken %bcond_without poldek # Poldek backend -%bcond_without smart # SMART backend -%bcond_without yum # YUM backend -%bcond_with hawkey # Hawkey backend +%bcond_with python # Python binding (only for a few backends) %bcond_with browser # browser plugin (patrys says: it's flawed by concept) -# default backend, configurable at runtime -%define backend poldek - Summary: System daemon that is a D-Bus abstraction layer for package management Summary(pl.UTF-8): Demon systemowy będący warstwą abstrakcji D-Bus do zarządzania pakietami Name: PackageKit -Version: 0.8.17 -Release: 2 +Version: 1.0.4 +Release: 1 License: GPL v2+ Group: Applications/System Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz -# Source0-md5: a2b1a602fee21430b735e52aaf33bd1a -Patch0: %{name}-hawkey-rpm5.patch -Patch3: smart-at-fix.patch -Patch4: %{name}-gstreamer.patch -Patch5: %{name}-bashcomp.patch -Patch6: %{name}-connman.patch +# Source0-md5: 4a07aa7e4c76052b2edf0765c26d2e35 +Patch0: %{name}-poldek.patch +Patch1: %{name}-bashcomp.patch URL: http://www.packagekit.org/ BuildRequires: NetworkManager-devel >= 0.6.5 BuildRequires: autoconf >= 2.65 @@ -46,19 +38,16 @@ BuildRequires: gstreamer-plugins-base-devel >= 1.0.0 BuildRequires: gtk+2-devel >= 2:2.14.0 BuildRequires: gtk+3-devel >= 3.0.0 %{?with_doc:BuildRequires: gtk-doc >= 1.11} -%{?with_hawkey:BuildRequires: hawkey-devel >= 0.4.6} BuildRequires: intltool >= 0.35.0 BuildRequires: libarchive-devel -%{?with_hawkey:BuildRequires: librepo-devel >= 0.1.5} BuildRequires: libtool BuildRequires: libxslt-progs BuildRequires: pango-devel BuildRequires: pkgconfig %{?with_poldek:BuildRequires: poldek-devel >= 0.30-1.rc6.4} BuildRequires: polkit-devel >= 0.98 -BuildRequires: python-devel >= 1:2.7 +%{?with_python:BuildRequires: python-devel >= 1:2.7} BuildRequires: readline-devel -%{?with_hawkey:BuildRequires: rpm-devel >= 4.11.0} BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: sqlite3-devel >= 3 @@ -77,6 +66,9 @@ Requires: %{name}-libs = %{version}-%{release} Requires: ConsoleKit-x11 Requires: crondaemon Requires: polkit >= 0.98 +Obsoletes: PackageKit-backend-hawkey +Obsoletes: PackageKit-backend-smart +Obsoletes: PackageKit-backend-yum Obsoletes: PackageKit-docs < 0.8.4 Obsoletes: pm-utils-packagekit BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -145,22 +137,6 @@ PackageKit library API documentation. %description apidocs -l pl.UTF-8 Dokumentacja API biblioteki PackageKit. -%package backend-hawkey -Summary: PackageKit Hawkey backend -Summary(pl.UTF-8): Backend PackageKit oparty na Hawkeyu -Group: Libraries -Requires: %{name} = %{version}-%{release} -Requires: hawkey >= 0.4.6 -Requires: librepo >= 0.1.5 -Provides: %{name}-backend = %{version}-%{release} -Obsoletes: PackageKit-backend-zif < 0.8.14 - -%description backend-hawkey -A backend for PackageKit to enable Hawkey functionality. - -%description backend-hawkey -l pl.UTF-8 -Backend PackageKit dodający obsługę Hawkeya. - %package backend-poldek Summary: PackageKit Poldek backend Summary(pl.UTF-8): Backend PackageKit oparty na Poldku @@ -176,34 +152,6 @@ A backend for PackageKit to enable Poldek functionality. %description backend-poldek -l pl.UTF-8 Backend PackageKit dodający obsługę Poldka. -%package backend-smart -Summary: PackageKit SMART backend -Summary(pl.UTF-8): Backend PackageKit oparty na zarządcy pakietów SMART -Group: Libraries -Requires: %{name} = %{version}-%{release} -Requires: smart - -%description backend-smart -A backend for PackageKit to enable SMART functionality. - -%description backend-smart -l pl.UTF-8 -Backend PackageKit dodający obsługę zarządcy pakietów SMART. - -%package backend-yum -Summary: PackageKit YUM backend -Summary(pl.UTF-8): Backend PackageKit oparty na Yumie -Group: Libraries -Requires: %{name} = %{version}-%{release} -Requires: python-packagekit = %{version}-%{release} -Requires: yum >= 3.2.19 -Provides: %{name}-backend = %{version}-%{release} - -%description backend-yum -A backend for PackageKit to enable yum functionality. - -%description backend-yum -l pl.UTF-8 -Backend PackageKit dodający obsługę Yuma. - %package gstreamer-plugin Summary: GStreamer codecs installer Summary(pl.UTF-8): Instalator kodeków GStreamera @@ -292,10 +240,7 @@ Wtyczka PackageKit do przeglądarek WWW. %prep %setup -q %patch0 -p1 -%patch3 -p0 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch1 -p1 %build %if %{with doc} @@ -315,11 +260,7 @@ Wtyczka PackageKit do przeglądarek WWW. --disable-silent-rules \ --enable-bash-completion=%{bash_compdir} \ %{__enable_disable browser browser-plugin} \ - %{__enable_disable hawkey} \ %{__enable_disable poldek} \ - %{__enable_disable smart} \ - %{__enable_disable yum} \ - --with-default-backend=%{backend} \ --with-html-dir=%{_gtkdocdir} \ --with-mozilla-plugin-dir=%{_browserpluginsdir} \ --with-security-framework=polkit @@ -337,7 +278,6 @@ ln -s pk-gstreamer-install $RPM_BUILD_ROOT%{_libdir}/gst-install-plugins-helper %{__rm} $RPM_BUILD_ROOT%{_libdir}/gtk-{2,3}.0/modules/*.{la,a} %{__rm} $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.{la,a} %{__rm} $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/libpk_backend_test_*.so -%{__rm} $RPM_BUILD_ROOT%{_libdir}/packagekit-plugins/*.{la,a} %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/test_spawn @@ -345,18 +285,12 @@ ln -s pk-gstreamer-install $RPM_BUILD_ROOT%{_libdir}/gst-install-plugins-helper %{__rm} $RPM_BUILD_ROOT%{_browserpluginsdir}/*.{la,a} %endif -%if %{with yum} -# yumBackend.py can't be compiled (invoked directly), other should be compiled -%py_comp $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/yum -%py_ocomp $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/yum -%{__rm} $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/yum/yum{Comps,Filter}.py -%{__rm} $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/yum/yumBackend.py[co] -%endif - -# outdated copies of bg,it -%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{bg_BG,it_IT} -# fa_IR uses short dir name -%{__mv} $RPM_BUILD_ROOT%{_localedir}/{fa_IR,fa} +# empty version of bg +%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/bg_BG +# empty version of fa (empty as well BTW) +%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/fa_IR +# outdated copy of it +%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/it_IT %py_postclean @@ -384,28 +318,17 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS HACKING MAINTAINERS NEWS README TODO -%attr(755,root,root) %{_bindir}/packagekit-bugreport.sh +%doc AUTHORS HACKING MAINTAINERS NEWS README %attr(755,root,root) %{_bindir}/pkcon %attr(755,root,root) %{_bindir}/pkmon -%attr(755,root,root) %{_bindir}/pk-debuginfo-install %attr(750,root,root) /etc/cron.daily/packagekit-background.cron +%attr(755,root,root) %{_libexecdir}/packagekit-direct +%attr(755,root,root) %{_libexecdir}/packagekitd +%attr(755,root,root) %{_libexecdir}/pk-offline-update %dir %{_libdir}/packagekit-backend -%dir %{_libdir}/packagekit-plugins -%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-scan-desktop-files.so -%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-systemd-updates.so -%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-update-package-cache.so -%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin_scripts.so -%attr(755,root,root) %{_libdir}/packagekitd -%attr(755,root,root) %{_libdir}/pk-clear-offline-update -%attr(755,root,root) %{_libdir}/pk-offline-update -%attr(755,root,root) %{_libdir}/pk-trigger-offline-update %dir %{_sysconfdir}/PackageKit %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PackageKit/PackageKit.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PackageKit/Vendor.conf -%dir %{_sysconfdir}/PackageKit/events -%{_sysconfdir}/PackageKit/events/post-transaction.d -%{_sysconfdir}/PackageKit/events/pre-transaction.d %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/packagekit-background /etc/dbus-1/system.d/org.freedesktop.PackageKit.conf %dir %{_datadir}/PackageKit @@ -415,10 +338,11 @@ fi %{_datadir}/polkit-1/rules.d/org.freedesktop.packagekit.rules %{_datadir}/dbus-1/system-services/org.freedesktop.PackageKit.service %{_mandir}/man1/pkcon.1* -%{_mandir}/man1/pk-debuginfo-install.1* %{_mandir}/man1/pkmon.1* %{systemdunitdir}/packagekit.service %{systemdunitdir}/packagekit-offline-update.service +%dir %{systemdunitdir}/system-update.target.wants +%{systemdunitdir}/system-update.target.wants/packagekit-offline-update.service %dir /var/cache/PackageKit %dir /var/cache/PackageKit/downloads %dir /var/lib/PackageKit @@ -427,9 +351,8 @@ fi %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libpackagekit-glib2.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpackagekit-glib2.so.16 +%attr(755,root,root) %ghost %{_libdir}/libpackagekit-glib2.so.18 %{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib -%{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib # NOTE: dbus interface xmls are commonly used: # - at runtime by packagekitd # - for development of applications using PK dbus interface @@ -440,12 +363,9 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libpackagekit-glib2.so %{_pkgconfigdir}/packagekit-glib2.pc -%{_pkgconfigdir}/packagekit-plugin.pc %dir %{_includedir}/PackageKit %{_includedir}/PackageKit/packagekit-glib2 -%{_includedir}/PackageKit/plugin %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir -%{_datadir}/gir-1.0/PackageKitPlugin-1.0.gir %files static %defattr(644,root,root,755) @@ -455,47 +375,17 @@ fi %defattr(644,root,root,755) %{_gtkdocdir}/PackageKit -%if %{with hawkey} -%files backend-hawkey -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_hawkey.so -%endif - %if %{with poldek} %files backend-poldek %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_poldek.so %endif -%if %{with smart} -%files backend-smart -%defattr(644,root,root,755) -%{_libdir}/packagekit-backend/libpk_backend_smart.so -%dir %{_datadir}/PackageKit/helpers/smart -%attr(755,root,root) %{_datadir}/PackageKit/helpers/smart/smartBackend.py -%endif - -%if %{with yum} -%files backend-yum -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_yum.so -%dir %{_datadir}/PackageKit/helpers/yum -%{_datadir}/PackageKit/helpers/yum/licenses.txt -%{_datadir}/PackageKit/helpers/yum/yum-comps-groups.conf -%attr(755,root,root) %{_datadir}/PackageKit/helpers/yum/yumBackend.py -%{_datadir}/PackageKit/helpers/yum/yumComps.py[co] -%{_datadir}/PackageKit/helpers/yum/yumFilter.py[co] - -# yum plugin -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf -%{_prefix}/lib/yum-plugins/refresh-packagekit.py -%endif - %files gstreamer-plugin %defattr(644,root,root,755) %doc contrib/gstreamer-plugin/README -%attr(755,root,root) %{_libdir}/gst-install-plugins-helper -%attr(755,root,root) %{_libdir}/pk-gstreamer-install +%attr(755,root,root) %{_libexecdir}/gst-install-plugins-helper +%attr(755,root,root) %{_libexecdir}/pk-gstreamer-install %files gtk-module %defattr(644,root,root,755) @@ -511,10 +401,12 @@ fi %defattr(644,root,root,755) %{bash_compdir}/pkcon +%if %{with python} %files -n python-packagekit %defattr(644,root,root,755) %dir %{py_sitescriptdir}/packagekit %{py_sitescriptdir}/packagekit/*.py[co] +%endif %if %{with browser} %files -n browser-plugin-packagekit diff --git a/smart-at-fix.patch b/smart-at-fix.patch deleted file mode 100644 index cc503b3..0000000 --- a/smart-at-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- backends/smart/smartBackend.py 2011-04-09 16:51:19.060314527 +0200 -+++ backends/smart/smartBackend.py~ 2011-04-09 16:52:21.816641214 +0200 -@@ -962,7 +962,8 @@ - #if isinstance(package, RPMPackage): - if package.__class__.__name__ == 'RPMPackage': - name = package.name -- version, arch = package.version.split('@') -+ # in PLD Linux, there is '@' in kernel related package Release tag -+ version, arch = package.version.split('@',1) - elif isinstance(package, DebPackage): - name = package.name - version, arch = package.version, smart.backends.deb.base.DEBARCH