rpms/PackageKit/devel pk-fix-build-plugin.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 PackageKit.spec, 1.41, 1.42 sources, 1.25, 1.26
Richard Hughes
rhughes at fedoraproject.org
Fri Aug 22 16:49:01 UTC 2008
Author: rhughes
Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6004
Modified Files:
.cvsignore PackageKit.spec sources
Added Files:
pk-fix-build-plugin.patch
Log Message:
* Mon Aug 22 2008 Richard Hughes <rhughes at redhat.com> - 0.3.0-1
- Update to newest upstream version. This includes the fixed browser plugin.
pk-fix-build-plugin.patch:
--- NEW FILE pk-fix-build-plugin.patch ---
commit 771d297a4e6e551a7c559c7eb6b77e54f7d62c37
Author: Richard Hughes <hughsie at localhost.localdomain>
Date: Tue Aug 19 22:04:32 2008 +0100
bugfix: fix compiling the browser plugins where HAVE_GDK_APP_LAUNCH_CONTEXT_NEW is defined -- re-apply as I think git got itself in a tizz (trivial)
diff --git a/contrib/packagekit-plugin/src/contents.cpp b/contrib/packagekit-plugin/src/contents.cpp
index 9d51ac9..3be68fb 100644
--- a/contrib/packagekit-plugin/src/contents.cpp
+++ b/contrib/packagekit-plugin/src/contents.cpp
@@ -598,6 +598,9 @@ void
PkpContents::runApplication (Time time)
{
GError *error = NULL;
+#ifdef HAVE_GDK_APP_LAUNCH_CONTEXT_NEW
+ GdkAppLaunchContext *context;
+#endif
if (mAppInfo == 0) {
g_warning("Didn't find application to launch");
@@ -607,20 +610,22 @@ PkpContents::runApplication (Time time)
if (time == 0)
time = get_server_timestamp();
- GAppLaunchContext *context = 0;
#ifdef HAVE_GDK_APP_LAUNCH_CONTEXT_NEW
context = gdk_app_launch_context_new();
- gdk_app_launch_context_set_timestamp(time);
+ gdk_app_launch_context_set_timestamp(context, time);
+ if (!g_app_info_launch(mAppInfo, NULL, G_APP_LAUNCH_CONTEXT (context), &error)) {
+#else
+ if (!g_app_info_launch(mAppInfo, NULL, NULL, &error)) {
#endif
-
- if (!g_app_info_launch(mAppInfo, NULL, context, &error)) {
g_warning("%s\n", error->message);
g_clear_error(&error);
return;
}
- if (context != 0)
+#ifdef HAVE_GDK_APP_LAUNCH_CONTEXT_NEW
+ if (context != NULL)
g_object_unref(context);
+#endif
}
void
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 30 Jul 2008 10:20:55 -0000 1.24
+++ .cvsignore 22 Aug 2008 16:42:31 -0000 1.25
@@ -1 +1 @@
-PackageKit-0.2.4.tar.gz
+PackageKit-0.3.0.tar.gz
Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- PackageKit.spec 4 Aug 2008 19:08:44 -0000 1.41
+++ PackageKit.spec 22 Aug 2008 16:42:31 -0000 1.42
@@ -2,26 +2,28 @@
%define dbus_version 0.90
%define dbus_glib_version 0.70
%define policykit_version 0.8
-#%define alphatag 20080618
%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Summary: System daemon that is a DBUS abstraction layer for package management
Name: PackageKit
-Version: 0.2.4
-#Release: 1.%{?alphatag}%{?dist}
-Release: 2%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://packagekit.freedesktop.org
-#Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz
Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#upstream, 771d297a4e6e551a7c559c7eb6b77e54f7d62c37
+Patch0: pk-fix-build-plugin.patch
+
Requires: dbus >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
Requires: PackageKit-libs = %{version}-%{release}
Requires: yum-packagekit = %{version}-%{release}
Requires: yum >= 3.2.6
+Requires: libtar-devel
Requires: shared-mime-info
BuildRequires: glib2-devel >= %{glib2_version}
@@ -41,6 +43,8 @@
BuildRequires: perl(XML::Parser)
BuildRequires: intltool
BuildRequires: gettext
+BuildRequires: xulrunner-devel
+BuildRequires: libtar-devel
%description
PackageKit is a D-Bus abstraction layer that allows the session user
@@ -98,9 +102,20 @@
%description devel
Headers and libraries for PackageKit.
+%package browser-plugin
+Summary: Browser Plugin for PackageKit
+Group: Development/Libraries
+Requires: gtk2
+Requires: PackageKit-libs = %{version}-%{release}
+
+%description browser-plugin
+The PackageKit browser plugin allows web sites to offer the ability to
+users to install and update packages from configured repositories
+using PackageKit.
+
%prep
-#%setup -q -n %{name}-%{version}-%{?alphatag}
%setup -q
+%patch0 -p1
%build
%configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local
@@ -115,6 +130,8 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/libpackagekit*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.la
chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/yumDBUSBackend.py
chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py
@@ -137,7 +154,6 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING
-
%dir %{_datadir}/PackageKit
%dir %{_datadir}/PackageKit/helpers
%dir %{_sysconfdir}/PackageKit
@@ -153,13 +169,14 @@
%{_datadir}/man/man1/*.1.gz
%{_datadir}/gtk-doc/html/PackageKit
%{_datadir}/PolicyKit/policy/*.policy
-%{_datadir}/mime/packages/packagekit-catalog.xml
+%{_datadir}/mime/packages/packagekit-*.xml
%{_sbindir}/packagekitd
%{_bindir}/pkmon
%{_bindir}/pkcon
+%{_bindir}/pkgenpack
%{_bindir}/packagekit-bugreport.sh
-%{_libexecdir}/pk-import-desktop
-%{_libexecdir}/pk-import-specspo
+%{_libexecdir}/pk-import-*
+%{_libexecdir}/pk-generate-*
%exclude %{_libdir}/libpackagekit*.so.*
%exclude %{_libdir}/packagekit-backend/*.so
%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db
@@ -193,11 +210,19 @@
%files devel
%defattr(-,root,root,-)
+%files browser-plugin
+%dir %{_libdir}/mozilla
+%dir %{_libdir}/mozilla/plugins
+%{_libdir}/mozilla/plugins/packagekit-plugin.so
+
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%{_includedir}/*
%changelog
+* Mon Aug 22 2008 Richard Hughes <rhughes at redhat.com> - 0.3.0-1
+- Update to newest upstream version. This includes the fixed browser plugin.
+
* Mon Aug 04 2008 Robin Norwood <rnorwood at redhat.com> - 0.2.4-2
- Fix Source0 URL.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 30 Jul 2008 10:20:55 -0000 1.25
+++ sources 22 Aug 2008 16:42:31 -0000 1.26
@@ -1 +1 @@
-87bf41fd021077c93549d47de6d5fe07 PackageKit-0.2.4.tar.gz
+26c092d1ebbce4e9f772085d2aa81bbb PackageKit-0.3.0.tar.gz
More information about the fedora-extras-commits
mailing list