diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2009-04-27 06:26:28 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2009-04-27 06:26:28 +0000 |
| commit | 6703eef77079a03556ff8c1aa1293564c50ef6c5 (patch) | |
| tree | 4807a017b38244447168765ca574018557dd93d3 | |
| parent | 69d00b0a66215ce0d47ea129dfef95065038bc8c (diff) | |
| download | gnome-panel-6703eef77079a03556ff8c1aa1293564c50ef6c5.tar.gz gnome-panel-6703eef77079a03556ff8c1aa1293564c50ef6c5.tar.xz gnome-panel-6703eef77079a03556ff8c1aa1293564c50ef6c5.zip | |
don't drop schemas translationsgnome-panel-2_26_1-3_fc12
| -rw-r--r-- | clock-network.patch | 22 | ||||
| -rw-r--r-- | gnome-panel.spec | 14 |
2 files changed, 34 insertions, 2 deletions
diff --git a/clock-network.patch b/clock-network.patch new file mode 100644 index 0000000..db88b82 --- /dev/null +++ b/clock-network.patch @@ -0,0 +1,22 @@ +diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.network gnome-panel-2.26.1/applets/clock/clock-location.c +--- gnome-panel-2.26.1/applets/clock/clock-location.c.network 2009-04-15 17:28:26.760634154 -0400 ++++ gnome-panel-2.26.1/applets/clock/clock-location.c 2009-04-15 17:43:41.869383882 -0400 +@@ -12,6 +12,9 @@ + #include <time.h> + #include <unistd.h> + #include <math.h> ++#include <netinet/in.h> ++#include <arpa/nameser.h> ++#include <resolv.h> + + #include <glib.h> + #include <gio/gio.h> +@@ -695,6 +698,8 @@ state_notify (DBusPendingCall *pending, + DBUS_TYPE_UINT32, &result, + DBUS_TYPE_INVALID)) { + if (result == NM_STATE_CONNECTED) { ++ /* thank you, glibc */ ++ res_init (); + update_weather_infos (); + } + } diff --git a/gnome-panel.spec b/gnome-panel.spec index dc2394a..0febc79 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -23,7 +23,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.26.1 -Release: 1%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2 @@ -115,6 +115,9 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch Patch35: clock-wakeups.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=579092 +Patch38: clock-network.patch + Conflicts: gnome-power-manager < 2.15.3 %description @@ -161,6 +164,7 @@ Panel Applets using the libpanel-applet library. %patch11 -p1 -b .applet-error %patch24 -p1 -b .allow-spurious-view-done-signals %patch35 -p1 -b .clock-wakeups +%patch38 -p1 -b .clock-network libtoolize --force --copy @@ -174,7 +178,7 @@ cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas # ideally intltool (ha!) would do that for us # http://bugzilla.gnome.org/show_bug.cgi?id=474987 cd po -grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$\|.*[.]policy[.]in$" POTFILES.in > POTFILES.keep +grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]policy[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in intltool-update --pot for p in *.po; do @@ -362,6 +366,12 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Mon Apr 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-3 +- Don't drop schemas translations from po files + +* Wed Apr 15 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-2 +- Fix the clock applets network tracking code + * Tue Apr 14 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-1 - Update to 2.26.1 |