[mate-control-center] update to 1.5.0 release

leigh123linux leigh123linux at fedoraproject.org
Mon Oct 29 21:35:21 UTC 2012 

commit f91eb04b1b3c871d00a4e133fc7aaea597793e75
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Oct 29 21:35:09 2012 +0000

    update to 1.5.0 release

 mate-control-center.spec |  144 ++++++++++++++++------------------------------
 1 files changed, 49 insertions(+), 95 deletions(-)
---
diff --git a/mate-control-center.spec b/mate-control-center.spec
index 126e069..7bb668e 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,41 +1,39 @@
 Name:           mate-control-center
-Version:        1.4.0
-Release:        9%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        MATE Desktop control-center
 License:        LGPLv2+ and GPLv2+
 URL:            http://mate-desktop.org
-Source0:        http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
 
-BuildRequires: gtk2-devel
+BuildRequires: pkgconfig(gtk+-2.0)
 BuildRequires: desktop-file-utils
 BuildRequires: icon-naming-utils
 BuildRequires: mate-common
-BuildRequires: mate-conf-devel
-BuildRequires: mate-corba-devel
-BuildRequires: mate-settings-daemon-devel
-BuildRequires: mate-desktop-devel
-BuildRequires: mate-doc-utils
-BuildRequires: mate-menus-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: libmatekbd-devel
-BuildRequires: libmatenotify-devel
-BuildRequires: libxklavier-devel
-BuildRequires: nss-devel
-BuildRequires: polkit-devel
-BuildRequires: unique-devel
-BuildRequires: mate-window-manager-devel
-BuildRequires: librsvg2-devel
-BuildRequires: libICE-devel
-BuildRequires: libXScrnSaver-devel
-BuildRequires: libXext-devel
-BuildRequires: libXxf86misc-devel
-BuildRequires: libxkbfile-devel
-BuildRequires: libcanberra-devel
-BuildRequires: libSM-devel
-
-Requires(pre): mate-conf
-Requires(preun): mate-conf
-Requires(post): mate-conf
+BuildRequires: pkgconfig(MateCORBA-2.0)
+BuildRequires: pkgconfig(mate-settings-daemon)
+BuildRequires: pkgconfig(mate-desktop-2.0)
+BuildRequires: pkgconfig(mate-doc-utils) 
+BuildRequires: pkgconfig(libmate-menu)
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(libmatekbd)
+BuildRequires: pkgconfig(libmatenotify)
+BuildRequires: pkgconfig(libxklavier)
+BuildRequires: pkgconfig(nss)
+BuildRequires: pkgconfig(polkit-agent-1)
+BuildRequires: pkgconfig(unique-1.0)
+BuildRequires: pkgconfig(libmarco-private)
+BuildRequires: pkgconfig(librsvg-2.0)
+BuildRequires: pkgconfig(ice)
+BuildRequires: pkgconfig(xscrnsaver)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xxf86misc)
+BuildRequires: pkgconfig(xkbfile)
+BuildRequires: pkgconfig(libcanberra)
+BuildRequires: pkgconfig(sm)
+BuildRequires: pkgconfig(gsettings-desktop-schemas)
+
+Requires:       gsettings-desktop-schemas
 
 %description
 MATE Desktop Control Center
@@ -55,14 +53,12 @@ NOCONFIGURE=1 ./autogen.sh
 %build
 %configure --disable-static \
            --disable-update-mimedb \
-           --disable-schemas-install \
            --disable-scrollkeeper
 
 make %{?_smp_mflags} V=1
 
 
 %install
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=%{buildroot} install
 
 find %{buildroot} -name '*.la' -exec rm -rf {} ';'
