Merge branch 'f25' into epel7

Conflicts:
	gnome-panel.spec

4 files changed, 45 insertions, 56 deletions

diff --git a/.gitignore b/.gitignore
index 46d5407..080d429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,11 @@ gnome-panel-2.31.6.tar.bz2
 /gnome-panel-3.6.0.tar.xz
 /gnome-panel-3.6.2.tar.xz
 /gnome-panel-3.14.0.tar.xz
+/gnome-panel-3.16.1.tar.xz
+/gnome-panel-3.17.2.tar.xz
+/gnome-panel-3.18.0.tar.xz
+/gnome-panel-3.18.1.tar.xz
+/gnome-panel-3.18.2.tar.xz
+/gnome-panel-3.20.0.tar.xz
+/gnome-panel-3.20.1.tar.xz
+/gnome-panel-3.22.0.tar.xz
diff --git a/gnome-panel-3.14-clock-fixes.patch b/gnome-panel-3.14-clock-fixes.patch
deleted file mode 100644
index 6a74b83..0000000
--- a/gnome-panel-3.14-clock-fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 3c8387188a699c797bef08c8a24ad2f988cd994c
-commit 6ca0e5dee4142d7995827b28ff674006ee3f8dd4
-
---- a/applets/clock/clock.c
-+++ b/applets/clock/clock.c
-@@ -1213,7 +1213,6 @@ location_set_current_cb (ClockLocation *loc,
- 	if (cd->map_widget)
- 		clock_map_refresh (CLOCK_MAP (cd->map_widget));
-         update_location_tiles (cd);
--	save_cities_store (cd);	
- }
- 
- static void
-@@ -1617,8 +1617,7 @@ edit_clear (ClockData *cd)
-         GtkWidget *lon_combo = _clock_get_widget (cd, "edit-location-longitude-combo");
- 
-         /* clear out the old data */
--        /* TODO: reinstate after bumping to gweather >= 3.10.1 */
--        //gweather_location_entry_set_location (cd->location_entry, NULL);
-+        gweather_location_entry_set_location (cd->location_entry, NULL);
-         gweather_timezone_menu_set_tzid (cd->zone_combo, NULL);
- 
-         gtk_entry_set_text (GTK_ENTRY (lat_entry), "");
---- a/configure.ac
-+++ b/configure.ac
-@@ -96,7 +96,7 @@ TELEPATHY_GLIB_REQUIRED=0.14.0
- LIBECAL_REQUIRED=3.5.3
- LIBEDATASERVER_REQUIRED=3.5.3
- CAIRO_REQUIRED=1.0.0
--GWEATHER_REQUIRED=3.9.2
-+GWEATHER_REQUIRED=3.10.1
- DCONF_REQUIRED=0.13.4
- LIBRSVG_REQUIRED=2.36.2
- 
diff --git a/gnome-panel.spec b/gnome-panel.spec
index b1bed6e..5952a0c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,14 +1,14 @@
 %define gettext_package gnome-panel-3.0
 
 %define gnome_desktop_version 2.91.6
-%define glib2_version 2.35.0
-%define gtk3_version 3.3.8
+%define glib2_version 2.45.3
+%define gtk3_version 3.19.6
 %define libwnck_version 3.4.6
 %define gnome_menus_version 3.7.90
 %define telepathy_glib_version 0.14.0
 %define evolution_data_server_version 3.5.3
 %define cairo_version 1.0.0
-%define libgweather_version 3.10.1
+%define libgweather_version 3.17.1
 %define dconf_version 0.13.4
 %define librsvg_version 2.36.2
 
@@ -16,12 +16,11 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 3.14.0
-Release: 3%{?dist}
+Version: 3.22.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
-Source0: http://download.gnome.org/sources/gnome-panel/3.14/%{name}-%{version}.tar.xz
-Patch0:  gnome-panel-3.14-clock-fixes.patch
+Source0: http://download.gnome.org/sources/gnome-panel/3.22/%{name}-%{version}.tar.xz
 
 
 License: GPLv2+ and LGPLv2+ and GFDL
@@ -48,6 +47,7 @@ BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: GConf2-devel
 BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: gdm-devel
 BuildRequires: itstool
 BuildRequires: libxslt
 BuildRequires: libX11-devel
@@ -76,7 +76,6 @@ BuildRequires: gettext-devel
 BuildRequires: libtool
 BuildRequires: libcanberra-devel
 BuildRequires: desktop-file-utils
-BuildRequires: gobject-introspection-devel
 BuildRequires: gnome-common
 
 Obsoletes: gdm-user-switch-applet < 1:2.91.6
@@ -142,7 +141,6 @@ Panel Applets using the libpanel-applet library.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .clock
 
 rm -f libtool
 autoreconf -i -f
@@ -209,13 +207,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_datadir}/applications/gnome-panel.desktop
 %{_bindir}/gnome-panel
 %{_bindir}/gnome-desktop-item-edit
-%{_libexecdir}/%{name}/
-
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-
+%dir %{_libdir}/gnome-panel/
+%{_libdir}/gnome-panel/libclock-applet.so
+%{_libdir}/gnome-panel/libfish-applet.so
+%{_libdir}/gnome-panel/libnotification-area-applet.so
+%{_libdir}/gnome-panel/libwnck-applet.so
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
@@ -229,7 +225,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 
 %files libs
 %{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/PanelApplet-5.0.typelib
 
 %files devel
 %{_bindir}/panel-test-applets
@@ -237,14 +232,34 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
 %{_datadir}/gtk-doc
-%{_datadir}/gir-1.0/PanelApplet-5.0.gir
 
 %changelog
-* Sun Dec 27 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-3
+* Sun Mar 26 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.22.0-1
+- new version
+
+* Mon Sep 12 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.20.1-1
+- new version
+
+* Mon Apr 18 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.20.0-1
+- Version bump for GNOME Flashback 3.20.
+
+* Thu Apr 14 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.2-1
+- new version
+
+* Sun Dec 27 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.1-2
 - Drop gnome-shell-specific gnome-session-xsession dependency
 
-* Fri Dec 18 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-2
-- Add upstream fixes for clock applet
+* Tue Oct 13 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.1-1
+- Update to 3.18.1
+
+* Fri Oct 02 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.18.0-1
+- Version bump for GNOME Flashback 3.18.
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.17.2-1
+- Unstable version bump
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.16.1-1
+- Version bump for GNOME Flashback 3.16.
 
 * Wed Feb 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-1
 - Version bump for GNOME Flashback 3.14.
diff --git a/sources b/sources
index 85f6418..339c714 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcab3e1c007f16b13d54a8ac7ac236e9  gnome-panel-3.14.0.tar.xz
+9adcb1bd0515e5b7daf356dc6dc1d84a  gnome-panel-3.22.0.tar.xz