[PackageKit] Update to today's git snapshot

Kalev Lember kalev at fedoraproject.org
Wed Oct 15 11:21:17 UTC 2014


commit 3af722433a91ee5b0eef58eee29440a955f15530
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Oct 15 13:11:58 2014 +0200

    Update to today's git snapshot

 .gitignore      |    1 +
 PackageKit.spec |   36 ++++++++++++++----------------------
 sources         |    2 +-
 3 files changed, 16 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a53c617..c3e7782 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ PackageKit-0.6.7.tar.bz2
 /PackageKit-0.9.5.tar.xz
 /PackageKit-1.0.0.tar.xz
 /cached-metadata.tar
+/PackageKit-1.0.1-20141015.tar.xz
diff --git a/PackageKit.spec b/PackageKit.spec
index e583592..ee47805 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -1,18 +1,17 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
-##%define gitdate 20140307
+%define gitdate 20141015
 
 %define _default_patch_fuzz 2
-%global __python %{__python3}
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   1.0.0
-Release:   2%{?dist}
+Version:   1.0.1
+Release:   0.1.%{gitdate}%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/PackageKit/
-Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
+#Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
+Source0:   %{name}-%{version}-%{gitdate}.tar.xz
 
 # generated using contrib/generate-md-archive.sh in the PackageKit source tree
 Source1:   cached-metadata.tar
@@ -41,7 +40,6 @@ BuildRequires: gtk2-devel
 BuildRequires: gtk3-devel
 BuildRequires: docbook-utils
 BuildRequires: gnome-doc-utils
-BuildRequires: python3-devel
 BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 BuildRequires: gettext
@@ -176,14 +174,13 @@ A simple helper that offers to install new packages on the command line
 using PackageKit.
 
 %prep
-%setup -q
-#%setup -q -n %{name}-%{version}-%{gitdate}
+#%setup -q
+%setup -q -n %{name}-%{version}-%{gitdate}
 %patch0 -p1 -b .fedora
 
 %build
 %configure \
         --disable-static \
-        --enable-python3 \
 %if 0%{?rhel} == 0
         --enable-hif \
         --enable-introspection \
@@ -191,7 +188,6 @@ using PackageKit.
 %else
         --disable-bash-completion \
 %endif
-        --with-python-package-dir=%{python3_sitearch} \
         --disable-local \
         --disable-strict \
         --disable-silent-rules \
@@ -231,18 +227,12 @@ tar -xf %{SOURCE1} --directory=$RPM_BUILD_ROOT
 %find_lang %name
 
 %post
-%systemd_post packagekit-offline-update.service packagekit.service
+# Remove leftover symlinks from /etc/systemd; the offline update service is
+# instead now hooked into /usr/lib/systemd/system/system-update.target.wants
+systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 
 %post glib -p /sbin/ldconfig
 
-%preun
-%systemd_preun packagekit-offline-update.service packagekit.service
-
-%postun
-# Reload the systemd configuration but do _not_ restart the daemon. Killing the
-# update process while it's updating packages causes the transaction to fail.
-%systemd_postun packagekit-offline-update.service packagekit.service
-
 %postun glib -p /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -252,12 +242,10 @@ tar -xf %{SOURCE1} --directory=$RPM_BUILD_ROOT
 %dir %{_datadir}/PackageKit/helpers
 %dir %{_sysconfdir}/PackageKit
 %dir %{_localstatedir}/lib/PackageKit
-%dir %{python3_sitearch}/packagekit
 %dir %{_localstatedir}/cache/PackageKit
 %ghost %verify(not md5 size mtime) %{_localstatedir}/cache/PackageKit/groups.sqlite
 %dir %{_localstatedir}/cache/PackageKit/downloads
 %dir %{_localstatedir}/cache/PackageKit/metadata
-%{python3_sitearch}/packagekit/*py*
 %if !0%{?rhel}
 %{_datadir}/bash-completion/completions/pkcon
 %endif
@@ -285,6 +273,7 @@ tar -xf %{SOURCE1} --directory=$RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_unitdir}/packagekit-offline-update.service
 %{_unitdir}/packagekit.service
+%{_unitdir}/system-update.target.wants/
 %{_libexecdir}/pk-*offline-update
 %if 0%{?rhel} == 0
 %{_libdir}/packagekit-backend/libpk_backend_hif.so
@@ -338,6 +327,9 @@ tar -xf %{SOURCE1} --directory=$RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/PackageKit
 
 %changelog
+* Wed Oct 15 2014 Kalev Lember <kalevlember at gmail.com> - 1.0.1-0.1.20141015
+- Update to today's git snapshot
+
 * Tue Sep 16 2014 Richard Hughes <rhughes at redhat.com> - 1.0.0-2
 - Add a new subpackage designed for the workstation spin.
 - See http://blogs.gnome.org/hughsie/2014/08/29/ for details.
diff --git a/sources b/sources
index 61c3d12..5a6fdde 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8ae6b71c3317efbee7eb0dc5f5516c50  PackageKit-1.0.0.tar.xz
 a7f6d139da2dbf9f1e1bdf79a5cbdfd4  cached-metadata.tar
+ec7296ab1880651413ae2d901d762f3e  PackageKit-1.0.1-20141015.tar.xz


More information about the scm-commits mailing list