Merge branch 'f27' into epel7

3 files changed, 14 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
index 2c36faa..5bf5c92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ gnome-applets-2.31.6.tar.bz2
 /gnome-applets-3.18.2.tar.xz
 /gnome-applets-3.20.0.tar.xz
 /gnome-applets-3.22.0.tar.xz
+/gnome-applets-3.24.0.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c47c702..edb2f37 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,7 +1,7 @@
 %define glib2_version 2.44.0
 %define pango_version 1.2.0
 %define gtk3_version 3.20.0
-%define gnome_panel_version 3.22.0
+%define gnome_panel_version 3.24.1
 %define libgtop2_version 2.12.0
 %define libxklavier_version 4.0
 %define libwnck_version 3.14.1
@@ -16,14 +16,14 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	3.22.0
+Version:	3.26.0
 Release:        1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
 # VCS: git:git://git.gnome.org/gnome-applets
-Source:		http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
+Source:		http://download.gnome.org/sources/%{name}/3.26/%{name}-%{version}.tar.xz
 
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk3-devel >= %{gtk3_version}
@@ -113,13 +113,11 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
-    glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{po_package}.lang
@@ -132,28 +130,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/*
 %{_datadir}/icons/hicolor/16x16/devices/*
 %{_datadir}/icons/hicolor/24x24/status/*
+%{_datadir}/pixmaps/windowbuttons-applet.png
+%{_datadir}/pixmaps/windowtitle-applet.png
 %{_bindir}/cpufreq-selector
 %{_datadir}/gnome-applets
-%dir %{_libdir}/gnome-applets
-%{_libdir}/gnome-applets/libaccessx-status-applet.so
-%{_libdir}/gnome-applets/libbattery-status-applet.so
-%{_libdir}/gnome-applets/libbrightness-applet.so
-%{_libdir}/gnome-applets/libcharacter-picker-applet.so
-%{_libdir}/gnome-applets/libcommand-applet.so
-%{_libdir}/gnome-applets/libcpu-frequency-applet.so
-%{_libdir}/gnome-applets/libdrive-mount-applet.so
-%{_libdir}/gnome-applets/libgeyes-applet.so
-%{_libdir}/gnome-applets/libgweather-applet.so
-%{_libdir}/gnome-applets/libinhibit-applet.so
-%{_libdir}/gnome-applets/libinvest-applet.so
-%{_libdir}/gnome-applets/libmodem-lights-applet.so
-%{_libdir}/gnome-applets/libmini-commander-applet.so
-%{_libdir}/gnome-applets/libmultiload-applet.so
-%{_libdir}/gnome-applets/libnet-speed-applet.so
-%{_libdir}/gnome-applets/libsticky-notes-applet.so
-%{_libdir}/gnome-applets/libtimer-applet.so
-%{_libdir}/gnome-applets/libtrash-applet.so
-%{_libdir}/gnome-applets/libwindow-picker-applet.so
+%{_libdir}/gnome-applets
 %{_sysconfdir}/sound/events/battstat_applet.soundlist
 %{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.*
@@ -163,6 +144,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Nov 13 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1:3.26.0-1
+- new version
+
+* Tue Mar 28 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1:3.24.0-1
+- new version
+
 * Sun Mar 26 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1:3.22.0-1
 - new version
 
diff --git a/sources b/sources
index 7a15e46..1b7d5f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7f744747195b27d38524f8350ed7ac7  gnome-applets-3.22.0.tar.xz
+c0710151af341840c2433c8dd563848f  gnome-applets-3.26.0.tar.xz