[mate-settings-daemon/f18] revert spec

[Dan Mashal]

commit ecdfb09898ed1ffbaac80f7a6cb32f39b15e6c39
Author: dmashal <dan.mashal at fedoraproject.org>
Date:   Fri Sep 28 14:39:16 2012 -0700

    revert spec

 mate-settings-daemon.spec |  108 ++++++++++++++++----------------------------
 1 files changed, 39 insertions(+), 69 deletions(-)
---
diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index 3fb24b7..013dad5 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -1,18 +1,18 @@
-%define po_package %{name}
 
 Name:		mate-settings-daemon
 Version:	1.4.0
-Release:	2%{?dist}
+Release:	5%{?dist}
 Summary:	MATE Desktop settings daemon
 License:	GPLv2+
 URL:		http://mate-desktop.org
-Source0:	http://vicodan.fedorapeople.org/mate-settings-daemon-1.4.0.tar.gz
+Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
 
-BuildRequires:	clutter-gst-devel gcc-c++ icon-naming-utils mate-common mate-conf-devel mate-desktop-devel dbus-glib-devel gtk2-devel libSM-devel libmatekbd-devel libmatenotify-devel libxklavier-devel nss-devel polkit-devel mate-conf-gtk
+BuildRequires:	clutter-gst-devel icon-naming-utils mate-common mate-conf-devel mate-corba-devel mate-desktop-devel dbus-glib-devel gtk2-devel libSM-devel libmatekbd-devel libmatenotify-devel libxklavier-devel nss-devel polkit-devel mate-polkit-devel
 
-Requires(pre): mate-conf
-Requires(post):	mate-conf
-Requires(preun):	mate-conf
+Requires(pre):  mate-conf
+Requires(post): mate-conf
+Requires(preun):mate-conf
+Requires: mate-icon-theme
 
 %description
 MATE Desktop settings daemon
@@ -30,11 +30,20 @@ NOCONFIGURE=1 ./autogen.sh
 
 
 %build
-%configure --disable-static --enable-polkit --enable-gstreamer --enable-profiling
-make %{?_smp_mflags}
+%configure --disable-static --enable-polkit --enable-gstreamer --enable-profiling --with-x --with-nssdb
+make %{?_smp_mflags} V=1
+
+
+%install
+export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make install DESTDIR=%{buildroot}
+
+%find_lang %{name}
+
+rm -fv %{buildroot}%{_libdir}/lib*.la
+
 
 %pre
-/sbin/ldconfig
 %mateconf_schema_prepare apps_mate_settings_daemon_housekeeping
 %mateconf_schema_prepare apps_mate_settings_daemon_keybindings
 %mateconf_schema_prepare apps_mate_settings_daemon_xrandr
@@ -44,10 +53,9 @@ make %{?_smp_mflags}
 %mateconf_schema_prepare desktop_mate_peripherals_touchpad
 %mateconf_schema_prepare mate-settings-daemon
 
-
 %post
 /sbin/ldconfig
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 %mateconf_schema_upgrade apps_mate_settings_daemon_housekeeping
 %mateconf_schema_upgrade apps_mate_settings_daemon_keybindings
 %mateconf_schema_upgrade apps_mate_settings_daemon_xrandr
@@ -60,8 +68,8 @@ make %{?_smp_mflags}
 %postun
 /sbin/ldconfig
 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 || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 %mateconf_schema_remove apps_mate_settings_daemon_housekeeping
 %mateconf_schema_remove apps_mate_settings_daemon_keybindings
@@ -73,21 +81,9 @@ fi
 %mateconf_schema_remove mate-settings-daemon
 
 %posttrans
