Browse Source

Cinnamon 1.8.2 & MATE 1.6

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7697 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 11 years ago
parent
commit
fc9254e407
37 changed files with 576 additions and 1077 deletions
  1. 4 1
      c/cinnamon/cinnamon-vl.spec
  2. 17 42
      lib/libm/libmatekbd/libmatekbd-vl.spec
  3. 5 2
      lib/libm/libmatekeyring/libmatekeyring-vl.spec
  4. 16 42
      lib/libm/libmateweather/libmateweather-vl.spec
  5. 7 4
      lib/libm/libmatewnck/libmatewnck-vl.spec
  6. 25 77
      m/mate-applets/mate-applets-vl.spec
  7. 6 3
      m/mate-backgrounds/mate-backgrounds-vl.spec
  8. 10 9
      m/mate-calc/mate-calc-vl.spec
  9. 5 2
      m/mate-common/mate-common-vl.spec
  10. 23 54
      m/mate-control-center/mate-control-center-vl.spec
  11. 37 4
      m/mate-desktop/mate-desktop-vl.spec
  12. 5 2
      m/mate-dialogs/mate-dialogs-vl.spec
  13. 5 2
      m/mate-doc-utils/mate-doc-utils-vl.spec
  14. 19 67
      m/mate-document-viewer/mate-document-viewer-vl.spec
  15. 19 47
      m/mate-file-archiver/mate-file-archiver-vl.spec
  16. 23 44
      m/mate-file-manager/mate-file-manager-vl.spec
  17. 6 2
      m/mate-icon-theme/mate-icon-theme-vl.spec
  18. 19 47
      m/mate-image-viewer/mate-image-viewer-vl.spec
  19. 5 2
      m/mate-keyring/mate-keyring-vl.spec
  20. 7 3
      m/mate-menus/mate-menus-vl.spec
  21. 21 47
      m/mate-notification-daemon/mate-notification-daemon-vl.spec
  22. 32 95
      m/mate-panel/mate-panel-vl.spec
  23. 5 2
      m/mate-polkit/mate-polkit-vl.spec
  24. 25 49
      m/mate-power-manager/mate-power-manager-vl.spec
  25. 25 48
      m/mate-screensaver/mate-screensaver-vl.spec
  26. 18 44
      m/mate-session-manager/mate-session-manager-vl.spec
  27. 45 79
      m/mate-settings-daemon/mate-settings-daemon-vl.spec
  28. 22 42
      m/mate-system-monitor/mate-system-monitor-vl.spec
  29. 7 4
      m/mate-system-tools/mate-system-tools-vl.spec
  30. 18 41
      m/mate-terminal/mate-terminal-vl.spec
  31. 18 46
      m/mate-text-editor/mate-text-editor-vl.spec
  32. 34 62
      m/mate-utils/mate-utils-vl.spec
  33. 22 41
      m/mate-window-manager/mate-window-manager-vl.spec
  34. 4 1
      m/muffin/muffin-vl.spec
  35. 4 1
      n/nemo/nemo-vl.spec
  36. 7 4
      t/task-cinnamon/task-cinnamon-vl.spec
  37. 6 15
      t/task-mate/task-mate-vl.spec

+ 4 - 1
c/cinnamon/cinnamon-vl.spec

@@ -1,6 +1,6 @@
 Name: 		cinnamon
 Summary: 	A Linux Desktop featuring a traditional layout and modern technology
-Version: 	1.7.6
+Version: 	1.8.2
 Release: 	1%{?_dist_release}
 
 Group: 		User Interface/Desktops
@@ -145,6 +145,9 @@ update-desktop-database -q &> /dev/null || :
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.2-1
+- new upstream release
+
 * Sun Apr 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.6-1
 - new upstream release
 - add Patch0 (cinnamon-1.7.6-gjs-1.0.patch)

+ 17 - 42
lib/libm/libmatekbd/libmatekbd-vl.spec

@@ -1,21 +1,20 @@
 Summary:	MATE keyboard shared library
 Name:		libmatekbd
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		System Environment/Libraries 
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
-BuildRequires:	mate-conf-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	libxklavier-devel
 BuildRequires:	libSM-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -56,9 +55,7 @@ libmatekbd.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -70,50 +67,24 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  desktop_mate_peripherals_keyboard_xkb.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    desktop_mate_peripherals_keyboard_xkb.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    desktop_mate_peripherals_keyboard_xkb.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING.LIB ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/desktop_mate_peripherals_keyboard_xkb.schemas
-%{_bindir}/matekbd-indicator-plugins-capplet
+%doc COPYING ChangeLog NEWS README
 %{_libdir}/libmatekbd*.so.*