@@ -75,35 +71,18 @@ desktop-file-install									\
 	--dir=%{buildroot}%{_datadir}/applications					\
 %{buildroot}%{_datadir}/applications/*.desktop
 
-%find_lang %{name}
-
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/at-properties.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/default-applications.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/display-properties.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/keyboard.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/mate-appearance-properties.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/mate-font-viewer.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/mate-keybinding.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/mate-network-properties.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/mate-settings-mouse.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/mate-theme-installer.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/matecc.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/window-properties.desktop
+# delete mime cache
+rm %{buildroot}%{_datadir}/applications/mimeinfo.cache
 
+%find_lang %{name}
 
-%pre
-%mateconf_schema_prepare control-center fontilus mate-control-center
-
-%preun
-%mateconf_schema_remove control-center fontilus mate-control-center
 
 %post
 /sbin/ldconfig
 /usr/bin/update-desktop-database &> /dev/null || :
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-%mateconf_schema_upgrade control-center fontilus mate-control-center
+
 
 %postun
 /sbin/ldconfig
@@ -112,63 +91,31 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/window-properties.des
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null
     /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || :
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans
 /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
-%{_sysconfdir}/mateconf/schemas/control-center.schemas
-%{_sysconfdir}/mateconf/schemas/fontilus.schemas
-%{_sysconfdir}/mateconf/schemas/mate-control-center.schemas
-%{_sysconfdir}/xdg/autostart/mate-at-session.desktop
 %{_sysconfdir}/xdg/menus/matecc.menu
-%{_bindir}/mate-appearance-properties
-%{_bindir}/mate-at-mobility
-%{_bindir}/mate-at-properties
-%{_bindir}/mate-at-visual
-%{_bindir}/mate-control-center
-%{_bindir}/mate-default-applications-properties
-%{_bindir}/mate-display-properties
-%{_bindir}/mate-font-viewer
-%{_bindir}/mate-keybinding-properties
-%{_bindir}/mate-keyboard-properties
-%{_bindir}/mate-mouse-properties
-%{_bindir}/mate-network-properties
-%{_bindir}/mate-thumbnail-font
-%{_bindir}/mate-typing-monitor
-%{_bindir}/mate-window-properties
-%{_libdir}/libmate-window-settings.so.1
-%{_libdir}/libmate-window-settings.so.1.0.0
+%{_bindir}/mate-*
+%{_libdir}/libmate-window-settings.so.*
 %{_libdir}/window-manager-settings/
 %{_sbindir}/mate-display-properties-install-systemwide
-%{_datadir}/applications/at-properties.desktop
-%{_datadir}/applications/default-applications.desktop
-%{_datadir}/applications/display-properties.desktop
-%{_datadir}/applications/keyboard.desktop
-%{_datadir}/applications/mate-appearance-properties.desktop
-%{_datadir}/applications/mate-font-viewer.desktop
-%{_datadir}/applications/mate-keybinding.desktop
-%{_datadir}/applications/mate-network-properties.desktop
-%{_datadir}/applications/mate-settings-mouse.desktop
-%{_datadir}/applications/mate-theme-installer.desktop
-%{_datadir}/applications/matecc.desktop
-%{_datadir}/applications/mimeinfo.cache
-%{_datadir}/applications/window-properties.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/desktop-directories/matecc.directory
-%{_datadir}/icons/hicolor/16x16/apps/*.png
-%{_datadir}/icons/hicolor/22x22/apps/*.png
-%{_datadir}/icons/hicolor/24x24/apps/*.png
-%{_datadir}/icons/hicolor/32x32/apps/*.png
-%{_datadir}/icons/hicolor/48x48/apps/*.png
-%{_datadir}/icons/hicolor/scalable/apps/mate-network-properties.svg
-%{_datadir}/icons/hicolor/scalable/apps/mate-preferences-desktop-display.svg
-%{_datadir}/icons/hicolor/scalable/apps/mate-typing-monitor.svg
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/mate-*.svg
+%{_datadir}/glib-2.0/schemas/org.mate.*.xml
 %{_datadir}/mate-control-center/
 %{_datadir}/mate/cursor-fonts/*.pcf
 %{_datadir}/mate/help/mate-control-center/
 %{_datadir}/mime/packages/mate-theme-package.xml
+%{_datadir}/thumbnailers/mate-font-viewer.thumbnailer
 %{_datadir}/omf/mate-control-center/
 %{_datadir}/polkit-1/actions/org.mate.randr.policy
 
@@ -180,6 +127,13 @@ fi
 %{_datadir}/pkgconfig/mate-keybindings.pc
 
 %changelog
+* Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-1
+- update to 1.5.0 release
+- change build requires and change style
+- add requires gsettings-desktop-schemas
+- add build requires gsettings-desktop-schemas-devel
+- add schema scriptlets
+
 * Tue Oct 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-9
 - move unversioned .so back to main package
 - fix directory ownership

More information about the scm-commits mailing list