diff --git a/.gitignore b/.gitignore index 3f9a5c0..eed39f2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ dconf-0.5.tar.bz2 /dconf-0.14.0.tar.xz /dconf-0.15.0.tar.xz /dconf-0.15.2.tar.xz +/dconf-0.15.3.tar.xz diff --git a/dconf.spec b/dconf.spec index fb9c6e3..a0fc2cd 100644 --- a/dconf.spec +++ b/dconf.spec @@ -2,8 +2,8 @@ %define vala_version 0.11.7 Name: dconf -Version: 0.15.2 -Release: 2%{?dist} +Version: 0.15.3 +Release: 1%{?dist} Summary: A configuration system Group: System Environment/Base @@ -60,20 +60,36 @@ make install DESTDIR=$RPM_BUILD_ROOT %post /sbin/ldconfig gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules -touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : %postun /sbin/ldconfig if [ $1 -eq 0 ] ; then gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : - gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : fi %posttrans glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : + + +%post editor +for d in hicolor HighContrast ; do + touch --no-create %{_datadir}/icons/$d &>/dev/null || : +done + +%postun editor +if [ $1 -eq 0 ] ; then + for d in hicolor HighContrast ; do + touch --no-create %{_datadir}/icons/$d &>/dev/null || : + gtk-update-icon-cache %{_datadir}/icons/$d &>/dev/null || : + done +fi + +%posttrans editor +for d in hicolor HighContrast ; do + gtk-update-icon-cache %{_datadir}/icons/$d &>/dev/null || : +done + %files -f dconf.lang %doc COPYING @@ -99,18 +115,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/gtk-doc/html/dconf %{_datadir}/vala -%post editor -touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : - -%postun editor -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : - gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : -fi - -%posttrans editor -gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : - %files editor %{_bindir}/dconf-editor %{_datadir}/applications/dconf-editor.desktop @@ -118,9 +122,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/dconf-editor/dconf-editor.ui %{_datadir}/dconf-editor/dconf-editor-menu.ui %{_datadir}/icons/hicolor/*/apps/dconf-editor.png +%{_datadir}/icons/HighContrast/*/apps/dconf-editor.png %{_mandir}/man1/dconf-editor.1.gz %changelog +* Mon Feb 11 2013 Kalev Lember - 0.15.3-1 +- Update to 0.15.3 +- Install the HighContrast icons and update the icon cache scriptlets to take + this into account + * Sat Dec 22 2012 Rex Dieter - 0.15.2-2 - -devel: drop Requires: glib2-devel, already gets pulled in via pkgconfig deps - -editor: add icon scriptlets diff --git a/sources b/sources index e881a73..8017940 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f3cf30f3f0023a8458b47ebbb5f1fd9c dconf-0.15.2.tar.xz +85bff7841d3d67665ee9cb35b5b8d732 dconf-0.15.3.tar.xz