-/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
-<<<<<<< HEAD
-%install
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make DESTDIR=%{buildroot} install
-%find_lang %{po_package}
-find %{buildroot} -name '*.la' -exec rm -rf {} ';'
-find %{buildroot} -name '*.a' -exec rm -rf {} ';'
-
-
-%files -f %{po_package}.lang
-=======
-%files %{name}.lang
->>>>>>> parent of 14c16b8... eek, fix typo
+%files -f %{name}.lang
 %doc AUTHORS COPYING README
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
 %config(noreplace) %{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_housekeeping.schemas
@@ -99,60 +95,34 @@ find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 %config(noreplace) %{_sysconfdir}/mateconf/schemas/desktop_mate_peripherals_touchpad.schemas
 %config(noreplace) %{_sysconfdir}/mateconf/schemas/mate-settings-daemon.schemas
 %config(noreplace) %{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
-%{_libdir}/mate-settings-daemon-1.4.0/a11y-keyboard.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/clipboard.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/font.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/housekeeping.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/keybindings.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/keyboard.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/media-keys.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/mouse.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/smartcard.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/sound.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/typing-break.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/xrandr.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/xrdb.mate-settings-plugin
-%{_libdir}/mate-settings-daemon-1.4.0/xsettings.mate-settings-plugin
+%{_libdir}/mate-settings-daemon-1.4.0/
 %{_libexecdir}/mate-settings-daemon
 %{_libexecdir}/msd-datetime-mechanism
 %{_libexecdir}/msd-locate-pointer
 %{_datadir}/dbus-1/services/org.mate.SettingsDaemon.service
 %{_datadir}/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
-%{_datadir}/icons/mate/16x16/actions/*.png
-%{_datadir}/icons/mate/16x16/apps/*.png
-%{_datadir}/icons/mate/22x22/actions/*.png
-%{_datadir}/icons/mate/22x22/apps/*.png
-%{_datadir}/icons/mate/24x24/actions/*.png
-%{_datadir}/icons/mate/24x24/apps/*.png
-%{_datadir}/icons/mate/32x32/actions/*.png
-%{_datadir}/icons/mate/32x32/apps/*.png
-%{_datadir}/icons/mate/scalable/actions/touchpad-disabled.svg
-%{_datadir}/icons/mate/scalable/actions/touchpad-enabled.svg
-%{_datadir}/icons/mate/scalable/apps/msd-xrandr.svg
-%{_datadir}/mate-control-center/keybindings/50-accessibility.xml
+%{_datadir}/icons/mate/*/*/*
+%{_datadir}/mate-control-center/
 %{_datadir}/mate-settings-daemon/
 %{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
-%{_libdir}/mate-settings-daemon-1.4.0/liba11y-keyboard.so
-%{_libdir}/mate-settings-daemon-1.4.0/libclipboard.so
-%{_libdir}/mate-settings-daemon-1.4.0/libfont.so
-%{_libdir}/mate-settings-daemon-1.4.0/libhousekeeping.so
-%{_libdir}/mate-settings-daemon-1.4.0/libkeybindings.so
-%{_libdir}/mate-settings-daemon-1.4.0/libkeyboard.so
-%{_libdir}/mate-settings-daemon-1.4.0/libmedia-keys.so
-%{_libdir}/mate-settings-daemon-1.4.0/libmouse.so
-%{_libdir}/mate-settings-daemon-1.4.0/libsmartcard.so
-%{_libdir}/mate-settings-daemon-1.4.0/libsound.so
-%{_libdir}/mate-settings-daemon-1.4.0/libtyping-break.so
-%{_libdir}/mate-settings-daemon-1.4.0/libxrandr.so
-%{_libdir}/mate-settings-daemon-1.4.0/libxrdb.so
-%{_libdir}/mate-settings-daemon-1.4.0/libxsettings.so
-
 
 %files devel
 %{_includedir}/mate-settings-daemon/
 %{_libdir}/pkgconfig/mate-settings-daemon.pc
 
+
 %changelog
+* Fri Sep 28 2012 Rex Dieter <rdieter at fedoraproject.org> - 1.4.0-5
+- remove local quirks not needed for fedora buildsys
+- simplify %%files, fix some dir-ownership
+- cosmetics: move scriptlets to be next to %%files
+
+* Tue Sep 25 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-4
+- Own mate-settings-daemon directory, update build requires and configure flags
+
+* Tue Sep 25 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-3
+- Fix mateconf scritplets, switch back to upstream source.
+
 * Sat Sep 15 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-2
 - Move shared libs to main package and update buildrequires to add libSM-devel add mateconf scriptlets