Hello community,
here is the log from the commit of package PackageKit for openSUSE:12.2 checked
in at 2012-06-26 17:10:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/PackageKit (Old)
and /work/SRC/openSUSE:12.2/.PackageKit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit", Maintainer is "gnome-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:12.2/PackageKit/PackageKit.changes 2012-06-25
15:14:45.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.PackageKit.new/PackageKit.changes 2012-06-26
17:10:11.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Jun 20 18:47:20 UTC 2012 - dims...@opensuse.org
+
+- Add PackageKit-zypp-packagesize.patch: libzypp changed their
+ API and now returns Bytes instead of KBytes.
+- Add call to autoreconf, as above patch touches the build system.
+
+-------------------------------------------------------------------
+Wed Jun 20 13:23:02 UTC 2012 - co...@suse.com
+
+- gcc46 is no longer required for libzypp
+
+-------------------------------------------------------------------
New:
----
PackageKit-zypp-packagesize.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ PackageKit.spec ++++++
--- /var/tmp/diff_new_pack.R4CuEj/_old 2012-06-26 17:10:11.000000000 +0200
+++ /var/tmp/diff_new_pack.R4CuEj/_new 2012-06-26 17:10:11.000000000 +0200
@@ -16,8 +16,6 @@
#
-# libzypp is not friend with gcc 4.7 :/
-%define force_gcc46 1
# $ pkcon search file /usr/bin/anjuta
%define BUILD_CNF 1
@@ -58,15 +56,13 @@
# PATCH-FIX-UPSTREAM
0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch
vu...@opensuse.org -- Fix broken soversion of libpackagekit-qt2, will be fixed
properly in next upstream version
Patch2: 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch
#
+# PATCH-FIX-UPSTREAM PackageKit-zypp-packagesize.patch bnc#764677
dims...@opensuse.org -- libzypp changed API and now returns Bytes instead of
KBytes.
+Patch3: PackageKit-zypp-packagesize.patch
BuildRequires: NetworkManager-devel
BuildRequires: automake
BuildRequires: docbook-utils
BuildRequires: fdupes
-%if %{force_gcc46}
-BuildRequires: gcc46-c++
-%else
BuildRequires: gcc-c++
-%endif
BuildRequires: gobject-introspection-devel
BuildRequires: gstreamer-0_10-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
@@ -299,12 +295,11 @@
%patch1 -p1
%endif
%patch2 -p1
+%patch3 -p1
%build
-%if 0%{?force_gcc46}
-export CC=gcc-4.6
-export CXX=g++-4.6
-%endif
+# Needed due to patch 3
+autoreconf -fi
%configure \
--disable-static \
--enable-zypp \
++++++ PackageKit-zypp-packagesize.patch ++++++
>From e6191bb910bca7f47726be2ee273b29e9d74442d Mon Sep 17 00:00:00 2001
From: Max Lin <max....@gmx.com>
Date: Mon, 18 Jun 2012 15:33:27 +0800
Subject: [PATCH] zypp: Fix calculation of package size with recent versions
of libzypp
Since the return size no longer is KBytes in libzypp, but Bytes, we do
not need to do size * 1024, starting with libzypp 11.4.0.
---
backends/zypp/pk-backend-zypp.cpp | 6 ++++++
configure.ac | 4 ++++
2 files changed, 10 insertions(+)
diff --git a/backends/zypp/pk-backend-zypp.cpp
b/backends/zypp/pk-backend-zypp.cpp
index f7398e0..d909b35 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*/
+#include "config.h"
+
#include <gmodule.h>
#include <glib.h>
#include <pk-backend.h>
@@ -580,7 +582,11 @@ backend_get_details_thread (PkBackend *backend)
group,
package.lookupStrAttribute
(sat::SolvAttr::description).c_str (),
package.lookupStrAttribute
(sat::SolvAttr::url).c_str (),
+#ifdef ZYPP_RETURN_BYTES
+ size);
+#else
size * 1024);
+#endif
}
} catch (const target::rpm::RpmException &ex) {
diff --git a/configure.ac b/configure.ac
index 12a3610..3d9ea64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -742,6 +742,10 @@ fi
if test x$enable_zypp = xyes; then
PKG_CHECK_MODULES(ZYPP, libzypp >= 6.16.0)
+ PKG_CHECK_EXISTS(libzypp >= 11.4.0, [ ZYPP_RETURN_BYTES="yes" ], [
ZYPP_RETURN_BYTES="no" ])
+ if test "x$ZYPP_RETURN_BYTES" = "xyes"; then
+ AC_DEFINE(ZYPP_RETURN_BYTES, 1, [define if libzypp returns package
size in bytes])
+ fi
fi
if test x$enable_slapt = xyes; then
--
1.7.10
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
