- updated to 1.10.0 (1.8.x left on MATE-1.8 branch)

diff --git a/mate-applets.spec b/mate-applets.spec
index 9351e129c2d4ea8faf1e3676cece8732d47a66f4..25753a33df186d52e5a486a2bcf802440bccee48 100644 (file)
--- a/mate-applets.spec
+++ b/mate-applets.spec
@@ -10,12 +10,12 @@ Summary(pl.UTF-8):  Aplety MATE - małe aplikacje osadzające się w panelu
 Summary(ru.UTF-8):     Маленькие программы, встраивающиеся в панель MATE
 Summary(uk.UTF-8):     Маленькі програми, що вбудовуються в панель MATE
 Name:          mate-applets
-Version:       1.8.1
-Release:       3
+Version:       1.10.0
+Release:       1
 License:       GPL v2+ (applets), FDL (help)
 Group:         X11/Applications
-Source0:       http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
-# Source0-md5: 01979ea5f4d453ed0a91d3edc1de0eb0
+Source0:       http://pub.mate-desktop.org/releases/1.10/%{name}-%{version}.tar.xz
+# Source0-md5: bd0f0cae0ee6215d16fa63df688f3b43
 # check paths in Makefile before removing it!
 Patch0:                m4_fix.patch
 Patch1:                uidir.patch
@@ -544,7 +544,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mate-applet-battstat -f mate-battstat.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/battstat-applet-2
+%attr(755,root,root) %{_libexecdir}/battstat-applet
 %{_datadir}/%{name}/builder/battstat_applet.ui
 %{_datadir}/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service
 %{_datadir}/mate-panel/applets/org.mate.applets.BattstatApplet.mate-panel-applet
@@ -557,7 +557,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mate-applet-charpicker -f mate-char-palette.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/charpick_applet2
+%attr(755,root,root) %{_libexecdir}/mate-charpick-applet
 %{_datadir}/dbus-1/services/org.mate.panel.applet.CharpickerAppletFactory.service
 %{_datadir}/glib-2.0/schemas/org.mate.panel.applet.charpick.gschema.xml
 %{_datadir}/mate-panel/applets/org.mate.applets.CharpickerApplet.mate-panel-applet
@@ -590,14 +590,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mate-applet-drivemount -f mate-drivemount.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/drivemount_applet2
+%attr(755,root,root) %{_libexecdir}/mate-drivemount-applet
 %{_datadir}/dbus-1/services/org.mate.panel.applet.DriveMountAppletFactory.service
 %{_datadir}/mate-panel/applets/org.mate.applets.DriveMountApplet.mate-panel-applet
 %{_datadir}/mate-panel/ui/drivemount-applet-menu.xml
 
 %files -n mate-applet-geyes -f mate-geyes.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/geyes_applet2
+%attr(755,root,root) %{_libexecdir}/mate-geyes-applet
 %{_datadir}/%{name}/geyes
 %{_datadir}/dbus-1/services/org.mate.panel.applet.GeyesAppletFactory.service
 %{_datadir}/glib-2.0/schemas/org.mate.panel.applet.geyes.gschema.xml
@@ -607,7 +607,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mate-applet-gweather -f mateweather.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/mateweather-applet-2
+%attr(755,root,root) %{_libexecdir}/mateweather-applet
 %{_datadir}/dbus-1/services/org.mate.panel.applet.MateWeatherAppletFactory.service
 %{_datadir}/mate-panel/applets/org.mate.applets.MateWeatherApplet.mate-panel-applet
 %{_datadir}/mate-panel/ui/mateweather-applet-menu.xml
@@ -628,7 +628,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mate-applet-multiload -f mate-multiload.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/multiload-applet-2
+%attr(755,root,root) %{_libexecdir}/mate-multiload-applet
 %{_datadir}/dbus-1/services/org.mate.panel.applet.MultiLoadAppletFactory.service
 %{_datadir}/glib-2.0/schemas/org.mate.panel.applet.multiload.gschema.xml
 %{_datadir}/mate-panel/ui/multiload-applet-menu.xml

diff --git a/uidir.patch b/uidir.patch
index 17894c02fc5b9d8db3d6ca7bf86f5affbc14fe21..92b06579f235e6db13f988c45f2c0731978fb9f8 100644 (file)
--- a/uidir.patch
+++ b/uidir.patch
@@ -1,134 +1,135 @@
---- mate-applets-1.5.2/./battstat/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./battstat/Makefile.am  2013-03-14 20:00:10.041169347 +0200
-@@ -91,7 +91,7 @@
+--- mate-applets-1.10.0/battstat/Makefile.am.orig      2015-05-12 17:58:54.269026483 +0200
++++ mate-applets-1.10.0/battstat/Makefile.am   2015-05-12 20:58:20.245241344 +0200
+@@ -89,7 +89,7 @@
  
  CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
  
