Merge branch 'master' into f18

Conflicts:
	mate-settings-daemon.spec
This commit is contained in:
dmashal 2012-09-28 13:56:55 -07:00
commit 80702ae5ce

View File

@ -1,17 +1,18 @@
%define po_package %{name}
Name: mate-settings-daemon
Version: 1.4.0
Release: 6%{?dist}
Release: 2%{?dist}
Summary: MATE Desktop settings daemon
License: GPLv2+
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
Source0: http://vicodan.fedorapeople.org/mate-settings-daemon-1.4.0.tar.gz
BuildRequires: clutter-gst-devel icon-naming-utils mate-common mate-conf-devel mate-conf mate-corba mate-corba-devel mate-desktop mate-desktop-devel libmatecomponent-devel libmate-devel libmateui dbus-glib-devel gtk2-devel libSM-devel libmatekbd-devel libmatenotify-devel libxklavier-devel nss-devel polkit-devel mate-polkit-devel
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
Requires(pre): mate-conf
Requires(post): mate-conf
Requires(preun):mate-conf
Requires: mate-icon-theme
Requires(pre): mate-conf
Requires(post): mate-conf
Requires(preun): mate-conf
%description
MATE Desktop settings daemon
@ -29,20 +30,11 @@ NOCONFIGURE=1 ./autogen.sh
%build
%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
%configure --disable-static --enable-polkit --enable-gstreamer --enable-profiling
make %{?_smp_mflags}
%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
@ -52,9 +44,10 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
%mateconf_schema_prepare desktop_mate_peripherals_touchpad
%mateconf_schema_prepare mate-settings-daemon
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
/bin/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
@ -67,8 +60,8 @@ touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &> /dev/null
gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/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
@ -80,9 +73,17 @@ fi
%mateconf_schema_remove mate-settings-daemon
%posttrans
gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%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
%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
@ -94,34 +95,60 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%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/
%{_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
%{_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/*/*/*
%{_datadir}/mate-control-center/
%{_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}/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@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@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@fedoraproject.org> 1.4.0-3
- Fix mateconf scritplets, switch back to upstream source.
* Sat Sep 15 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-2
- Move shared libs to main package and update buildrequires to add libSM-devel add mateconf scriptlets