Hello community,

here is the log from the commit of package NetworkManager-gnome for 
openSUSE:Factory checked in at 2012-02-17 12:06:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-gnome (Old)
 and      /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "NetworkManager-gnome", Maintainer is "[email protected]"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/NetworkManager-gnome/NetworkManager-gnome.changes    
    2012-01-09 11:15:57.000000000 +0100
+++ 
/work/SRC/openSUSE:Factory/.NetworkManager-gnome.new/NetworkManager-gnome.changes
   2012-02-17 12:06:39.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Feb  8 20:49:26 UTC 2012 - [email protected]
+
+- Add NetworkManager-gnome-link-gkr.patch: Fix linking with
+  gnome-keyring in a gconf-helpers test program.
+- Add call to autoreconf in %prep, as above patch touches the build
+  system.
+
+-------------------------------------------------------------------

New:
----
  NetworkManager-gnome-link-gkr.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ NetworkManager-gnome.spec ++++++
--- /var/tmp/diff_new_pack.S83ez5/_old  2012-02-17 12:06:40.000000000 +0100
+++ /var/tmp/diff_new_pack.S83ez5/_new  2012-02-17 12:06:40.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package NetworkManager-gnome
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,14 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           NetworkManager-gnome
 Url:            http://www.gnome.org/projects/NetworkManager/
 Version:        0.9.2.0
-Release:        1
+Release:        0
 # FIXME: --disable-more-warnings should be dropped from configure when 
possible. Added with 0.9.2.0 for Gtk+ 3.3 build.
-License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  NetworkManager-devel >= 0.9.1
 BuildRequires:  dbus-1-devel
@@ -38,12 +35,15 @@
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(iso-codes)
-Group:          System/GUI/GNOME
 Summary:        GNOME applications for use with NetworkManager
+License:        GPL-2.0+
+Group:          System/GUI/GNOME
 Source:         
http://download.gnome.org/sources/network-manager-applet/0.9/network-manager-applet-%{version}.tar.bz2
 Source1:        nm-icons.tar.gz
 # PATCH-FIX-OPENSUSE NetworkManager-gnome-OnlyShowIn.patch -- Add OnlyShowIn 
key to autostart file
 Patch1:         NetworkManager-gnome-OnlyShowIn.patch
+# PATCH-FIX-UPSTREAM NetworkManager-gnome-link-gkr.patch [email protected] 
-- Fix linking with gnome-keyring in a gconf-helpers test program (git commit 
9c01a7a)
+Patch2:         NetworkManager-gnome-link-gkr.patch
 Provides:       NetworkManager-client
 Requires:       NetworkManager >= 0.9.1
 # needed for translated country names
@@ -59,7 +59,6 @@
 NetworkManager, including a panel applet for wireless networks.
 
 %package -n libnm-gtk0
-License:        GPLv2+
 Summary:        NetworkManager Gtk+ dialogs
 Group:          System/Libraries
 
@@ -67,7 +66,6 @@
 This library provides GTK+ dialogs for NetworkManager integration.
 
 %package -n libnm-gtk-devel
-License:        GPLv2+
 Summary:        NetworkManager Gtk+ dialogs -- Development Files
 Group:          Development/Libraries/GNOME
 Requires:       libnm-gtk0 = %{version}
@@ -80,8 +78,11 @@
 %setup -q -n network-manager-applet-%{version} -a 1
 translation-update-upstream
 %patch1 -p1
+%patch2 -p1
 
 %build
+# Needed by patch2
+autoreconf -fi
 %configure \
     --disable-static \
     --disable-maintainer-mode \

++++++ NetworkManager-gnome-link-gkr.patch ++++++
>From 9c01a7a03b0914453308affe68ceee8ccd5324cd Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <[email protected]>
Date: Tue, 24 Jan 2012 11:32:24 +0000
Subject: Fix linking with gnome-keyring in a gconf-helpers test program.

---
diff --git a/src/gconf-helpers/tests/Makefile.am 
b/src/gconf-helpers/tests/Makefile.am
index b046859..8226347 100644
--- a/src/gconf-helpers/tests/Makefile.am
+++ b/src/gconf-helpers/tests/Makefile.am
@@ -18,7 +18,8 @@ test_upgrade_CPPFLAGS = \
 
 test_upgrade_LDADD = \
        ${builddir}/../libgconf-helpers-test.la \
-       $(NMA_LIBS)
+       $(NMA_LIBS) \
+       $(GNOME_KEYRING_LIBS)
 
 check-local: test-upgrade
        $(abs_builddir)/test-upgrade
--
cgit v0.9.0.2

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to