--uidir = $(datadir)/mate-2.0/ui
+-uidir = $(datadir)/mate/ui
 +uidir = $(datadir)/mate-panel/ui
  ui_DATA = battstat-applet-menu.xml
  
  EXTRA_DIST =                                                  \
---- mate-applets-1.5.2/./multiload/Makefile.am~        2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./multiload/Makefile.am 2013-03-14 20:00:28.041998082 +0200
+--- mate-applets-1.10.0/multiload/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
++++ mate-applets-1.10.0/multiload/Makefile.am  2013-03-14 20:00:28.041998082 +0200
 @@ -42,7 +42,7 @@
        $(gsettings_SCHEMAS_in_in)                      \
        $(ui_DATA)
  
--uidir         = $(datadir)/mate-2.0/ui
+-uidir         = $(datadir)/mate/ui
 +uidir         = $(datadir)/mate-panel/ui
  ui_DATA               = multiload-applet-menu.xml
  
  appletdir       = $(datadir)/mate-panel/applets
---- mate-applets-1.5.2/./stickynotes/Makefile.am~      2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./stickynotes/Makefile.am       2013-03-14 20:00:40.159222611 +0200
+--- mate-applets-1.10.0/stickynotes/Makefile.am~       2013-03-08 02:20:01.000000000 +0200
++++ mate-applets-1.10.0/stickynotes/Makefile.am        2013-03-14 20:00:40.159222611 +0200
 @@ -40,7 +40,7 @@
  
  builder_DATA = $(builder_files)
  
--uidir = $(datadir)/mate-2.0/ui
+-uidir = $(datadir)/mate/ui
 +uidir = $(datadir)/mate-panel/ui
  ui_DATA = $(ui_files)
  
  @INTLTOOL_XML_NOMERGE_RULE@
---- mate-applets-1.5.2/./accessx-status/Makefile.am~   2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./accessx-status/Makefile.am    2013-03-14 20:00:51.406407084 +0200
+--- mate-applets-1.10.0/accessx-status/Makefile.am~    2013-03-08 02:20:01.000000000 +0200
++++ mate-applets-1.10.0/accessx-status/Makefile.am     2013-03-14 20:00:51.406407084 +0200
 @@ -36,7 +36,7 @@
                -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
                $< > $@
  
--uidir   = $(datadir)/mate-2.0/ui
+-uidir   = $(datadir)/mate/ui
 +uidir   = $(datadir)/mate-panel/ui
  ui_DATA = accessx-status-applet-menu.xml
  
  CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES)
---- mate-applets-1.5.2/./trashapplet/Makefile.am~      2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./trashapplet/Makefile.am       2013-03-14 20:01:02.450248862 +0200
+--- mate-applets-1.10.0/trashapplet/Makefile.am~       2013-03-08 02:20:01.000000000 +0200
++++ mate-applets-1.10.0/trashapplet/Makefile.am        2013-03-14 20:01:02.450248862 +0200
 @@ -21,7 +21,7 @@
              -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
              $< > $@
  
--uidir = $(datadir)/mate-2.0/ui
+-uidir = $(datadir)/mate/ui
 +uidir = $(datadir)/mate-panel/ui
  ui_DATA = trashapplet-menu.xml
  
  builder_DATA = trashapplet-empty-progress.ui
---- mate-applets-1.6.2/trashapplet/src/Makefile.am.orig        2014-01-01 10:57:39.783292710 +0100
-+++ mate-applets-1.6.2/trashapplet/src/Makefile.am     2014-01-01 10:59:11.219955539 +0100
-@@ -1,7 +1,8 @@
+--- mate-applets-1.10.0/trashapplet/src/Makefile.am.orig       2015-05-12 21:00:56.068568138 +0200
++++ mate-applets-1.10.0/trashapplet/src/Makefile.am    2015-05-12 21:02:20.331897935 +0200
+@@ -1,8 +1,9 @@
 +uidir = $(datadir)/mate-panel/ui
  AM_CPPFLAGS = -I$(top_srcdir)         \
           $(MATE_APPLETS4_CFLAGS)      \
+          $(MATEDESKTOP_CFLAGS)        \
           $(GIO_CFLAGS)                \
--           -DTRASH_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\"
+-           -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
 +           -DTRASH_MENU_UI_DIR=\""$(uidir)"\"
  
  libexec_PROGRAMS = trashapplet
  
