rpms/rssowl/devel rssowl.script,1.2,1.3 rssowl.spec,1.2,1.3

[Anthony Green (green)]

Author: green

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

Modified Files:
	rssowl.script rssowl.spec 
Log Message:
Update to -9 release.  Many tweaks.



Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rssowl.script	4 Feb 2006 13:37:54 -0000	1.2
+++ rssowl.script	7 Feb 2006 23:09:11 -0000	1.3
@@ -5,9 +5,9 @@
 
 # This makes the embedded browser work.
 if [ -z "$MOZILLA_FIVE_HOME" ]; then
-  XPCOM=$(ls -t /usr/lib/mozilla-*/libxpcom.so|head -n1)
+  XPCOM=$(ls -t /usr/lib64/mozilla-*/libxpcom.so|head -n1)
   export MOZILLA_FIVE_HOME=$(dirname $XPCOM)
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
 
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib64/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rssowl.spec	4 Feb 2006 13:37:54 -0000	1.2
+++ rssowl.spec	7 Feb 2006 23:09:11 -0000	1.3
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2
-%define release 8%{?dist}
+%define release 9%{?dist}
 %define jdk     java
 
 Name:           %name
@@ -33,21 +33,21 @@
 Requires(postun): java-gcj-compat >= 1.0.31
 Requires: 	itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform
 Requires:  	libgconf-java
+BuildRequires:    desktop-file-utils
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
 RSSOwl is a RSS / RDF / Atom Newsreader written in Java using SWT as
 fast graphic library. Read News in a tabfolder, save favorites in
 categories, Export to PDF / RTF / HTML / OPML, Import Feeds from OPML,
-perform fulltext-search, use the integrated browser. Please contact
-bpasero at rssowl.org if you have any questions or problems regarding
-this version.
+perform fulltext-search, use the integrated browser.
 
 %description -l de
 RSSOwl ist ein RSS / RDF / Atom Newsreader in Java mit SWT als
 GUI-Bibliothek. Einige der Features sind Export von Nachrichten nach
 PDF / RTF / HTML, Import / Export mit OPML, Volltextsuche und der
-integrierte Browser. Bei Fragen oder Problemen mit dieser Version
-bitte an bpasero at rssowl.org schreiben.
+integrierte Browser.
 
 %prep
 %setup -q -n %{name}_1_2_src_clean
@@ -87,7 +87,10 @@
 install -m 644 img/32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/rssowl.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor fedora 			\
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	%{SOURCE2}
 
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
@@ -103,9 +106,23 @@
 
 aot-compile-rpm
 
-%post -p %{_bindir}/rebuild-gcj-db
-
-%postun -p %{_bindir}/rebuild-gcj-db
+%post 
+%{_bindir}/rebuild-gcj-db
+update-desktop-database %{_datadir}/application
+# update icon themes
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+%postun 
+%{_bindir}/rebuild-gcj-db
+update-desktop-database %{_datadir}/applications
+# update icon themes
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,9 +138,13 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
-* Sat Feb  4 2006 Anthony Green <green at redhat.com> - 1.2-8
+* Tue Feb  7 2006 Anthony Green <green at redhat.com> - 1.2-9
 - Update eclipse-platform requirement in spec file and eclipse swt and 
   runtime references in rssowl.script.
+- Install .desktop file propertly.
+- Run update-desktop-database and gtk-update-icon-cache in post and postun.
+- Add desktop-file-utils dependencies.
+- Tweak description.
 
 * Mon Jan 16 2006 Anthony Green <green at redhat.com> 1.2-7
 - Word-wrapped descriptions.