rpms/bisho/devel bisho.spec,1.3,1.4

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18256

Modified Files:
	bisho.spec 
Log Message:
- Add missing dep for new release


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bisho.spec	12 Aug 2009 12:22:21 -0000	1.3
+++ bisho.spec	23 Aug 2009 11:41:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           bisho
 Version:        0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -22,6 +22,10 @@ BuildRequires: gettext
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
 
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 %description
 A tool to configure user and account details for the mojito social network 
 aggregation service.
@@ -34,11 +38,12 @@ sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-schemas
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -48,8 +53,25 @@ desktop-file-validate %{buildroot}/%{_da
 %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
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+%{_sysconfdir}/gconf/schemas/[NAME] .schemas > /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/[NAME] .schemas > /dev/null || :
+fi
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -64,11 +86,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS TODO
 %{_bindir}/bisho
+%{_sysconfdir}/gconf/schemas/callback.schemas
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
-* Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-1
+* Sun Aug 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-2
+- Add missing dep for new release
+
+* Wed Aug 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.11-1
 - New upstream 0.11 release
 
 * Fri Aug  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.7-3