rpms/anjuta/devel anjuta.spec,1.42,1.43

[Debarshi Ray (rishi)]

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1810

Modified Files:
	anjuta.spec 
Log Message:
Preparing for releasing 2.4.1-1 in devel.
 
 Modified Files:
 	anjuta.spec 



Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- anjuta.spec	25 May 2008 10:48:50 -0000	1.42
+++ anjuta.spec	25 May 2008 12:09:54 -0000	1.43
@@ -22,7 +22,10 @@
 Requires:	glade3-libgladeui
 Requires:	gnome-icon-theme
 Requires:	hicolor-icon-theme
+Requires(pre):	GConf2
+Requires(post):	GConf2
 Requires(post):	/sbin/ldconfig
+Requires(preun):  GConf2
 Requires(postun): /sbin/ldconfig
 
 %if 0%{?fc7}
@@ -109,10 +112,11 @@
 
 %build
 export PKG_CONFIG_PATH="./PKGCONFIG"
-%configure --disable-static --enable-gtk-doc --enable-devhelp \
-  --enable-plugin-glade --enable-graphviz --enable-plugin-scintilla \
-  --enable-plugin-sourceview --disable-plugin-valgrind \
-  --enable-plugin-subversion --with-svn-lib=%{_libdir}
+%configure --disable-schemas-install --disable-static --enable-gtk-doc \
+  --enable-devhelp --enable-plugin-glade --enable-graphviz \
+  --enable-plugin-scintilla --enable-plugin-sourceview \
+  --disable-plugin-valgrind --enable-plugin-subversion \
+  --with-svn-lib=%{_libdir}
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -121,6 +125,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 # Installs zero-length files necessary for proper behaviour.
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
@@ -146,9 +151,22 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%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 || :
+  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 || :
+
 if [ -x %{_bindir}/update-desktop-database ]; then
   update-desktop-database &> /dev/null || :
 fi
@@ -164,6 +182,13 @@
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+%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