[gnote/f16] Update scriplets for gsettings schema and icon cache. Fixes rhbz#743580 Drop obsolete dependency on
Rahul Sundaram
sundaram at fedoraproject.org
Sun Oct 23 23:11:49 UTC 2011
commit 0411de9fb4580809594dbfe17c98855e150eaf2b
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date: Mon Oct 24 04:41:37 2011 +0530
Update scriplets for gsettings schema and icon cache. Fixes rhbz#743580
Drop obsolete dependency on Gconf and dbus-c++-devel
Update build requires to gtkmm30-devel instead of gtkmm24-devel
Fix source url
gnote.spec | 52 ++++++++++++++++++----------------------------------
1 files changed, 18 insertions(+), 34 deletions(-)
---
diff --git a/gnote.spec b/gnote.spec
index b6c80f0..56c1ab5 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -1,22 +1,19 @@
Name: gnote
Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Note-taking application
Group: User Interface/Desktops
License: GPLv3+
URL: http://live.gnome.org/Gnote
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnote/0.7/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnote/0.8/%{name}-%{version}.tar.xz
-BuildRequires: gtkmm30-devel libxml2-devel GConf2-devel intltool
-BuildRequires: boost-devel libuuid-devel dbus-c++-devel
+BuildRequires: gtkmm30-devel libxml2-devel intltool
+BuildRequires: boost-devel libuuid-devel
BuildRequires: desktop-file-utils
BuildRequires: gnome-doc-utils >= 0.3.2
BuildRequires: gettext pcre-devel
BuildRequires: gtkspell-devel libxslt-devel rarian-compat
-Requires(pre) :GConf2
-Requires(post) :GConf2
-Requires(preun):GConf2
%description
Gnote is a desktop note-taking application which is simple and easy to use.
@@ -29,7 +26,7 @@ and consumes fewer resources.
%build
export CXXFLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=2"
-%configure --disable-schemas-install --disable-static --with-gnu-ld --enable-dbus --disable-applet
+%configure --disable-static --with-gnu-ld --disable-applet
V=1 make %{?_smp_mflags}
%install
@@ -41,40 +38,21 @@ desktop-file-install \
find %{buildroot} -type f -name "*.la" -delete
-
%find_lang %{name}
-%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gnote.schemas > /dev/null || :
-fi
-
%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/gnote.schemas > /dev/null
-
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
-%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gnote.schemas >/dev/null;
-fi
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/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
%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%doc COPYING README TODO NEWS AUTHORS
@@ -84,12 +62,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/gnote/
%{_datadir}/icons/hicolor/*/apps/gnote.png
%{_datadir}/icons/hicolor/scalable/apps/gnote.svg
-%{_datadir}/glib-2.0/schemas/*
%{_datadir}/gnome/help/gnote/
%{_prefix}/%{_lib}/gnote/
%{_datadir}/dbus-1/services/org.gnome.Gnote.service
+%{_datadir}/glib-2.0/schemas/org.gnome.gnote.gschema.xml
%changelog
+* Sun Oct 24 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 0.8.0-2
+- Update scriplets for gsettings schema and icon cache. Fixes rhbz#743580
+- Drop obsolete dependency on Gconf and dbus-c++-devel
+- Update build requires to gtkmm30-devel instead of gtkmm24-devel
+- Fix source url
+
* Wed Sep 28 2011 Ray <rstrode at redhat.com> - 0.8.0-1
- Update to 0.8.0
More information about the scm-commits
mailing list