rpms/liferea/devel .cvsignore, 1.22, 1.23 liferea.spec, 1.33, 1.34 sources, 1.23, 1.24

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25096

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Mon Mar  6 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.7-2
- Update to 1.0.7.
- Fix gconf scriptlets.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	25 Feb 2006 15:43:24 -0000	1.22
+++ .cvsignore	6 Mar 2006 15:09:38 -0000	1.23
@@ -1 +1 @@
-liferea-1.0.6.tar.gz
+liferea-1.0.7.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- liferea.spec	25 Feb 2006 15:43:24 -0000	1.33
+++ liferea.spec	6 Mar 2006 15:09:38 -0000	1.34
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.6
+Version:        1.0.7
 Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -23,7 +23,8 @@
 BuildRequires:	dbus-devel
 %endif
 
-Requires(post):  GConf2
+Requires(pre): GConf2
+Requires(post): GConf2
 Requires(preun): GConf2
 
 
@@ -51,10 +52,11 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} install
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor fedora			\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
   --add-category X-Fedora			        \
@@ -65,16 +67,26 @@
 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 || :
+fi
+
+
 %post
-export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || :
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
 
 %preun
-export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-gconftool-2 --makefile-uninstall-rule \
-  %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || :
+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
 
 
 %files -f %{name}.lang
@@ -93,6 +105,10 @@
 
 
 %changelog
+* Mon Mar  6 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.7-2
+- Update to 1.0.7.
+- Fix gconf scriptlets.
+
 * Sat Feb 25 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.6-2
 - Update to 1.0.6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	25 Feb 2006 15:43:24 -0000	1.23
+++ sources	6 Mar 2006 15:09:38 -0000	1.24
@@ -1 +1 @@
-e8200bdd9a6a33468687cc8fb144e809  liferea-1.0.6.tar.gz
+d75b2621d2e926695e833eaa2aed68c2  liferea-1.0.7.tar.gz