From cbfb98ac360e26338205cb9dc722bd63a2f5c61c Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mar 24 2009 14:45:38 +0000 Subject: - Update to todays git snapshot with fixed ChangeLog functionality. --- diff --git a/.cvsignore b/.cvsignore index 6b2b948..4e6c54f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -PackageKit-0.4.6-20090319.tar.gz +PackageKit-0.4.6-20090324.tar.gz diff --git a/PackageKit.spec b/PackageKit.spec index c56632a..aed87d2 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -2,14 +2,14 @@ %define dbus_version 0.90 %define dbus_glib_version 0.70 %define policykit_version 0.8 -%define alphatag 20090319 +%define alphatag 20090324 %{!?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: 0.4.6 -Release: 0.2.%{?alphatag}git%{?dist} +Release: 0.3.%{?alphatag}git%{?dist} #Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -22,7 +22,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Set Vendor.conf up for Fedora. Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch -Patch2: module-resident.patch Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} @@ -222,9 +221,8 @@ using PackageKit. %prep %setup -q -n %{?name}-%{?version}-%{?alphatag} #%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .resident +%patch0 -p1 -b .fedora +%patch1 -p1 -b .no-time %build %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck @@ -419,6 +417,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_includedir}/PackageKit/backend/*.h %changelog +* Tue Mar 24 2009 Richard Hughes - 0.4.6-0.3.20090324git +- Update to todays git snapshot with fixed ChangeLog functionality. + * Mon Mar 23 2009 Matthias Clasen - 0.4.6-0.2.2009319git - Make the GTK+ module resident diff --git a/module-resident.patch b/module-resident.patch deleted file mode 100644 index 70bfc3c..0000000 --- a/module-resident.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up PackageKit-0.4.6-20090319/contrib/gtk-module/pk-gtk-module.c.resident PackageKit-0.4.6-20090319/contrib/gtk-module/pk-gtk-module.c ---- PackageKit-0.4.6-20090319/contrib/gtk-module/pk-gtk-module.c.resident 2009-02-24 06:29:08.000000000 -0500 -+++ PackageKit-0.4.6-20090319/contrib/gtk-module/pk-gtk-module.c 2009-03-23 21:24:52.572926916 -0400 -@@ -328,3 +328,13 @@ gtk_module_init (gint *argc G_GNUC_UNUSE - { - install_pango_font_map (); - } -+ -+const char *g_module_check_init (GModule *module); -+ -+const char * -+g_module_check_init (GModule *module) -+{ -+ g_module_make_resident (module); -+ -+ return NULL; -+} diff --git a/sources b/sources index 3063d8d..a460009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa74d3c479e40df2c7bf015e71575a14 PackageKit-0.4.6-20090319.tar.gz +b67b7d42e01480ce5970d7e823c50302 PackageKit-0.4.6-20090324.tar.gz