summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Wolff III <bruno@wolff.to>2012-12-25 14:54:37 -0600
committerBruno Wolff III <bruno@wolff.to>2012-12-25 14:54:37 -0600
commit01c9240c0c4656ed20a21b3ae590327fb42dbc93 (patch)
treee669c47db1f1dd0bea62fcd170653eabc7070bce
parent1d95967f78b54f51b17800ffaa960d1b5d4dc013 (diff)
downloadgnome-panel-01c9240c0c4656ed20a21b3ae590327fb42dbc93.tar.gz
gnome-panel-01c9240c0c4656ed20a21b3ae590327fb42dbc93.tar.xz
gnome-panel-01c9240c0c4656ed20a21b3ae590327fb42dbc93.zip
Drop obsolete include of gweather-xml.h
-rw-r--r--drop-gweather-xml-include.patch10
-rw-r--r--gnome-panel.spec10
2 files changed, 19 insertions, 1 deletions
diff --git a/drop-gweather-xml-include.patch b/drop-gweather-xml-include.patch
new file mode 100644
index 0000000..3b3a559
--- /dev/null
+++ b/drop-gweather-xml-include.patch
@@ -0,0 +1,10 @@
+--- applets/clock/clock.c.orig 2012-12-25 14:38:00.101601746 -0600
++++ applets/clock/clock.c 2012-12-25 14:38:30.331443803 -0600
+@@ -54,7 +54,6 @@
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libgnome-desktop/gnome-wall-clock.h>
+
+-#include <libgweather/gweather-xml.h>
+ #include <libgweather/location-entry.h>
+ #include <libgweather/timezone-menu.h>
+ #include <libgweather/gweather-enum-types.h>
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 01d54f5..174e897 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -17,7 +17,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.gnome.org
#VCS: git:git://git.gnome.org/gnome-panel
Source0: http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
@@ -28,6 +28,9 @@ Patch0: Use-16px-menu-icons.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=685142
Patch1: gnome-panel-use-gnome-menus.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=890219
+Patch2: drop-gweather-xml-include.patch
+
License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
@@ -149,6 +152,7 @@ Panel Applets using the libpanel-applet library.
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .16px
%patch1 -p1 -b .menus
+%patch2 -p0 -b .gweather
rm -f libtool
autoreconf -i -f
@@ -246,6 +250,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Dec 25 2012 Bruno Wolff III <bruno@wolff.to> - 3.6.2-4
+- Drop gweather-xml.h include
+- Rebuild for multiple soname bumps
+
* Thu Dec 20 2012 Kalev Lember <kalevlember@gmail.com> - 3.6.2-3
- Rebuilt for libgnome-desktop3 3.7.3 soname bump