Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at Fri Aug 12 13:37:12 CEST 2011.
-------- --- PackageKit/PackageKit.changes 2011-08-02 09:58:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/PackageKit/PackageKit.changes 2011-08-11 21:18:40.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 11 18:05:33 UTC 2011 - [email protected] + +- Add PackageKit-npapi.patch: On openSUSE > 11.4, build using NPAPI + headers from new package npapi-sdk. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- PackageKit-npapi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.vOtq31/_old 2011-08-12 13:34:36.000000000 +0200 +++ /var/tmp/diff_new_pack.vOtq31/_new 2011-08-12 13:34:36.000000000 +0200 @@ -35,7 +35,7 @@ Name: PackageKit Version: 0.6.17 -Release: 1 +Release: 2 License: GPLv2+ BuildRequires: NetworkManager-devel BuildRequires: dbus-1-glib-devel @@ -54,7 +54,12 @@ BuildRequires: libgudev-1_0-devel BuildRequires: libqt4-devel BuildRequires: libzypp-devel +BuildRequires: mozilla-nspr-devel +%if 0%{suse_version} > 1140 +BuildRequires: pkgconfig(npapi-sdk) +%else BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel +%endif BuildRequires: pm-utils BuildRequires: polkit-devel BuildRequires: python-devel @@ -68,6 +73,8 @@ Source: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE PackageKit-sysconfig-cron.patch [email protected] -- Change the configuration of the cron script to a sysconfig-like config Patch0: PackageKit-sysconfig-cron.patch +# PATCH-FIX-UPSTREAM PackageKit-npapi.patch fdo#40026 [email protected] -- Build against npapi-sdk instead of xulrunner +Patch1: PackageKit-npapi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-branding = %{version} Recommends: %{name}-lang @@ -290,6 +297,9 @@ %setup -q translation-update-upstream %patch0 -p1 +%if 0%{suse_version} > 1140 +%patch1 -p1 +%endif %build %configure \ ++++++ PackageKit-npapi.patch ++++++ diff --git a/configure b/configure index 12a1a4a..d8364c7 100755 --- a/configure +++ b/configure @@ -20279,7 +20279,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ - mozilla-plugin \\ + npapi-sdk \\ gio-unix-2.0 \\ nspr \\ cairo \\ @@ -20287,7 +20287,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS"; then gtk+-2.0 >= 2.14.0 \\ dbus-glib-1\""; } >&5 ($PKG_CONFIG --exists --print-errors "\ - mozilla-plugin \ + npapi-sdk \ gio-unix-2.0 \ nspr \ cairo \ @@ -20298,7 +20298,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PK_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "\ - mozilla-plugin \ + npapi-sdk \ gio-unix-2.0 \ nspr \ cairo \ @@ -20316,7 +20316,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ - mozilla-plugin \\ + npapi-sdk \\ gio-unix-2.0 \\ nspr \\ cairo \\ @@ -20324,7 +20324,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; then gtk+-2.0 >= 2.14.0 \\ dbus-glib-1\""; } >&5 ($PKG_CONFIG --exists --print-errors "\ - mozilla-plugin \ + npapi-sdk \ gio-unix-2.0 \ nspr \ cairo \ @@ -20335,7 +20335,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PK_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "\ - mozilla-plugin \ + npapi-sdk \ gio-unix-2.0 \ nspr \ cairo \ @@ -20362,7 +20362,7 @@ else fi if test $_pkg_short_errors_supported = yes; then PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ - mozilla-plugin \ + npapi-sdk \ gio-unix-2.0 \ nspr \ cairo \ @@ -20371,7 +20371,7 @@ fi dbus-glib-1" 2>&1` else PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ - mozilla-plugin \ + npapi-sdk \ gio-unix-2.0 \ nspr \ cairo \ diff --git a/contrib/browser-plugin/pk-main.c b/contrib/browser-plugin/pk-main.c index 4f6fc75..f4d8047 100644 --- a/contrib/browser-plugin/pk-main.c +++ b/contrib/browser-plugin/pk-main.c @@ -539,7 +539,7 @@ NP_Shutdown () /** * NP_GetMIMEDescription: **/ -char * +const char * NP_GetMIMEDescription (void) { pk_debug ("NP_GetMIMEDescription"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