---- mate-applets-1.5.2/./cpufreq/Makefile.am~  2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./cpufreq/Makefile.am   2013-03-14 20:02:57.252200866 +0200
+--- mate-applets-1.10.0/cpufreq/Makefile.am~   2013-03-08 02:20:01.000000000 +0200
++++ mate-applets-1.10.0/cpufreq/Makefile.am    2013-03-14 20:02:57.252200866 +0200
 @@ -30,7 +30,7 @@
  
  builder_DATA = cpufreq-preferences.ui
  
--uidir = $(datadir)/mate-2.0/ui
+-uidir = $(datadir)/mate/ui
 +uidir = $(datadir)/mate-panel/ui
  ui_DATA = cpufreq-applet-menu.xml
  
  CLEANFILES = \
---- mate-applets-1.6.2/cpufreq/src/Makefile.am.orig    2014-01-01 11:01:50.666615515 +0100
-+++ mate-applets-1.6.2/cpufreq/src/Makefile.am 2014-01-01 11:03:13.679945361 +0100
+--- mate-applets-1.10.0/cpufreq/src/Makefile.am.orig   2014-01-01 11:01:50.666615515 +0100
++++ mate-applets-1.10.0/cpufreq/src/Makefile.am        2014-01-01 11:03:13.679945361 +0100
 @@ -4,8 +4,9 @@
  
  SUBDIRS = $(selector_SUBDIR)
  
 +uidir = $(datadir)/mate-panel/ui
  AM_CPPFLAGS = \
--      -DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\"      \
+-      -DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate/ui"\"  \
 +      -DCPUFREQ_MENU_UI_DIR=\""$(uidir)"\"    \
        $(MATE_APPLETS4_CFLAGS)                                 \
        $(LIBGLADE_CFLAGS)                                      \
        $(DBUS_CFLAGS)
---- mate-applets-1.5.2/./mateweather/Makefile.am~      2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./mateweather/Makefile.am       2013-03-14 20:03:47.911199809 +0200
+--- mate-applets-1.10.0/mateweather/Makefile.am~       2013-03-08 02:20:01.000000000 +0200
++++ mate-applets-1.10.0/mateweather/Makefile.am        2013-03-14 20:03:47.911199809 +0200
 @@ -30,7 +30,7 @@
        $(NETWORKMANAGER_LIBS)  \
        $(DBUS_LIBS)
  
--uidir = $(datadir)/mate-2.0/ui
+-uidir = $(datadir)/mate/ui
 +uidir = $(datadir)/mate-panel/ui
  ui_DATA = mateweather-applet-menu.xml
  
  appletdir       = $(datadir)/mate-panel/applets
---- mate-applets-1.5.2/./drivemount/Makefile.am~       2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./drivemount/Makefile.am        2013-03-14 20:04:02.671879372 +0200
+--- mate-applets-1.10.0/drivemount/Makefile.am~        2013-03-08 02:20:01.000000000 +0200
++++ mate-applets-1.10.0/drivemount/Makefile.am 2013-03-14 20:04:02.671879372 +0200
 @@ -40,7 +40,7 @@
              -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
              $< > $@
  
--uidir = $(datadir)/mate-2.0/ui
+-uidir = $(datadir)/mate/ui
 +uidir = $(datadir)/mate-panel/ui
  ui_DATA = drivemount-applet-menu.xml
  
  CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
---- mate-applets-1.5.2/./geyes/Makefile.am~    2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./geyes/Makefile.am     2013-03-14 20:04:15.615808629 +0200
+--- mate-applets-1.10.0/geyes/Makefile.am~     2013-03-08 02:20:01.000000000 +0200
++++ mate-applets-1.10.0/geyes/Makefile.am      2013-03-14 20:04:15.615808629 +0200
 @@ -40,7 +40,7 @@
              -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
              $< > $@
  
--uidir = $(datadir)/mate-2.0/ui
+-uidir = $(datadir)/mate/ui
 +uidir = $(datadir)/mate-panel/ui
  ui_DATA = geyes-applet-menu.xml
  
  @INTLTOOL_XML_NOMERGE_RULE@
---- mate-applets-1.5.2/./charpick/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./charpick/Makefile.am  2013-03-14 20:04:26.936329764 +0200
+--- mate-applets-1.10.0/charpick/Makefile.am~  2013-03-08 02:20:01.000000000 +0200
++++ mate-applets-1.10.0/charpick/Makefile.am   2013-03-14 20:04:26.936329764 +0200
 @@ -45,7 +45,7 @@
  %.gschema.xml.in: %.gschema.xml.in.in Makefile
        $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
  
--uidir = $(datadir)/mate-2.0/ui
+-uidir = $(datadir)/mate/ui
 +uidir = $(datadir)/mate-panel/ui
  ui_DATA = charpick-applet-menu.xml