update to 1.5.0 release

This commit is contained in:
leigh123linux 2012-10-29 19:50:14 +00:00
parent f6930864a4
commit a50b171528
3 changed files with 52 additions and 58 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/mate-settings-daemon-1.4.0.tar.xz
/mate-settings-daemon-1.5.0.tar.xz

View File

@ -1,25 +1,37 @@
Name: mate-settings-daemon
Version: 1.4.0
Release: 6%{?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
Name: mate-settings-daemon
Version: 1.5.0
Release: 1%{?dist}
Summary: MATE Desktop settings daemon
License: GPLv2+
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
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
BuildRequires: pkgconfig(clutter-gst-1.0)
BuildRequires: icon-naming-utils
BuildRequires: mate-common
BuildRequires: pkgconfig(MateCORBA-2.0)
BuildRequires: pkgconfig(mate-desktop-2.0)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(libmatekbd)
BuildRequires: pkgconfig(libmatenotify)
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(polkit-agent-1)
BuildRequires: pkgconfig(polkit-gtk-mate-1)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
Requires(pre): mate-conf
Requires(post): mate-conf
Requires(preun):mate-conf
Requires: gsettings-desktop-schemas
Requires: mate-icon-theme
%description
MATE Desktop settings daemon
%package devel
Summary: Development files for mate-settings-daemon
Requires: %{name}%{?_isa} = %{version}-%{release}
Summary: Development files for mate-settings-daemon
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
Development files for mate-panel
@ -30,72 +42,45 @@ NOCONFIGURE=1 ./autogen.sh
%build
%configure --disable-static --enable-polkit --enable-gstreamer --enable-profiling --with-x --with-nssdb
%configure --disable-static \
--enable-polkit \
--enable-profiling \
--with-x \
--with-nssdb
make %{?_smp_mflags} V=1
%install
export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=%{buildroot}
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
%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
%mateconf_schema_prepare apps_mate_settings_daemon_xrandr
%mateconf_schema_prepare desktop_mate_font_rendering
%mateconf_schema_prepare desktop_mate_keybindings
%mateconf_schema_prepare desktop_mate_peripherals_smartcard
%mateconf_schema_prepare desktop_mate_peripherals_touchpad
%mateconf_schema_prepare mate-settings-daemon
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/mate &> /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
%mateconf_schema_upgrade desktop_mate_font_rendering
%mateconf_schema_upgrade desktop_mate_keybindings
%mateconf_schema_upgrade desktop_mate_peripherals_smartcard
%mateconf_schema_upgrade desktop_mate_peripherals_touchpad
%mateconf_schema_upgrade mate-settings-daemon
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/mate &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
%mateconf_schema_remove apps_mate_settings_daemon_housekeeping
%mateconf_schema_remove apps_mate_settings_daemon_keybindings
%mateconf_schema_remove apps_mate_settings_daemon_xrandr
%mateconf_schema_remove desktop_mate_font_rendering
%mateconf_schema_remove desktop_mate_keybindings
%mateconf_schema_remove desktop_mate_peripherals_smartcard
%mateconf_schema_remove desktop_mate_peripherals_touchpad
%mateconf_schema_remove mate-settings-daemon
%posttrans
gtk-update-icon-cache %{_datadir}/icons/mate &>/dev/null || :
/usr/bin/gtk-update-icon-cache %{_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
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
%config(noreplace) %{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_housekeeping.schemas
%config(noreplace) %{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_keybindings.schemas
%config(noreplace) %{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_xrandr.schemas
%config(noreplace) %{_sysconfdir}/mateconf/schemas/desktop_mate_font_rendering.schemas
%config(noreplace) %{_sysconfdir}/mateconf/schemas/desktop_mate_keybindings.schemas
%config(noreplace) %{_sysconfdir}/mateconf/schemas/desktop_mate_peripherals_smartcard.schemas
%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/
%config %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
%config %{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
%{_libdir}/mate-settings-daemon-1.5.0/
%{_libexecdir}/mate-settings-daemon
%{_libexecdir}/msd-datetime-mechanism
%{_libexecdir}/msd-locate-pointer
@ -104,6 +89,7 @@ gtk-update-icon-cache %{_datadir}/icons/mate &>/dev/null || :
%{_datadir}/icons/mate/*/*/*
%{_datadir}/mate-control-center/
%{_datadir}/mate-settings-daemon/
%{_datadir}/glib-2.0/schemas/org.mate.*.xml
%{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
%files devel
@ -112,6 +98,13 @@ gtk-update-icon-cache %{_datadir}/icons/mate &>/dev/null || :
%changelog
* Mon Oct 29 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.5.0-1
- update to 1.5.0 release
- add schema scriptlets and remove mateconf scriptlets
- add requires gsettings-desktop-schemas
- add build requires gsettings-desktop-schemas-devel
- change build requires style
* Wed Oct 10 2012 Rex Dieter <rdieter@fedoraproject.org> 1.4.0-6
- fix icon scriptlets

View File

@ -1 +1 @@
5d7608bf8b80f4847e6b146379568b83 mate-settings-daemon-1.4.0.tar.xz
066bd75a15dc43e81af55e2dc3f7a226 mate-settings-daemon-1.5.0.tar.xz