[nemiver] Update to 0.8.2

Dodji Seketeli dodji at fedoraproject.org
Sun May 8 12:57:10 UTC 2011


commit e43a7d804fe636ae65384c7c66fb73fe59a93217
Author: Dodji Seketeli <dodji at redhat.com>
Date:   Sun May 8 14:44:36 2011 +0200

    Update to 0.8.2
    
        - Update to upstream release 0.8.2
        - Enable GSettings.  Remove usage of GConf.  Bump glibmm24 requirement
          to 2.25 (to support gsettings) Add build requirements for
          gsettings-desktop-schemas-devel, dconf and glib2-devel >= 2.28.
          Remove GConf schema from package.  Add gsettings schema.
        - Remove use of scrollkeeper at long last.
        - Cleanup and update scriplet snippets.
        - Bump gtkmm24 build requirement to 2.20 as per what upstream
          requires.

 nemiver.spec |   77 ++++++++++++++++++++++++++-------------------------------
 1 files changed, 35 insertions(+), 42 deletions(-)
---
diff --git a/nemiver.spec b/nemiver.spec
index 2648361..41f9004 100644
--- a/nemiver.spec
+++ b/nemiver.spec
@@ -1,6 +1,6 @@
 Name:		nemiver
-Version:	0.8.1
-Release:	2%{?dist}
+Version:	0.8.2
+Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
 Group:		Development/Debuggers
@@ -22,9 +22,13 @@ BuildRequires:	boost-static
 BuildRequires:	desktop-file-utils
 BuildRequires:	gdb
 BuildRequires:	gettext
+#This is useful to get m4 macros from gsettings.m4, like GLIB_GSETTING
+# Requiring glib2-devel >= 2.28 is equivalent to requiring the
+# glib2-devel of Fedora 15.
+BuildRequires:  glib2-devel >= 2.28
 BuildRequires:	ghex-devel >= 2.24
-BuildRequires:	glibmm24-devel >= 2.16
-BuildRequires:	gtkmm24-devel >= 2.12.7
+BuildRequires:	glibmm24-devel >= 2.25
+BuildRequires:	gtkmm24-devel >= 2.20
 BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	gtksourceviewmm-devel >= 2.0.0
 BuildRequires:	libgtop2-devel >= 2.14
@@ -34,16 +38,10 @@ BuildRequires:	sqlite-devel >= 3.0
 BuildRequires:	vte-devel >= 0.12.0
 BuildRequires:	intltool
 BuildRequires:	libxml2-devel >= 2.6.22
-BuildRequires:  GConf2-devel
+BuildRequires:  gsettings-desktop-schemas-devel
+BuildRequires:  dconf
 
-Requires(pre):	GConf2
-
-Requires(post):	GConf2
-Requires(post):	scrollkeeper
-
-Requires(preun):	GConf2
-
-Requires(postun):	scrollkeeper
+Requires: gsettings-desktop-schemas
 
 ## Needs hicolor-icon-theme so that the parent %%_datadir/icons/hicolor
 ## and its subtree directories are properly owned.
@@ -68,14 +66,14 @@ The yelp package must be installed to make use of Nemiver's documentation.
 
 %build
 %configure --disable-static --disable-schemas-install		\
-	--disable-scrollkeeper
+	--disable-scrollkeeper --enable-gsettings
 # Use system libtool to prevent build scripts from using RPATH hacks.
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 desktop-file-install --vendor fedora			\
 	--dir %{buildroot}%{_datadir}/applications	\
@@ -87,39 +85,23 @@ desktop-file-install --vendor fedora			\
 %clean
 rm -rf %{buildroot}
 
-
-%pre
-if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null ||:
-fi
-
-
 %post
 /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-gconftool-2 --makefile-install-rule	\
-		%{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null ||:
+update-desktop-database -q
 touch --no-create %{_datadir}/icons/hicolor ||:
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
-
-
-%preun
-if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null ||:
-fi
-
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
-scrollkeeper-update -q ||:
+update-desktop-database -q
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas
+fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -133,7 +115,7 @@ scrollkeeper-update -q ||:
 %exclude %{_libdir}/%{name}/plugins/*/*.a
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
-%{_sysconfdir}/gconf/schemas/%{name}-*.schemas
+%{_datadir}/glib-2.0/schemas/org.nemiver.gschema.xml
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/%{name}/
@@ -142,6 +124,17 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Sat May  7 2011  <dodji at seketeli.org> - 0.8.2-1
+- Update to upstream release 0.8.2
+- Enable GSettings.  Remove usage of GConf.  Bump glibmm24 requirement
+  to 2.25 (to support gsettings) Add build requirements for
+  gsettings-desktop-schemas-devel, dconf and glib2-devel >= 2.28.
+  Remove GConf schema from package.  Add gsettings schema.
+- Remove use of scrollkeeper at long last.
+- Cleanup and update scriplet snippets.
+- Bump gtkmm24 build requirement to 2.20 as per what upstream
+  requires.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list