Merge branch 'f27' into epel7

3 files changed, 21 insertions, 67 deletions

diff --git a/.gitignore b/.gitignore
index 080d429..c9bc6bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ gnome-panel-2.31.6.tar.bz2
 /gnome-panel-3.20.0.tar.xz
 /gnome-panel-3.20.1.tar.xz
 /gnome-panel-3.22.0.tar.xz
+/gnome-panel-3.24.0.tar.xz
+/gnome-panel-3.24.1.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5952a0c..344bdff 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -2,7 +2,7 @@
 
 %define gnome_desktop_version 2.91.6
 %define glib2_version 2.45.3
-%define gtk3_version 3.19.6
+%define gtk3_version 3.22.0
 %define libwnck_version 3.4.6
 %define gnome_menus_version 3.7.90
 %define telepathy_glib_version 0.14.0
@@ -16,11 +16,11 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 3.22.0
+Version: 3.26.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.22/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-panel/3.26/%{name}-%{version}.tar.xz
 
 
 License: GPLv2+ and LGPLv2+ and GFDL
@@ -35,9 +35,6 @@ Requires: evolution-data-server >= %{evolution_data_server_version}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 Requires(post): hicolor-icon-theme
-Requires(post): GConf2
-Requires(pre): GConf2
-Requires(preun): GConf2
 
 BuildRequires: libxml2-python
 BuildRequires: intltool
@@ -45,7 +42,6 @@ BuildRequires: gettext
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: libtool
-BuildRequires: GConf2-devel
 BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: gdm-devel
 BuildRequires: itstool
@@ -78,44 +74,6 @@ BuildRequires: libcanberra-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gnome-common
 
-Obsoletes: gdm-user-switch-applet < 1:2.91.6
-Conflicts: gnome-power-manager < 2.15.3
-
-Obsoletes: libgail-gnome < 1.20.4
-
-# Obsolete all old applet packages; this is the output of
-# repoquery --whatrequires libpanel-applet-2.so.0 gnome-python2-applet
-# as of Fedora 15 20110428, as well as ones from Fedora 14.
-Obsoletes: deskbar-applet <= 0:2.32.0-5
-Obsoletes: deskbar-applet-devel <= 0:2.32.0-5
-Obsoletes: file-browser-applet <= 0:0.6.6-2
-Obsoletes: glunarclock <= 0:0.34.1-2
-Obsoletes: gnome-applet-bubblemon <= 0:2.0.15-2
-Obsoletes: gnome-applet-cpufire <= 0:1.6-4
-Obsoletes: gnome-applet-globalmenu <= 0:0.7.9-2
-Obsoletes: gnome-applet-grandr <= 0:0.4.1-3
-Obsoletes: gnome-applet-jalali-calendar <= 0:1.7.1-3
-Obsoletes: gnome-applet-music <= 0:2.5.1-6
-Obsoletes: gnome-applet-sensors <= 0:2.2.7-5
-Obsoletes: gnome-applet-sensors-devel <= 0:2.2.7-5
-Obsoletes: gnome-applet-timer <= 0:2.1.4-3
-Obsoletes: gnome-applet-window-picker <= 0:0.5.8-3
-Obsoletes: gnome-applets <= 1:3.8.1-1
-Obsoletes: gnome-netstatus <= 0:2.28.2-2
-Obsoletes: gnome-python2-applet <= 0:2.32.0-2
-Obsoletes: gnome-schedule <= 0:2.0.2-7
-Obsoletes: gnubiff <= 0:2.2.13-5
-Obsoletes: hamster-applet <= 0:2.32.0-5
-Obsoletes: lock-keys-applet <= 0:1.0-22
-Obsoletes: uim-gnome <= 0:1.6.1-2
-Obsoletes: x-tile <= 0:1.8.6-2
-# Other ones that were already retired from Fedora 15
-Obsoletes: gnome-applet-netspeed <= 0.16-6
-Obsoletes: contact-lookup-applet <= 0.17-7
-
-# Also obsolete the now-dead libpanelappletmm
-Obsoletes: libpanelappletmm <= 0:2.26.0-3
-
 %description
 The GNOME panel provides the window list, workspace switcher, menus, and other
 features for the GNOME desktop.
@@ -183,12 +141,10 @@ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -207,33 +163,29 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_datadir}/applications/gnome-panel.desktop
 %{_bindir}/gnome-panel
 %{_bindir}/gnome-desktop-item-edit
-%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
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.clock.gschema.xml
+%{_libdir}/gnome-panel/
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.*.xml
 
 %files libs
-%{_libdir}/*.so.*
+%{_libdir}/libpanel-applet.so.3*
 
 %files devel
-%{_bindir}/panel-test-applets
 %{_includedir}/gnome-panel/
-%{_libdir}/pkgconfig/*
-%{_libdir}/*.so
+%{_libdir}/libpanel-applet.so
+%{_libdir}/pkgconfig/libgnome-panel.pc
+%{_libdir}/pkgconfig/libpanel-applet.pc
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Nov 13 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.26.0-1
+- new version
+
+* Tue Mar 28 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.24.1-1
+- new version
+
+* Sun Mar 26 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.24.0-1
+- new version
+
 * Sun Mar 26 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.22.0-1
 - new version
 
diff --git a/sources b/sources
index 339c714..81e9c2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9adcb1bd0515e5b7daf356dc6dc1d84a  gnome-panel-3.22.0.tar.xz
+8e9fa02a55e447e613c629bcf467f807  gnome-panel-3.26.0.tar.xz