rpms/liferea/FC-4 liferea-mozilla-lib64.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 liferea.spec, 1.25, 1.26 sources, 1.21, 1.22

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10240

Modified Files:
	.cvsignore liferea.spec sources 
Added Files:
	liferea-mozilla-lib64.patch 
Log Message:
* Sat Mar 18 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.7-1
- Update to 1.0.7.
- Add patch to find mozilla on x86_64
- Fix gconf scriptlets.
- Remove unnecessary BR (zlib-devel & libxml2-devel).


liferea-mozilla-lib64.patch:

--- NEW FILE liferea-mozilla-lib64.patch ---
diff -ur liferea-1.0.7.ORIG/src/liferea.in liferea-1.0.7/src/liferea.in
--- liferea-1.0.7.ORIG/src/liferea.in	2006-01-16 18:11:19.000000000 -0500
+++ liferea-1.0.7/src/liferea.in	2006-03-14 16:45:26.000000000 -0500
@@ -39,7 +39,7 @@
 fi
 
 @MOZILLA_LIB_DIR_SEARCH@
-look_for_mozilla "/usr/lib/mozilla*/chrome/comm.jar"
+look_for_mozilla "/usr/lib*/mozilla*/chrome/comm.jar"
 look_for_mozilla "/usr/local/mozilla*/chrome/comm.jar"
 look_for_mozilla "/opt/mozilla/chrome/comm.jar"
 look_for_mozilla "/opt/mozilla/lib/chrome/comm.jar"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	2 Feb 2006 18:25:21 -0000	1.20
+++ .cvsignore	18 Mar 2006 13:58:05 -0000	1.21
@@ -1 +1 @@
-liferea-1.0.3.tar.gz
+liferea-1.0.7.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- liferea.spec	2 Feb 2006 18:25:21 -0000	1.25
+++ liferea.spec	18 Mar 2006 13:58:05 -0000	1.26
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.3
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -9,20 +9,20 @@
 License:        GPL
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		%{name}-mozilla-lib64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel mozilla-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  zlib-devel
 
 %if %{with_dbus}
 BuildRequires:	dbus-devel
 %endif
 
-Requires(post):  GConf2
+Requires(pre): GConf2
+Requires(post): GConf2
 Requires(preun): GConf2
 
 
@@ -64,16 +64,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
@@ -92,6 +102,12 @@
 
 
 %changelog
+* Sat Mar 18 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.7-1
+- Update to 1.0.7.
+- Add patch to find mozilla on x86_64
+- Fix gconf scriptlets.
+- Remove unnecessary BR (zlib-devel & libxml2-devel).
+
 * Thu Feb  2 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.3-1
 - Update to 1.0.3.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	2 Feb 2006 18:25:21 -0000	1.21
+++ sources	18 Mar 2006 13:58:05 -0000	1.22
@@ -1 +1 @@
-40232e6884e4ae9628916868a9a9c828  liferea-1.0.3.tar.gz
+d75b2621d2e926695e833eaa2aed68c2  liferea-1.0.7.tar.gz