revert to old spec

This commit is contained in:
dmashal 2012-09-28 13:56:07 -07:00
parent 57ba9cbd77
commit 5795ffd94f
1 changed files with 35 additions and 30 deletions

View File

@ -1,16 +1,16 @@
%define po_package %{name}
Name: mate-settings-daemon
Version: 1.4.0
Release: 6%{?dist}
Release: 4%{?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
BuildRequires: clutter-gst-devel icon-naming-utils mate-common mate-conf-devel mate-corba-devel 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
Requires(pre): mate-conf
Requires(post): mate-conf
Requires(preun):mate-conf
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: mate-icon-theme
%description
@ -29,19 +29,10 @@ NOCONFIGURE=1 ./autogen.sh
%build
%configure --disable-static --enable-polkit --enable-gstreamer --enable-profiling --with-x --with-nssdb
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/:/usr/local/share/pkgconfig/
%configure --disable-static --enable-polkit --enable-gstreamer --enable-profiling --with-x --with-nssdb --libexecdir=/usr/libexec --libdir=%{_libdir}
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
%mateconf_schema_prepare apps_mate_settings_daemon_housekeeping
%mateconf_schema_prepare apps_mate_settings_daemon_keybindings
@ -52,9 +43,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 +59,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 +72,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
@ -100,8 +100,18 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%{_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
@ -111,11 +121,6 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%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