-%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop
+%{_datadir}/MateConf/gsettings/matekbd.convert
+%{_datadir}/glib-2.0/schemas/org.mate.peripherals-keyboard-xkb.gschema.xml
 %{_datadir}/libmatekbd/ui/*.ui
 
 %files devel
@@ -125,6 +96,10 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 5 - 2
lib/libm/libmatekeyring/libmatekeyring-vl.spec

@@ -1,8 +1,8 @@
 Summary:	MATE keyring client library
 Name:		libmatekeyring
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		System Environment/Libraries 
 URL:		http://mate-desktop.org/
@@ -96,6 +96,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 16 - 42
lib/libm/libmateweather/libmateweather-vl.spec

@@ -1,14 +1,13 @@
 Summary:	Provides access to weather information from the net
 Name:		libmateweather
-Version:	1.4.0
+Version:	1.6.1
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		System Environment/Libraries 
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
-BuildRequires:	mate-conf-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	libsoup-devel
@@ -16,7 +15,8 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
+Requires(post,postun):	gtk2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -83,55 +83,25 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  mateweather.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mateweather.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mateweather.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/mateweather.schemas
 %{_libdir}/libmateweather.so.*
+%{_datadir}/glib-2.0/schemas/org.mate.weather.gschema.xml
 %{_datadir}/icons/mate/*/*/*
 %{_datadir}/libmateweather
 
@@ -147,6 +117,10 @@ fi
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 7 - 4
lib/libm/libmatewnck/libmatewnck-vl.spec

@@ -1,8 +1,8 @@
 Summary:	Window Navigator Construction Kit library for Mate
 Name:		libmatewnck
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		System Environment/Libraries 
 URL:		http://mate-desktop.org/
@@ -10,6 +10,7 @@ URL:		http://mate-desktop.org/
 BuildRequires:	mate-common
 BuildRequires:	gtk2-devel
 BuildRequires:	libX11-devel
+BuildRequires:	libXres-devel
 BuildRequires:	startup-notification-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
@@ -66,9 +67,7 @@ This package contains documentation for libmatewnck.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -101,6 +100,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- add BuildRequires: libXres-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - initial build
 

+ 25 - 77
m/mate-applets/mate-applets-vl.spec

@@ -1,20 +1,19 @@
 Summary:	Applets for MATE panel
 Name:		mate-applets
-Version:	1.4.0
+Version:	1.6.1
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		User Interface/Desktops
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-icon-theme
 BuildRequires:	mate-panel-devel
 BuildRequires:	mate-desktop-devel
 BuildRequires:	mate-settings-daemon-devel
-BuildRequires:	libmatenotify-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	libmateweather-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	libSM-devel
@@ -29,8 +28,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
-Requires(post,postun):	desktop-file-utils
+Requires(posttrans,postun):	glib2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -56,8 +54,7 @@ enhance your MATE experience.
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
 	--libexecdir=%{_libexecdir}/mate \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static 
 
 %{__make} %{?_smp_mflags}
 
@@ -65,9 +62,7 @@ enhance your MATE experience.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -78,95 +73,43 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-%post
-/sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  battstat.schemas \
-  charpick.schemas \
-  cpufreq-applet.schemas \
-  drivemount.schemas \
-  geyes.schemas \
-  multiload.schemas \
-  stickynotes.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    battstat.schemas \
-    charpick.schemas \
-    cpufreq-applet.schemas \
-    drivemount.schemas \
-    geyes.schemas \
-    multiload.schemas \
-    stickynotes.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    battstat.schemas \
-    charpick.schemas \
-    cpufreq-applet.schemas \
-    drivemount.schemas \
-    geyes.schemas \
-    multiload.schemas \
-    stickynotes.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+%post -p /sbin/ldconfig
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
 %{_sysconfdir}/dbus-1/system.d/org.mate.CPUFreqSelector.conf
-%{_sysconfdir}/mateconf/schemas/battstat.schemas
-%{_sysconfdir}/mateconf/schemas/charpick.schemas
-%{_sysconfdir}/mateconf/schemas/cpufreq-applet.schemas
-%{_sysconfdir}/mateconf/schemas/drivemount.schemas
-%{_sysconfdir}/mateconf/schemas/geyes.schemas
-%{_sysconfdir}/mateconf/schemas/multiload.schemas
-%{_sysconfdir}/mateconf/schemas/stickynotes.schemas
 %{_sysconfdir}/sound/events/mate-battstat_applet.soundlist
 %{_bindir}/mate-cpufreq-selector
-%{_libdir}/matecomponent/servers/MATE_CDPlayerApplet.server
-%{_libdir}/matecomponent/servers/MATE_KeyboardApplet.server
-%{_libdir}/matecomponent/servers/MATE_MailcheckApplet_Factory.server
-%{_libdir}/matecomponent/servers/MATE_MiniCommanderApplet.server
-%{_libdir}/matecomponent/servers/MATE_MixerApplet.server
-%{_libdir}/matecomponent/servers/MATE_NullApplet_Factory.server
-%{_libdir}/matecomponent/servers/MATE_Panel_WirelessApplet.server
 %{_libexecdir}/mate/accessx-status-applet
 %{_libexecdir}/mate/battstat-applet-2
 %{_libexecdir}/mate/charpick_applet2
-%{_libexecdir}/mate/cpufreq-applet
 %{_libexecdir}/mate/drivemount_applet2
 %{_libexecdir}/mate/geyes_applet2
 %{_libexecdir}/mate/mateweather-applet-2
+%{_libexecdir}/mate/mate-cpufreq-applet
 %{_libexecdir}/mate/multiload-applet-2
-%{_libexecdir}/mate/null_applet
 %{_libexecdir}/mate/stickynotes_applet
 %{_libexecdir}/mate/trashapplet
+%{_datadir}/MateConf/gsettings/stickynotes-applet.convert
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/dbus-1/system-services/org.mate.CPUFreqSelector.service
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.battstat.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.charpick.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.cpufreq.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.geyes.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.multiload.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.stickynotes.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/mate/48x48/apps/ax-applet.png
 %{_datadir}/mate/help
@@ -181,6 +124,11 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel, libmatenotiry-devel
+- add BuildRequires: libnotify-devel
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 - change BuildRequires: libmatewnck-devel instead of libwnck-devel

+ 6 - 3
m/mate-backgrounds/mate-backgrounds-vl.spec

@@ -1,8 +1,8 @@
 Summary:	Background images and data for MATE
 Name:		mate-backgrounds
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source:		http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source:		http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		User Interface/Desktops
 URL:		http://mate-desktop.org/
@@ -43,9 +43,12 @@ ln -sf ../gnome-background-properties/vine6.xml ${RPM_BUILD_ROOT}%{_datadir}/mat
 %files -f %{name}.lang
 %defattr(-, root, root)
 %{_datadir}/mate-background-properties
-%{_datadir}/pixmaps/backgrounds/mate
+%{_datadir}/backgrounds/mate
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 10 - 9
m/mate-calc/mate-calc-vl.spec

@@ -1,15 +1,14 @@
 Summary:	Calculator for the Mate desktop environment
 Name:		mate-calc
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/Productivity
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	bison
@@ -18,6 +17,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -46,8 +46,7 @@ There is a single graphics driver for Gtk2 included with this release.
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static
 
 %{__make} %{?_smp_mflags}
 
@@ -55,9 +54,7 @@ There is a single graphics driver for Gtk2 included with this release.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -90,13 +87,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_bindir}/mate-calc-cmd
 %{_bindir}/mate-calculator
 %{_datadir}/applications/mate-calc.desktop
-%{_datadir}/glib-2.0/schemas/org.mate.mate-calc.gschema.xml
-%{_datadir}/mate/help/mate-calc
+%{_datadir}/glib-2.0/schemas/org.mate.calc.gschema.xml
 %{_datadir}/%{name}
 %{_mandir}/man1/mate-calc.1.gz
+%{_mandir}/man1/mate-calc-cmd.1.gz
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 5 - 2
m/mate-common/mate-common-vl.spec

@@ -1,8 +1,8 @@
 Summary:	mate-common contains useful things common to building mate packages
 Name:		mate-common
-Version:	1.4.0
+Version:	1.6.1
 Release:	1%{?_dist_release}
-Source:		http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source:		http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Development/Tools
 URL:		http://mate-desktop.org/
@@ -40,6 +40,9 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 %{_mandir}/man1/mate-doc-common.1.gz
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 23 - 54
m/mate-control-center/mate-control-center-vl.spec

@@ -1,11 +1,9 @@
 Summary:	The Control Center for MATE
 Name:		mate-control-center
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
 
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-
-Patch0:		mate-control-center-1.2.1-configure.patch
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
 License:	GPLv2
 Group:		User Interface/Desktops
@@ -13,13 +11,13 @@ URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-desktop-devel
 BuildRequires:	mate-menus-devel
 BuildRequires:	mate-window-manager-devel
 BuildRequires:	mate-settings-daemon-devel
 BuildRequires:	libmatekbd-devel
 BuildRequires:	gtk2-devel
+BuildRequires:	dconf-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libSM-devel
 BuildRequires:	libXScrnSaver-devel
@@ -32,7 +30,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -61,14 +59,12 @@ mate-control-center.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
 	--disable-static \
-	--disable-scrollkeeper \
 	--disable-update-mimedb
 
 %{__make} %{?_smp_mflags}
@@ -77,9 +73,7 @@ mate-control-center.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -94,66 +88,34 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  fontilus.schemas \
-  mate-control-center.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    fontilus.schemas \
-    mate-control-center.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    fontilus.schemas \
-    mate-control-center.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/fontilus.schemas
-%{_sysconfdir}/mateconf/schemas/mate-control-center.schemas
-%{_sysconfdir}/xdg/autostart/mate-at-session.desktop
 %{_bindir}/mate-*
 %{_libdir}/libmate-window-settings.so.*
 %{_libdir}/window-manager-settings/libmarco.so
 %{_sbindir}/mate-display-properties-install-systemwide
+%{_datadir}/MateConf/gsettings/mate-control-center.convert
 %{_datadir}/applications/*.desktop
+%{_datadir}/glib-2.0/schemas/org.mate.control-center.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.control-center.keybinding.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mate/cursor-fonts/*
 %{_datadir}/mate/help/%{name}
@@ -161,6 +123,7 @@ fi
 %{_datadir}/mime/packages/mate-theme-package.xml
 %{_datadir}/omf/%{name}
 %{_datadir}/polkit-1/actions/org.mate.randr.policy
+%{_datadir}/thumbnailers/mate-font-viewer.thumbnailer
 
 %files devel
 %defattr(-,root,root,-)
@@ -172,6 +135,12 @@ fi
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+- remove Patch0 (mate-control-center-1.2.1-configure.patch)
+- add BuildRequires: dconf-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 37 - 4
m/mate-desktop/mate-desktop-vl.spec

@@ -1,15 +1,17 @@
 Summary:	Library with common API for various MATE modules
 Name:		mate-desktop
-Version:	1.4.2
+Version:	1.6.1
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		User Interface/Desktops
 URL:		http://mate-desktop.org/
 
+# patch for Vine
+Patch1001:	mate-desktop-vine-settings.patch
+
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	unique-devel
 BuildRequires:	startup-notification-devel
@@ -17,6 +19,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -56,6 +59,7 @@ This package contains documentation for mate-desktop.
 
 %prep
 %setup -q
+%patch1001 -p1 -b .vine
 
 
 %build
@@ -88,7 +92,13 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f %{name}.lang
@@ -96,7 +106,25 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 %doc COPYING ChangeLog NEWS README
 %{_bindir}/mate-about
 %{_libdir}/libmate-desktop-2.so.*
+%{_datadir}/MateConf/gsettings/mate-desktop.convert
 %{_datadir}/applications/mate-about.desktop
+%{_datadir}/glib-2.0/schemas/org.mate.accessibility-keyboard.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.accessibility-startup.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.applications-at-mobility.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.applications-at-visual.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.applications-browser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.applications-office.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.applications-terminal.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.background.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.file-views.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.interface.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.lockdown.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.peripherals-keyboard.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.peripherals-mouse.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.sound.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.thumbnail-cache.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.thumbnailers.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.typing-break.gschema.xml
 %{_datadir}/libmate-desktop/pnp.ids
 %{_datadir}/mate/help
 %{_datadir}/mate-about/mate-version.xml
@@ -114,6 +142,11 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
 
 %changelog
+* Sun May 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+- add Patch1001 (mate-desktop-vine-settings.patch)
+
 * Sat Nov 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.2-1
 - new upstream release
 - add BuildRequires: startup-notification-devel

+ 5 - 2
m/mate-dialogs/mate-dialogs-vl.spec

@@ -1,8 +1,8 @@
 Summary:	Display graphical dialog boxes from shell scripts
 Name:		mate-dialogs
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		System Environment/Libraries 
 URL:		http://mate-desktop.org/
@@ -74,6 +74,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 5 - 2
m/mate-doc-utils/mate-doc-utils-vl.spec

@@ -1,8 +1,8 @@
 Summary:	Documentation utilities for MATE
 Name:		mate-doc-utils
-Version:	1.4.0
+Version:	1.6.1
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Development/Tools
 URL:		http://mate-desktop.org/
@@ -81,6 +81,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 19 - 67
m/mate-document-viewer/mate-document-viewer-vl.spec

@@ -1,15 +1,14 @@
 Summary:	Simply a document viewer for MATE
 Name:		mate-document-viewer
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/Publishing
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-icon-theme
 BuildRequires:	mate-file-manager-devel
 BuildRequires:	libmatekeyring-devel
@@ -21,11 +20,13 @@ BuildRequires:	libtiff-devel
 BuildRequires:	djvulibre-devel
 BuildRequires:	libspectre-devel
 BuildRequires:	libkpathsea-devel
+BuildRequires:	libgxps-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
+Requires(post,postun):	gtk2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -60,8 +61,7 @@ mate-document-viewer.
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
 	--libexecdir=%{_libexecdir}/mate \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static 
 
 %{__make} %{?_smp_mflags}
 
@@ -69,9 +69,7 @@ mate-document-viewer.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -84,64 +82,16 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  atril-thumbnailer-comics.schemas \
-  atril-thumbnailer-djvu.schemas \
-  atril-thumbnailer-dvi.schemas \
-  atril-thumbnailer-ps.schemas \
-  atril-thumbnailer.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    atril-thumbnailer-comics.schemas \
-    atril-thumbnailer-djvu.schemas \
-    atril-thumbnailer-dvi.schemas \
-    atril-thumbnailer-ps.schemas \
-    atril-thumbnailer.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    atril-thumbnailer-comics.schemas \
-    atril-thumbnailer-djvu.schemas \
-    atril-thumbnailer-dvi.schemas \
-    atril-thumbnailer-ps.schemas \
-    atril-thumbnailer.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
 if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
   glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
@@ -152,11 +102,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %files -f atril.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/atril-thumbnailer-comics.schemas
-%{_sysconfdir}/mateconf/schemas/atril-thumbnailer-djvu.schemas
-%{_sysconfdir}/mateconf/schemas/atril-thumbnailer-dvi.schemas
-%{_sysconfdir}/mateconf/schemas/atril-thumbnailer-ps.schemas
-%{_sysconfdir}/mateconf/schemas/atril-thumbnailer.schemas
 %{_bindir}/atril
 %{_bindir}/atril-previewer
 %{_bindir}/atril-thumbnailer
@@ -174,6 +119,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mate/help/atril
 %{_datadir}/omf/atril
+%{_datadir}/thumbnailers/atril.thumbnailer
+%{_docdir}/mate/atril
 %{_mandir}/man1/atril.1.gz
 
 %files devel
@@ -181,11 +128,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_includedir}/atril
 %{_libdir}/libatrildocument.so
 %{_libdir}/libatrilview.so
-%{_libdir}/pkgconfig/atril-document-2.32.pc
-%{_libdir}/pkgconfig/atril-view-2.32.pc
+%{_libdir}/pkgconfig/atril-document-1.5.0.pc
+%{_libdir}/pkgconfig/atril-view-1.5.0.pc
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+- add BuildRequires: libgxps-devel
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 19 - 47
m/mate-file-archiver/mate-file-archiver-vl.spec

@@ -1,22 +1,22 @@
 Summary:	Archive manipulator for MATE
 Name:		mate-file-archiver
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/Archiving
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	libSM-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
+Requires(post,postun):	gtk2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -41,8 +41,7 @@ archive.
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
 	--libexecdir=%{_libexecdir}/mate \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static
 
 %{__make} %{?_smp_mflags}
 
@@ -50,9 +49,7 @@ archive.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -65,67 +62,42 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  engrampa.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    engrampa.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    engrampa.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f engrampa.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/engrampa.schemas
 %{_bindir}/engrampa
 %{_libexecdir}/mate/engrampa/isoinfo.sh
 %{_libexecdir}/mate/engrampa/rpm2cpio
+%{_datadir}/MateConf/gsettings/engrampa.convert
 %{_datadir}/applications/engrampa.desktop
 %{_datadir}/engrampa
+%{_datadir}/glib-2.0/schemas/org.mate.engrampa.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mate/help/engrampa
 %{_datadir}/omf/engrampa
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 23 - 44
m/mate-file-manager/mate-file-manager-vl.spec

@@ -1,9 +1,9 @@
 Summary:	The MATE shell and file manager
 Name:		mate-file-manager
-Version:	1.4.0
+Version:	1.6.1
 Release:	1%{?_dist_release}
 
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
 Patch0:		mate-file-manager-1.2.2-makefile.patch
 
@@ -12,9 +12,9 @@ Group:		User Interface/Desktops
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-desktop-devel
 BuildRequires:	gtk2-devel
+BuildRequires:	pangox-compat-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libSM-devel
 BuildRequires:	unique-devel
@@ -24,7 +24,8 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
+Requires(post,postun):	gtk2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -81,9 +82,7 @@ This package contains documentation for mate-file-manager.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -98,55 +97,26 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 %post
 /sbin/ldconfig
 
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  apps_caja_preferences.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    apps_caja_preferences.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    apps_caja_preferences.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f caja.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/apps_caja_preferences.schemas
 %{_bindir}/caja
 %{_bindir}/caja-autorun-software
 %{_bindir}/caja-connect-server
@@ -154,8 +124,12 @@ fi
 %{_libdir}/libcaja-extension.so.*
 %{_libdir}/girepository-1.0/Caja-2.0.typelib
 %{_libexecdir}/mate/caja-convert-metadata
+%{_datadir}/MateConf/gsettings/caja.convert
 %{_datadir}/applications/*.desktop
 %{_datadir}/caja
+%{_datadir}/dbus-1/services/org.mate.freedesktop.FileManager1.service
+%{_datadir}/glib-2.0/schemas/org.mate.caja.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.media-handling.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mime/packages/caja.xml
 %{_datadir}/pixmaps/caja
@@ -174,6 +148,11 @@ fi
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+- add BuildRequires: pangox-compat-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 6 - 2
m/mate-icon-theme/mate-icon-theme-vl.spec

@@ -1,8 +1,8 @@
 Summary:	A collection of icons used as the basis for MATE themes
 Name:		mate-icon-theme
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source:		http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source:		http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Development/Tools
 URL:		http://mate-desktop.org/
@@ -40,9 +40,13 @@ instead.
 %files
 %defattr(-, root, root)
 %{_datadir}/icons/mate
+%{_datadir}/icons/menta
 %{_datadir}/pkgconfig/mate-icon-theme.pc
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 19 - 47
m/mate-image-viewer/mate-image-viewer-vl.spec

@@ -1,15 +1,14 @@
 Summary:	An image viewing and cataloging program for MATE
 Name:		mate-image-viewer
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/Graphics
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-desktop-devel
 BuildRequires:	mate-icon-theme
 BuildRequires:	gtk2-devel
@@ -24,7 +23,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -72,8 +71,7 @@ This package contains documentation for mate-image-viewer.
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static 
 
 %{__make} %{?_smp_mflags}
 
@@ -81,9 +79,7 @@ This package contains documentation for mate-image-viewer.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -96,60 +92,32 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  eom.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    eom.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    eom.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f eom.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/eom.schemas
 %{_bindir}/eom
 %{_libdir}/eom/plugins
+%{_datadir}/MateConf/gsettings/eom.convert
 %{_datadir}/applications/eom.desktop
 %{_datadir}/eom
+%{_datadir}/glib-2.0/schemas/org.mate.eom.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mate/help/eom
 %{_datadir}/omf/eom
@@ -161,6 +129,10 @@ fi
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 5 - 2
m/mate-keyring/mate-keyring-vl.spec

@@ -1,8 +1,8 @@
 Summary:	MATE Password Management daemon
 Name:		mate-keyring
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		System Environment/Libraries 
 URL:		http://mate-desktop.org/
@@ -118,6 +118,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 - add BuildRequires: and Requires: ca-certificates

+ 7 - 3
m/mate-menus/mate-menus-vl.spec

@@ -1,14 +1,13 @@
 Summary:	MATE menu specifications
 Name:		mate-menus
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		System Environment/Libraries 
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
-BuildRequires:	mate-conf-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
@@ -53,6 +52,7 @@ mate-menus.
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
+
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
@@ -87,6 +87,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 21 - 47
m/mate-notification-daemon/mate-notification-daemon-vl.spec

@@ -1,9 +1,9 @@
 Summary:	Notification daemon for MATE
 Name:		mate-notification-daemon
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
 
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
 Patch0:		mate-notification-daemon-1.2.0-makefile.patch
 
@@ -12,18 +12,18 @@ Group:		System Environment/Libraries
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
-BuildRequires:	mate-conf-devel
-BuildRequires:	libmatenotify-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	libcanberra-devel
 BuildRequires:	libmatewnck-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
+Requires(post,postun):	gtk2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -34,7 +34,7 @@ Packager:	Takemikaduchi
 
 
 %description
-
+%{summary}
 
 %package	devel
 Summary:        Development tools for mate-notification-daemon
@@ -77,9 +77,7 @@ This package contains documentation for mate-notification-daemon.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -92,69 +90,45 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  mate-notification-daemon.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-notification-daemon.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-notification-daemon.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/mate-notification-daemon.schemas
 %{_bindir}/mate-notification-properties
 %{_libdir}/mate-notification-daemon/engines/libcoco.so
 %{_libdir}/mate-notification-daemon/engines/libnodoka.so
 %{_libdir}/mate-notification-daemon/engines/libslider.so
 %{_libdir}/mate-notification-daemon/engines/libstandard.so
 %{_libexecdir}/mate/mate-notification-daemon
+%{_datadir}/MateConf/gsettings/mate-notification-daemon.convert
 %{_datadir}/applications/mate-notification-properties.desktop
 %{_datadir}/dbus-1/services/org.freedesktop.mate.Notifications.service
+%{_datadir}/glib-2.0/schemas/org.mate.NotificationDaemon.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mate-notification-daemon/mate-notification-properties.ui
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel, libmatenotify-devel
+- add BuildRequires: libnotify-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 - change BuildRequires: libmatewnck-devel instead of libwnck-devel

+ 32 - 95
m/mate-panel/mate-panel-vl.spec

@@ -1,9 +1,9 @@
 Summary:	The MATE Panel
 Name:		mate-panel
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
 
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 Source1:	vine-mate-panel-default-setup.entries
 
 License:	GPLv2
@@ -12,11 +12,9 @@ URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-desktop-devel
 BuildRequires:	mate-menus-devel
 BuildRequires:	libmateweather-devel
-BuildRequires:	libmatecomponentui-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	libSM-devel
 BuildRequires:	libcanberra-devel
@@ -25,11 +23,13 @@ BuildRequires:	libmatewnck-devel
 BuildRequires:	librsvg2-devel
 BuildRequires:	evolution-data-server-devel
 BuildRequires:	NetworkManager-devel
+BuildRequires:	dconf-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
+Requires(post,postun):	gtk2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -98,9 +98,7 @@ cp -f %{SOURCE1} mate-panel/panel-default-setup.entries
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -114,113 +112,49 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  clock.schemas \
-  fish.schemas \
-  panel-compatibility.schemas \
-  panel-default-setup.entries \
-  panel-general.schemas \
-  panel-global.schemas \
-  panel-object.schemas \
-  panel-toplevel.schemas \
-  window-list.schemas \
-  workspace-switcher.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
-mateconftool-2 --direct --config-source=$MATECONF_CONFIG_SOURCE --load %{_sysconfdir}/mateconf/schemas/panel-default-setup.entries > /dev/null || :
-mateconftool-2 --direct --config-source=$MATECONF_CONFIG_SOURCE --load %{_sysconfdir}/mateconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || :
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    clock.schemas \
-    fish.schemas \
-    panel-compatibility.schemas \
-    panel-default-setup.entries \
-    panel-general.schemas \
-    panel-global.schemas \
-    panel-object.schemas \
-    panel-toplevel.schemas \
-    window-list.schemas \
-    workspace-switcher.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    clock.schemas \
-    fish.schemas \
-    panel-compatibility.schemas \
-    panel-default-setup.entries \
-    panel-general.schemas \
-    panel-global.schemas \
-    panel-object.schemas \
-    panel-toplevel.schemas \
-    window-list.schemas \
-    workspace-switcher.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/clock.schemas
-%{_sysconfdir}/mateconf/schemas/fish.schemas
-%{_sysconfdir}/mateconf/schemas/panel-compatibility.schemas
-%{_sysconfdir}/mateconf/schemas/panel-default-setup.entries
-%{_sysconfdir}/mateconf/schemas/panel-general.schemas
-%{_sysconfdir}/mateconf/schemas/panel-global.schemas
-%{_sysconfdir}/mateconf/schemas/panel-object.schemas
-%{_sysconfdir}/mateconf/schemas/panel-toplevel.schemas
-%{_sysconfdir}/mateconf/schemas/window-list.schemas
-%{_sysconfdir}/mateconf/schemas/workspace-switcher.schemas
 %{_bindir}/mate-desktop-item-edit
 %{_bindir}/mate-panel
 %{_bindir}/mate-panel-test-applets
-%{_bindir}/panel-test-applets-matecomponent
+%{_libdir}/girepository-1.0/MatePanelApplet-4.0.typelib
 %{_libdir}/libmate-panel-applet-*.so.*
-%{_libdir}/girepository-1.0/MatePanelApplet-3.0.typelib
-%{_libdir}/mate-panel/modules/libmate-panel-applets-matecomponent.so
 %{_libexecdir}/mate/clock-applet
 %{_libexecdir}/mate/fish-applet
 %{_libexecdir}/mate/mate-panel-add
 %{_libexecdir}/mate/notification-area-applet
 %{_libexecdir}/mate/wnck-applet
+%{_datadir}//MateConf/gsettings/mate-panel.convert
 %{_datadir}/applications/mate-panel.desktop
 %{_datadir}/dbus-1/services/*.service
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.clock.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.fish.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.window-list.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.workspace-switcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.enums.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.object.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.panel.toplevel.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/idl/mate-panel-2.0/MATE_Panel.idl
 %{_datadir}/mate/help
-%{_datadir}/mate-2.0/ui/MATE_Panel_Popup.xml
 %{_datadir}/mate-panel
 %{_datadir}/mate-panelrc
 %{_datadir}/omf/mate-applet-clock
@@ -229,12 +163,10 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/mate-panel-3.0/
-%{_includedir}/panel-2.0/
+%{_includedir}/mate-panel-4.0/
 %{_libdir}/libmate-panel-applet-*.so
-%{_libdir}/pkgconfig/libmatepanelapplet-2.0.pc
-%{_libdir}/pkgconfig/libmatepanelapplet-3.0.pc
-%{_datadir}/gir-1.0/MatePanelApplet-3.0.gir
+%{_libdir}/pkgconfig/libmatepanelapplet-4.0.pc
+%{_datadir}/gir-1.0/MatePanelApplet-4.0.gir
 
 %files doc
 %defattr(-,root,root,-)
@@ -242,6 +174,11 @@ fi
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel, libmatecomponentui-devel
+- add BuildRequires: dconf-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 - remove Patch0 (mate-panel-1.2.1-configure.patch)

+ 5 - 2
m/mate-polkit/mate-polkit-vl.spec

@@ -1,8 +1,8 @@
 Summary:	PolicyKit integration for the MATE desktop
 Name:		mate-polkit
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/System
 URL:		http://mate-desktop.org/
@@ -85,6 +85,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 25 - 49
m/mate-power-manager/mate-power-manager-vl.spec

@@ -1,17 +1,16 @@
 Summary:	A Power Manager for MATE
 Name:		mate-power-manager
-Version:	1.4.0
+Version:	1.6.1
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/System
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	libmatekeyring-devel
-BuildRequires:	libmatenotify-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	mate-panel-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	dbus-glib-devel
@@ -24,7 +23,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -54,8 +53,7 @@ MATE Power Manager comes in three main parts:
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
 	--libexecdir=%{_libexecdir}/mate \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static
 
 %{__make} %{?_smp_mflags}
 
@@ -63,9 +61,7 @@ MATE Power Manager comes in three main parts:
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -78,71 +74,46 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  mate-power-manager.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-power-manager.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-power-manager.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/mate-power-manager.schemas
 %{_sysconfdir}/xdg/autostart/mate-power-manager.desktop
 %{_bindir}/mate-power-bugreport.sh
 %{_bindir}/mate-power-manager
 %{_bindir}/mate-power-preferences
 %{_bindir}/mate-power-statistics
-%{_libdir}/matecomponent/servers/*.server
 %{_libexecdir}/mate/mate-brightness-applet
 %{_libexecdir}/mate/mate-inhibit-applet
 %{_sbindir}/mate-power-backlight-helper
+%{_datadir}/MateConf/gsettings/mate-power-manager.convert
 %{_datadir}/applications/mate-power-preferences.desktop
 %{_datadir}/applications/mate-power-statistics.desktop
 %{_datadir}/dbus-1/services/mate-power-manager.service
+%{_datadir}/dbus-1/services/org.mate.panel.applet.BrightnessAppletFactory.service
+%{_datadir}/dbus-1/services/org.mate.panel.applet.InhibitAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.power-manager.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mate/help/mate-power-manager
 %{_datadir}/mate-2.0/ui/*.xml
+%{_datadir}/mate-panel/applets/org.mate.BrightnessApplet.mate-panel-applet
+%{_datadir}/mate-panel/applets/org.mate.InhibitApplet.mate-panel-applet
 %{_datadir}/%{name}
 %{_datadir}/omf/mate-power-manager
 %{_datadir}/polkit-1/actions/org.mate.power.policy
@@ -150,6 +121,11 @@ fi
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel, libmatenotify-devel
+- add BuildRequires: libnotify-devel
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 25 - 48
m/mate-screensaver/mate-screensaver-vl.spec

@@ -1,8 +1,8 @@
 Summary:	Screensaver for MATE
 Name:		mate-screensaver
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 Source1:	%{name}.pam
 License:	GPLv2
 Group:		User Interface/Desktops
@@ -10,20 +10,22 @@ URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-desktop-devel
 BuildRequires:	mate-menus-devel
 BuildRequires:	libmatekbd-devel
-BuildRequires:	libmatenotify-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	libSM-devel
 BuildRequires:	libXScrnSaver-devel
 BuildRequires:	libXxf86misc-devel
+BuildRequires:	pam-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
+Requires(posttrans,postun):	glib2
+Requires(post,postun):	gtk2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -49,7 +51,6 @@ Summary(ja):    mate-screensaver の開発環境
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
-Requires:       mate-corba-devel
 
 %description	devel
 Header files and libraries for building a extension library for the
@@ -65,7 +66,8 @@ mate-screensaver.
 %configure \
 	--libexecdir=%{_libexecdir}/mate \
 	--disable-static \
-	--disable-scrollkeeper
+	--without-systemd \
+	--enable-pam=yes
 
 %{__make} %{?_smp_mflags}
 
@@ -73,9 +75,7 @@ mate-screensaver.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/mate-screensaver
@@ -94,56 +94,27 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  mate-screensaver.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-screensaver.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-screensaver.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/mate-screensaver.schemas
 %{_sysconfdir}/pam.d/mate-screensaver
 %{_sysconfdir}/xdg/autostart/mate-screensaver.desktop
 %{_sysconfdir}/xdg/menus/mate-screensavers.menu
@@ -153,11 +124,12 @@ fi
 %{_libexecdir}/mate/mate-screensaver
 %{_libexecdir}/mate/mate-screensaver-dialog
 %{_libexecdir}/mate/mate-screensaver-gl-helper
+%{_datadir}/MateConf/gsettings/org.mate.screensaver.gschema.migrate
 %{_datadir}/applications/mate-screensaver-preferences.desktop
 %{_datadir}/applications/screensavers/*.desktop
-#%{_datadir}/backgrounds/cosmos
 %{_datadir}/dbus-1/services/org.mate.ScreenSaver.service
 %{_datadir}/desktop-directories/mate-screensaver.directory
+%{_datadir}/glib-2.0/schemas/org.mate.screensaver.gschema.xml
 %{_datadir}/mate-background-properties/cosmos.xml
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/mate-logo-white.svg
@@ -169,6 +141,11 @@ fi
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel, libmatenotify-devel
+- add BuildRequires: libnotify-devel, pam-devel
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 18 - 44
m/mate-session-manager/mate-session-manager-vl.spec

@@ -1,14 +1,13 @@
 Summary:	The MATE Session Handler
 Name:		mate-session-manager
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		User Interface/Desktops
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
-BuildRequires:	mate-conf-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	upower-devel
@@ -18,7 +17,8 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
+Requires(post,postun):	gtk2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -49,9 +49,7 @@ configuration program to choose applications starting on login.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -65,61 +63,33 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  mate-session.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-session.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-session.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/mate-session.schemas
 %{_bindir}/mate-session
 %{_bindir}/mate-session-properties
 %{_bindir}/mate-session-save
 %{_bindir}/mate-wm
+%{_datadir}/MateConf/gsettings/mate-session.convert
 %{_datadir}/applications/mate-session-properties.desktop
+%{_datadir}/glib-2.0/schemas/org.mate.session.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mate-session/gsm-inhibit-dialog.ui
 %{_datadir}/mate-session/session-properties.ui
@@ -128,6 +98,10 @@ fi
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 45 - 79
m/mate-settings-daemon/mate-settings-daemon-vl.spec

@@ -1,18 +1,18 @@
 Summary:	The MATE Settings daemon
 Name:		mate-settings-daemon
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		System Environment/Daemons
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-desktop-devel
-BuildRequires:	libmatenotify-devel
 BuildRequires:	libmatekbd-devel
 BuildRequires:	gtk2-devel
+BuildRequires:	dconf-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	libSM-devel
 BuildRequires:	libXxf86misc-devel
@@ -24,7 +24,8 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
+Requires(post,postun):	gtk2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -35,7 +36,7 @@ Packager:	Takemikaduchi
 
 
 %description
-
+%{summary}
 
 %package	devel
 Summary:        Development tools for mate-settings-daemon
@@ -57,8 +58,7 @@ mate-settings-daemon.
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
 	--libexecdir=%{_libexecdir}/mate \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static
 
 %{__make} %{?_smp_mflags}
 
@@ -66,9 +66,7 @@ mate-settings-daemon.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -82,95 +80,58 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  apps_mate_settings_daemon_housekeeping.schemas \
-  apps_mate_settings_daemon_keybindings.schemas \
-  apps_mate_settings_daemon_xrandr.schemas \
-  desktop_mate_font_rendering.schemas \
-  desktop_mate_keybindings.schemas \
-  desktop_mate_peripherals_smartcard.schemas \
-  desktop_mate_peripherals_touchpad.schemas \
-  mate-settings-daemon.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-fi
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    apps_mate_settings_daemon_housekeeping.schemas \
-    apps_mate_settings_daemon_keybindings.schemas \
-    apps_mate_settings_daemon_xrandr.schemas \
-    desktop_mate_font_rendering.schemas \
-    desktop_mate_keybindings.schemas \
-    desktop_mate_peripherals_smartcard.schemas \
-    desktop_mate_peripherals_touchpad.schemas \
-    mate-settings-daemon.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    apps_mate_settings_daemon_housekeeping.schemas \
-    apps_mate_settings_daemon_keybindings.schemas \
-    apps_mate_settings_daemon_xrandr.schemas \
-    desktop_mate_font_rendering.schemas \
-    desktop_mate_keybindings.schemas \
-    desktop_mate_peripherals_smartcard.schemas \
-    desktop_mate_peripherals_touchpad.schemas \
-    mate-settings-daemon.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
 %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
-%{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_housekeeping.schemas
-%{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_keybindings.schemas
-%{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_xrandr.schemas
-%{_sysconfdir}/mateconf/schemas/desktop_mate_font_rendering.schemas
-%{_sysconfdir}/mateconf/schemas/desktop_mate_keybindings.schemas
-%{_sysconfdir}/mateconf/schemas/desktop_mate_peripherals_smartcard.schemas
-%{_sysconfdir}/mateconf/schemas/desktop_mate_peripherals_touchpad.schemas
-%{_sysconfdir}/mateconf/schemas/mate-settings-daemon.schemas
 %{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
-%{_libdir}/%{name}-%{version}
+%{_libdir}/%{name}
 %{_libexecdir}/mate/mate-settings-daemon
 %{_libexecdir}/mate/msd-locate-pointer
 %{_libexecdir}/mate/msd-datetime-mechanism
+%{_datadir}/MateConf/gsettings/mate-settings-daemon.convert
 %{_datadir}/dbus-1/services/org.mate.SettingsDaemon.service
 %{_datadir}/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.background.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.datetime.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.mouse.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.mpris.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.sound.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.applications-at.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.font-rendering.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.keybindings.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.peripherals-smartcard.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.peripherals-touchpad.gschema.xml
 %{_datadir}/icons/mate/*/*/*
 %{_datadir}/%{name}
-%{_datadir}/mate-control-center/keybindings/50-accessibility.xml
 %{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
 
 %files devel
@@ -180,6 +141,11 @@ fi
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel, libmatenotify-devel
+- add BuildRequires: libnotify-devel, dconf-devel
+
 * Wed Aug 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 22 - 42
m/mate-system-monitor/mate-system-monitor-vl.spec

@@ -1,15 +1,16 @@
 Summary:	A system monitor for MATE
 Name:		mate-system-monitor
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/System
 URL:		http://mate-desktop.org/
 
+Patch0:		mate-system-monitor-1.6.0-glibmm.patch
+
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-icon-theme
 BuildRequires:	gtk2-devel
 BuildRequires:	libxml2-devel
@@ -23,7 +24,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -39,13 +40,12 @@ View current processes and monitor system state
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static 
 
 %{__make} %{?_smp_mflags}
 
@@ -53,9 +53,7 @@ View current processes and monitor system state
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -68,56 +66,38 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  mate-system-monitor.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-system-monitor.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-system-monitor.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/mate-system-monitor.schemas
 %{_bindir}/mate-system-monitor
+%{_datadir}/MateConf/gsettings/mate-system-monitor.convert
 %{_datadir}/applications/mate-system-monitor.desktop
+%{_datadir}/glib-2.0/schemas/org.mate.system-monitor.enums.xml
+%{_datadir}/glib-2.0/schemas/org.mate.system-monitor.gschema.xml
 %{_datadir}/mate/help/mate-system-monitor
 %{_datadir}/omf/mate-system-monitor
 %{_datadir}/pixmaps/mate-system-monitor
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+- add Patch0 (mate-system-monitor-1.6.0-glibmm.patch)
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 - remove Patch0 (mate-system-monitor-1.2.1-configure.patch)

+ 7 - 4
m/mate-system-tools/mate-system-tools-vl.spec

@@ -1,15 +1,14 @@
 Summary:	A system tools for MATE
 Name:		mate-system-tools
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/System
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-polkit-devel
 BuildRequires:	mate-file-manager-devel
 BuildRequires:	gtk2-devel
@@ -20,6 +19,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -42,7 +42,6 @@ Summary(ja):    mate-system-tools の開発環境
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
-Requires:       mate-corba-devel
 
 %description	devel
 Header files and libraries for building a extension library for the
@@ -116,6 +115,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/pkgconfig/mate-system-tools.pc
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 18 - 41
m/mate-terminal/mate-terminal-vl.spec

@@ -1,9 +1,9 @@
 Summary:	The MATE Terminal Emulator
 Name:		mate-terminal
-Version:	1.4.0
+Version:	1.6.1
 Release:	1%{?_dist_release}
 
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
 Patch0:		mate-terminal-1.4.0-ja.po.patch
 
@@ -13,15 +13,15 @@ URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	gtk2-devel
+BuildRequires:	dconf-devel
 BuildRequires:	vte-devel
 BuildRequires:	libSM-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -46,8 +46,7 @@ choosing a bugzilla component. ;-)
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static 
 
 %{__make} %{?_smp_mflags}
 
@@ -55,9 +54,7 @@ choosing a bugzilla component. ;-)
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -70,56 +67,36 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  mate-terminal.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-terminal.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    mate-terminal.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/mate-terminal.schemas
 %{_bindir}/mate-terminal
 %{_datadir}/applications/mate-terminal.desktop
+%{_datadir}/glib-2.0/schemas/org.mate.terminal.gschema.xml
 %{_datadir}/mate/help/%{name}
 %{_datadir}/%{name}
 %{_datadir}/omf/%{name}
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+- add BuildRequires: dconf-devel
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 - add Patch0 (mate-terminal-1.4.0-ja.po.patch)

+ 18 - 46
m/mate-text-editor/mate-text-editor-vl.spec

@@ -1,15 +1,14 @@
 Summary:	An powerfull text editor for MATE
 Name:		mate-text-editor
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/Editors
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	gtksourceview2-devel
 BuildRequires:	libsoup-devel
@@ -20,7 +19,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -43,7 +42,6 @@ Summary(ja):    mate-text-editor の開発環境
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
-Requires:       mate-corba-devel
 
 %description	devel
 Header files and libraries for building a extension library for the
@@ -58,8 +56,7 @@ mate-text-editor.
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
 	--libexecdir=%{_libexecdir}/mate \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static
 
 %{__make} %{?_smp_mflags}
 
@@ -67,9 +64,7 @@ mate-text-editor.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -82,58 +77,32 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  pluma-file-browser.schemas \
-  pluma.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    pluma-file-browser.schemas \
-    pluma.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    pluma-file-browser.schemas \
-    pluma.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f pluma.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/pluma-file-browser.schemas
-%{_sysconfdir}/mateconf/schemas/pluma.schemas
 %{_bindir}/mate-text-editor
 %{_bindir}/pluma
 %{_libdir}/pluma/plugin-loaders/libcloader.so
 %{_libdir}/pluma/plugins
 %{_libexecdir}/mate/pluma/pluma-bugreport.sh
+%{_datadir}/MateConf/gsettings/pluma.convert
 %{_datadir}/applications/pluma.desktop
+%{_datadir}/glib-2.0/schemas/org.mate.pluma.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.pluma.plugins.filebrowser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.pluma.plugins.time.gschema.xml
 %{_datadir}/mate/help/pluma
 %{_datadir}/omf/pluma
 %{_datadir}/pluma
@@ -146,6 +115,9 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 - remove Patch0 (mate-text-editor-1.2.0-configure.patch)

+ 34 - 62
m/mate-utils/mate-utils-vl.spec

@@ -1,25 +1,25 @@
 Summary:	MATE utility programs
 Name:		mate-utils
-Version:	1.4.0
+Version:	1.6.0
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		Applications/System
 URL:		http://mate-desktop.org/
 
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-panel-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	libgtop2-devel
+BuildRequires:	libcanberra-devel
 BuildRequires:	libSM-devel
 BuildRequires:	popt-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -32,11 +32,11 @@ Packager:	Takemikaduchi
 %description
 MATE Utilities for the MATE Desktop contains the following -
 
-	mate-system-log	[logview]
-	mate-search-tool	[gseachtool]
-	mate-dictionary	[mate-dictionary]
-	mate-screenshot	[mate-screenshot]
-	baobab                  [baobab]
+	mate-system-log
+	mate-search-tool
+	mate-dictionary
+	mate-screenshot
+	mate-dictionary
 
 
 %package	devel
@@ -70,8 +70,7 @@ This package contains documentation for mate-utils.
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
 	--libexecdir=%{_libexecdir}/mate \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static 
 
 %{__make} %{?_smp_mflags}
 
@@ -91,64 +90,22 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  baobab.schemas \
-  mate-dictionary.schemas \
-  mate-screenshot.schemas \
-  mate-search-tool.schemas \
-  mate-system-log.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    baobab.schemas \
-    mate-dictionary.schemas \
-    mate-screenshot.schemas \
-    mate-search-tool.schemas \
-    mate-system-log.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    baobab.schemas \
-    mate-dictionary.schemas \
-    mate-screenshot.schemas \
-    mate-search-tool.schemas \
-    mate-system-log.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/baobab.schemas
-%{_sysconfdir}/mateconf/schemas/mate-dictionary.schemas
-%{_sysconfdir}/mateconf/schemas/mate-screenshot.schemas
-%{_sysconfdir}/mateconf/schemas/mate-search-tool.schemas
-%{_sysconfdir}/mateconf/schemas/mate-system-log.schemas
 %{_bindir}/mate-dictionary
 %{_bindir}/mate-disk-usage-analyzer
 %{_bindir}/mate-panel-screenshot
@@ -156,15 +113,25 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 %{_bindir}/mate-search-tool
 %{_bindir}/mate-system-log
 %{_libdir}/libmatedict.so.*
-%{_libdir}/matecomponent/servers/MATE_DictionaryApplet.server
 %{_libexecdir}/mate/mate-dictionary-applet
+%{_datadir}/MateConf/gsettings/mate-dictionary.convert
+%{_datadir}/MateConf/gsettings/mate-disk-usage-analyzer.convert
+%{_datadir}/MateConf/gsettings/mate-screenshot.convert
+%{_datadir}/MateConf/gsettings/mate-search-tool.convert
+%{_datadir}/MateConf/gsettings/mate-system-log.convert
 %{_datadir}/applications/*.desktop
+%{_datadir}/dbus-1/services/org.mate.panel.applet.DictionaryAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.dictionary.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.disk-usage-analyzer.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.screenshot.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.search-tool.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.system-log.gschema.xml
 %{_datadir}/icons/mate/*/*/*
 %{_datadir}/mate/help/*
-%{_datadir}/mate-2.0/ui/MATE_DictionaryApplet.xml
 %{_datadir}/mate-dict
 %{_datadir}/mate-dictionary
 %{_datadir}/mate-disk-usage-analyzer
+%{_datadir}/mate-panel/applets/org.mate.DictionaryApplet.mate-panel-applet
 %{_datadir}/mate-screenshot
 %{_datadir}/mate-utils
 %{_datadir}/omf/*
@@ -179,6 +146,11 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
 
 %changelog
+* Mon May 20 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+- add BuildRequires: libcanberra-devel
+
 * Thu Aug 02 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - new upstream release
 

+ 22 - 41
m/mate-window-manager/mate-window-manager-vl.spec

@@ -1,15 +1,17 @@
 Summary:	A window manager for MATE
 Name:		mate-window-manager
-Version:	1.4.1
+Version:	1.6.1
 Release:	1%{?_dist_release}
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 License:	GPLv2
 Group:		User Interface/Desktops
 URL:		http://mate-desktop.org/
 
+# patch for Vine
+Patch1001:	mate-window-manager-vine-settings.patch
+
 BuildRequires:	mate-common
 BuildRequires:	mate-doc-utils
-BuildRequires:	mate-conf-devel
 BuildRequires:	mate-dialogs
 BuildRequires:	gtk2-devel
 BuildRequires:	libcanberra-devel
@@ -19,7 +21,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-Requires(post,pre,preun):	mate-conf
+Requires(posttrans,postun):	glib2
 Requires(post,postun):	desktop-file-utils
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -50,13 +52,13 @@ mate-window-manager.
 
 %prep
 %setup -q
+%patch1001 -p1 -b .vine
 
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
-	--disable-static \
-	--disable-scrollkeeper
+	--disable-static
 
 %{__make} %{?_smp_mflags}
 
@@ -64,9 +66,7 @@ mate-window-manager.
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
@@ -80,54 +80,30 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %post
 /sbin/ldconfig
-
-export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-SCHEMAS=" \
-  marco.schemas"
-for S in $SCHEMAS; do
-  echo %{_sysconfdir}/mateconf/schemas/$S; done \
-  | xargs mateconftool-2 --makefile-install-rule >& /dev/null ||:
-
 update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
-%pre
-if [ "$1" -gt 1 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    marco.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
-
-  SCHEMAS=" \
-    marco.schemas"
-  for S in $SCHEMAS; do
-    echo %{_sysconfdir}/mateconf/schemas/$S; done \
-    | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
-fi
-
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications >& /dev/null ||:
+if [ $1 -eq 0 ]; then
+  update-desktop-database %{_datadir}/applications >& /dev/null ||:
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %files -f marco.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
-%{_sysconfdir}/mateconf/schemas/marco.schemas
 %{_bindir}/marco
 %{_bindir}/marco-message
 %{_bindir}/marco-theme-viewer
 %{_bindir}/marco-window-demo
 %{_libdir}/libmarco-private.so.*
+%{_datadir}/MateConf/gsettings/marco.convert
 %{_datadir}/applications/marco.desktop
+%{_datadir}/glib-2.0/schemas/org.mate.marco.gschema.xml
 %{_datadir}/marco/icons/marco-window-demo.png
 %{_datadir}/mate/help
 %{_datadir}/mate/wm-properties/marco-wm.desktop
@@ -143,6 +119,11 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
 
 %changelog
+* Sat May 25 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- new upstream release
+- remove BuildRequires: mate-conf-devel
+- add Patch1001 (mate-window-manager-vine-settings.patch)
+
 * Sat Nov 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.1-1
 - new upstream release
 

+ 4 - 1
m/muffin/muffin-vl.spec

@@ -1,6 +1,6 @@
 Name: 		muffin
 Summary: 	The cinnamon window manager based on mutter
-Version: 	1.7.4
+Version: 	1.8.1
 Release: 	1%{?_dist_release}
 
 Group: 		User Interface/Desktops
@@ -108,6 +108,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.1-1
+- new upstream release
+
 * Sun Apr 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.4-1
 - new upstream release
 

+ 4 - 1
n/nemo/nemo-vl.spec

@@ -1,6 +1,6 @@
 Name: 		nemo
 Summary: 	File manager for Cinnamon
-Version: 	1.7.4
+Version: 	1.8.1
 Release: 	1%{?_dist_release}
 
 Group: 		User Interface/Desktops
@@ -121,6 +121,9 @@ update-desktop-database -q &> /dev/null || :
 
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.1-1
+- new upstream release
+
 * Sun Apr 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.4-1
 - new upstream release
 

+ 7 - 4
t/task-cinnamon/task-cinnamon-vl.spec

@@ -1,7 +1,7 @@
 Summary:	Virtual package for Cinnamon
 Summary(ja):	Cinnamon バーチャルパッケージ
 Name:		task-cinnamon
-Version:	1.7.6
+Version:	1.8.2
 Release:	1%{?_dist_release}
 License:	GPL
 Group:		User Interface/Desktops
@@ -15,9 +15,9 @@ Vendor:		Project Vine
 Distribution:	Vine Linux
 Packager:	Takemikaduchi
 
-Requires:	cinnamon >= 1.7.6
-Requires:	muffin >= 1.7.4
-Requires:	nemo >= 1.7.4
+Requires:	cinnamon >= 1.8.2
+Requires:	muffin >= 1.8.1
+Requires:	nemo >= 1.8.1
 
 %description
 This is a virtual package to install Cinnamon system packages.
@@ -28,6 +28,9 @@ Cinnamon を簡単にインストールするための仮想パッケージで
 %files
 
 %changelog
+* Sun May 19 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.2-1
+- update to 1.8.2
+
 * Sun Apr 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.6-1
 - update to 1.7.6
 

+ 6 - 15
t/task-mate/task-mate-vl.spec

@@ -1,7 +1,7 @@
 Summary:	Virtual package for MATE
 Summary(ja):	MATE バーチャルパッケージ
 Name:		task-mate
-Version:	1.4.0
+Version:	1.6.1
 Release:	1%{?_dist_release}
 License:	GPL
 Group:		User Interface/Desktops
@@ -16,21 +16,12 @@ Distribution:	Vine Linux
 Packager:	Takemikaduchi
 
 # base
-Requires:	libmate
-Requires:	libmatecanvas
-Requires:	libmatecomponent
-Requires:	libmatecomponentui
 Requires:	libmatekbd
-Requires:	libmatekeyring
-Requires:	libmatenotify
-Requires:	libmateui
 Requires:	libmateweather
 Requires:	libmatewnck
 Requires:	mate-backgrounds
 Requires:	mate-common
-Requires:	mate-conf
 Requires:	mate-control-center
-Requires:	mate-corba
 Requires:	mate-desktop
 Requires:	mate-dialogs
 Requires:	mate-doc-utils
@@ -38,19 +29,16 @@ Requires:	mate-file-manager
 Requires:	mate-icon-theme
 Requires:	mate-keyring
 Requires:	mate-menus
-Requires:	mate-mime-data
 Requires:	mate-notification-daemon
 Requires:	mate-panel
 Requires:	mate-polkit
 Requires:	mate-session-manager
 Requires:	mate-settings-daemon
-Requires:	mate-vfs
 Requires:	mate-window-manager
 
 # extra
 Requires:	mate-applets
 Requires:	mate-calc
-Requires:	mate-display-manager
 Requires:	mate-document-viewer
 Requires:	mate-file-archiver
 Requires:	mate-image-viewer
@@ -62,7 +50,6 @@ Requires:	mate-terminal
 Requires:	mate-text-editor
 
 # others
-Requires:	mate-conf-editor
 Requires:	mate-utils
 
 %description
@@ -74,7 +61,11 @@ MATE を簡単にインストールするための仮想パッケージです。
 %files
 
 %changelog
-* Sat Aug 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
+* Sat May 25 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
+- update to 1.6.1
+- remove mate-corba, mate-conf, mate-conf-editor, libmatecomponent, libmatecomponentui, mate-mime-data, mate-vfs, libmate, libmatecanvas, libmatenotify, libmateui, mate-display-manager
+
+* Fri Aug 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
 - update to 1.4.0
 
 * Sat May 12 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.0-1