From: Jakub Bogusz Date: Fri, 11 Sep 2015 19:09:10 +0000 (+0200) Subject: - updated to 1.0.8 X-Git-Tag: auto/th/PackageKit-1.0.8-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2FPackageKit.git;a=commitdiff_plain;h=8ad97aeee2021b8d678061585db8d254665d9309 - updated to 1.0.8 - updated consolekit-fallback patch - added missing patch (missing file taken from git) --- diff --git a/PackageKit-missing.patch b/PackageKit-missing.patch new file mode 100644 index 0000000..95ef11c --- /dev/null +++ b/PackageKit-missing.patch @@ -0,0 +1,66 @@ +--- PackageKit-1.0.8/lib/packagekit-glib2/PackageKitGlib-1.0.metadata.orig 1970-01-01 01:00:00.000000000 +0100 ++++ PackageKit-1.0.8/lib/packagekit-glib2/PackageKitGlib-1.0.metadata 2015-09-11 20:29:37.057340480 +0200 +@@ -0,0 +1,63 @@ ++Client ++ .accept_eula_async finish_name="pk_client_generic_finish" ++ .adopt_async finish_name="pk_client_generic_finish" ++ .depends_on_async finish_name="pk_client_generic_finish" ++ .download_packages_async finish_name="pk_client_generic_finish" ++ .get_categories_async finish_name="pk_client_generic_finish" ++ .get_details_async finish_name="pk_client_generic_finish" ++ .get_details_local_async finish_name="pk_client_generic_finish" ++ .get_distro_upgrades_async finish_name="pk_client_generic_finish" ++ .get_files_async finish_name="pk_client_generic_finish" ++ .get_files_local_async finish_name="pk_client_generic_finish" ++ .get_old_transactions_async finish_name="pk_client_generic_finish" ++ .get_packages_async finish_name="pk_client_generic_finish" ++ .get_repo_list_async finish_name="pk_client_generic_finish" ++ .get_update_detail_async finish_name="pk_client_generic_finish" ++ .get_updates_async finish_name="pk_client_generic_finish" ++ .install_files_async finish_name="pk_client_generic_finish" ++ .install_packages_async finish_name="pk_client_generic_finish" ++ .install_signature_async finish_name="pk_client_generic_finish" ++ .refresh_cache_async finish_name="pk_client_generic_finish" ++ .remove_packages_async finish_name="pk_client_generic_finish" ++ .repair_system_async finish_name="pk_client_generic_finish" ++ .repo_enable_async finish_name="pk_client_generic_finish" ++ .repo_remove_async finish_name="pk_client_generic_finish" ++ .repo_set_data_async finish_name="pk_client_generic_finish" ++ .required_by_async finish_name="pk_client_generic_finish" ++ .resolve_async finish_name="pk_client_generic_finish" ++ .search_details_async finish_name="pk_client_generic_finish" ++ .search_files_async finish_name="pk_client_generic_finish" ++ .search_groups_async finish_name="pk_client_generic_finish" ++ .search_names_async finish_name="pk_client_generic_finish" ++ .update_packages_async finish_name="pk_client_generic_finish" ++ .what_provides_async finish_name="pk_client_generic_finish" ++DistroUpgradeEnum name="DistroUpgradeEnum" ++ErrorEnum name="ErrorEnum" ++PackageSack ++ .get_details_async finish_name="pk_package_sack_merge_generic_finish" ++ .get_update_detail_async finish_name="pk_package_sack_merge_generic_finish" ++ .resolve_async finish_name="pk_package_sack_merge_generic_finish" ++Task ++ .depends_on_async finish_name="pk_task_generic_finish" ++ .download_packages_async finish_name="pk_task_generic_finish" ++ .get_categories_async finish_name="pk_task_generic_finish" ++ .get_details_async finish_name="pk_task_generic_finish" ++ .get_files_async finish_name="pk_task_generic_finish" ++ .get_packages_async finish_name="pk_task_generic_finish" ++ .get_repo_list_async finish_name="pk_task_generic_finish" ++ .get_update_detail_async finish_name="pk_task_generic_finish" ++ .get_updates_async finish_name="pk_task_generic_finish" ++ .install_files_async finish_name="pk_task_generic_finish" ++ .install_packages_async finish_name="pk_task_generic_finish" ++ .refresh_cache_async finish_name="pk_task_generic_finish" ++ .remove_packages_async finish_name="pk_task_generic_finish" ++ .repair_system_async finish_name="pk_task_generic_finish" ++ .repo_enable_async finish_name="pk_task_generic_finish" ++ .required_by_async finish_name="pk_task_generic_finish" ++ .resolve_async finish_name="pk_task_generic_finish" ++ .search_details_async finish_name="pk_task_generic_finish" ++ .search_files_async finish_name="pk_task_generic_finish" ++ .search_groups_async finish_name="pk_task_generic_finish" ++ .search_names_async finish_name="pk_task_generic_finish" ++ .update_packages_async finish_name="pk_task_generic_finish" ++ .what_provides_async finish_name="pk_task_generic_finish" diff --git a/PackageKit.spec b/PackageKit.spec index c02ce73..4be232a 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -17,6 +17,7 @@ %bcond_with urpmi # urpmi (Mandriva/Mageia) backend (Perl) %bcond_with zypp # ZYPP (openSUSE/SLE) backend %bcond_without python # Python binding (only for a few backends) +%bcond_without vala # Vala binding %bcond_with browser # browser plugin (patrys says: it's flawed by concept) # python binding is built when building any python binding %if %{without entropy} && %{without pisi} && %{without ports} @@ -25,16 +26,17 @@ 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: 1.0.7 +Version: 1.0.8 Release: 1 License: GPL v2+ Group: Applications/System Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz -# Source0-md5: 5d6fc6cdd44354c5b7bab7bb434cab1f +# Source0-md5: 15934aa27f7a605dfa0cd0a89ecb1eb1 Patch0: %{name}-poldek.patch Patch1: %{name}-bashcomp.patch Patch2: %{name}-format.patch Patch3: consolekit-fallback.patch +Patch4: %{name}-missing.patch URL: http://www.packagekit.org/ BuildRequires: NetworkManager-devel >= 0.6.5 # pkgconfig(libalpm) >= 8.2.0 @@ -73,9 +75,10 @@ BuildRequires: readline-devel BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: sqlite3-devel >= 3 -BuildRequires: systemd-devel +BuildRequires: systemd-devel >= 1:209 BuildRequires: tar >= 1:1.22 BuildRequires: udev-glib-devel +%{?with_vala:BuildRequires: vala >= 2:0.16} BuildRequires: xz %if %{with browser} BuildRequires: cairo-devel @@ -144,6 +147,19 @@ Static packagekit-glib library. %description static -l pl.UTF-8 Statyczna biblioteka packagekit-glib. +%package -n vala-packagekit +Summary: Vala API for PackageKit library +Summary(pl.UTF-8): API języka Vala do biblioteki PackageKitu +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: vala >= 2:0.16 + +%description -n vala-packagekit +Vala API for PackageKit library. + +%description -n vala-packagekit -l pl.UTF-8 +API języka Vala do biblioteki PackageKitu. + %package apidocs Summary: PackageKit library API documentation Summary(pl.UTF-8): Dokumentacja API biblioteki PackageKit @@ -422,6 +438,7 @@ Wtyczka PackageKit do przeglądarek WWW. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %if %{with doc} @@ -563,6 +580,12 @@ fi %defattr(644,root,root,755) %{_libdir}/libpackagekit-glib2.a +%if %{with vala} +%files -n vala-packagekit +%defattr(644,root,root,755) +%{_datadir}/vala/vapi/packagekit-glib2.vapi +%endif + %files apidocs %defattr(644,root,root,755) %{_gtkdocdir}/PackageKit diff --git a/consolekit-fallback.patch b/consolekit-fallback.patch index a56c424..cca8f94 100644 --- a/consolekit-fallback.patch +++ b/consolekit-fallback.patch @@ -1,14 +1,3 @@ ---- PackageKit-1.0.7/configure.ac~ 2015-08-02 12:49:14.000000000 +0200 -+++ PackageKit-1.0.7/configure.ac 2015-08-02 12:58:42.496449586 +0200 -@@ -235,7 +235,7 @@ - AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[enable systemd and logind code]), - enable_systemd=$enableval,enable_systemd=yes) - if test x$enable_systemd = xyes; then -- PKG_CHECK_MODULES(SYSTEMD, libsystemd-login libsystemd-journal) -+ PKG_CHECK_MODULES(SYSTEMD, libsystemd-login libsystemd-journal libsystemd-daemon) - AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [has_systemdsystemunitdir=$with_systemdsystemunitdir], --- PackageKit-1.0.7/src/pk-dbus.c~ 2015-04-22 11:54:49.000000000 +0200 +++ PackageKit-1.0.7/src/pk-dbus.c 2015-08-02 12:57:29.398321174 +0200 @@ -28,6 +28,7 @@