rpms/rssowl/FC-6 .cvsignore, 1.4, 1.5 rssowl-build1.patch, 1.2, 1.3 rssowl.script, 1.8, 1.9 rssowl.spec, 1.16, 1.17 sources, 1.4, 1.5

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/extras/rpms/rssowl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12926

Modified Files:
	.cvsignore rssowl-build1.patch rssowl.script rssowl.spec 
	sources 
Log Message:
* Wed Nov 29 2006 Andrew Overholt <overholt at redhat.com> 1.2.3-1
- 1.2.3.
- Guard against rebuild-gcj-db presence and installation ordering.
- Symlink to swt in %%{_libdir} where it now resides.
- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
- Remove symlink to org.eclipse.ui.forms - no longer needed.
- Remove requirement on eclipse-platform - no longer needed.
- Add xerces-j2 requirement.
- Update build1 patch.
- Remove ui.forms from rssowl.script.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2006 01:51:18 -0000	1.4
+++ .cvsignore	29 Nov 2006 18:04:21 -0000	1.5
@@ -1 +1 @@
-rssowl_1_2_2_src-CLEAN.tar.gz
+rssowl_1_2_3_src-CLEAN.tar.gz

rssowl-build1.patch:

Index: rssowl-build1.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/rssowl-build1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rssowl-build1.patch	31 Jul 2006 18:29:57 -0000	1.2
+++ rssowl-build1.patch	29 Nov 2006 18:04:21 -0000	1.3
@@ -1,6 +1,6 @@
---- src/build.xml.orig	2006-05-06 09:45:03.000000000 -0700
-+++ src/build.xml	2006-05-06 09:46:34.000000000 -0700
-@@ -182,18 +182,7 @@
+--- src/build.xml.orig	2006-11-26 09:22:39.000000000 -0500
++++ src/build.xml	2006-11-29 11:27:18.000000000 -0500
+@@ -184,17 +189,6 @@
  		Pack compiled RSSOwl into executable JAR file.
      -->
  	<target name="jar_linux" depends="compile_linux">
@@ -8,10 +8,9 @@
 -		<unjar src="${SWT-NL}" dest="${classes}" />
 -		<unjar src="${JDOM}" dest="${classes}" />
 -		<unjar src="${JFACE}" dest="${classes}" />
--		<unjar src="${FORMS}" dest="${classes}" />
 -		<unjar src="${XERCES}" dest="${classes}" />
 -		<unjar src="${ITEXT}" dest="${classes}" />
- 		<unjar src="${ITEXTASIAN}" dest="${classes}" />
+-		<unjar src="${ITEXTASIAN}" dest="${classes}" />
 -		<unjar src="${CODEC}" dest="${classes}" />
 -		<unjar src="${HTTPCLIENT}" dest="${classes}" />
 -		<unjar src="${LOGGING}" dest="${classes}" />


Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/rssowl.script,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rssowl.script	4 Oct 2006 14:00:51 -0000	1.8
+++ rssowl.script	29 Nov 2006 18:04:21 -0000	1.9
@@ -10,7 +10,7 @@
 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.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.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/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.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/lib/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.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/FC-6/rssowl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rssowl.spec	4 Oct 2006 15:04:50 -0000	1.16
+++ rssowl.spec	29 Nov 2006 18:04:21 -0000	1.17
@@ -1,6 +1,6 @@
 %define name    rssowl
-%define version 1.2.2
-%define release 6%{?dist}
+%define version 1.2.3
+%define release 1%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -11,7 +11,7 @@
 URL:            http://www.rssowl.org
 # This is identical to the upstream tar ball, except that all binary
 # code jar files have been removed.
-Source0:        rssowl_1_2_2_src-CLEAN.tar.gz
+Source0:        rssowl_1_2_3_src-CLEAN.tar.gz
 Source1:        %{name}.script
 Source2:        %{name}.desktop
 Patch0:         %{name}-use-jce.patch
@@ -23,15 +23,15 @@
 Requires:       jre >= 1.4.2-
 BuildRequires:  java-sdk >= 1.4.2
 BuildRequires:  ImageMagick
-BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
+BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
 BuildRequires:  libgconf-java
-BuildRequires:  ant, jpackage-utils >= 1.5
+BuildRequires:  xerces-j2, jpackage-utils >= 1.5
 BuildRequires:	dos2unix
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
-Requires:       libgconf-java
+Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
+Requires:       xerces-j2, libgconf-java
 Requires:       firefox
 BuildRequires:    desktop-file-utils
 Requires(post):   desktop-file-utils
@@ -50,7 +50,7 @@
 integrierte Browser.
 
 %prep
-%setup -q -n rssowl_1_2_2_src
+%setup -q -n rssowl_1_2_3_src
 %patch0 -p0
 %patch1 -p0
 %patch3 -p0
@@ -59,9 +59,9 @@
 rm doc/mpl-v11.txt
 
 %build
-build-jar-repository -p lib swt-gtk-3.2 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
-ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
-ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib
+build-jar-repository -p lib jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8 xerces-j2
+ln -s %{_datadir}/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
+ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar lib
 cd src
 ant deploy_linux
 
@@ -105,7 +105,10 @@
 aot-compile-rpm
 
 %post 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -114,7 +117,10 @@
 fi
 
 %postun 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -136,6 +142,20 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Nov 29 2006 Andrew Overholt <overholt at redhat.com> 1.2.3-1
+- 1.2.3.
+- Guard against rebuild-gcj-db presence and installation ordering.
+- Symlink to swt in %%{_libdir} where it now resides.
+- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
+- Remove symlink to org.eclipse.ui.forms - no longer needed.
+- Remove requirement on eclipse-platform - no longer needed.
+- Add xerces-j2 requirement.
+- Update build1 patch.
+- Remove ui.forms from rssowl.script.
+
+* Mon Nov 06 2006 Andrew Overholt <overholt at redhat.com> 1.2.2-7
+- Use SWT in new %%{_libdir} location.
+
 * Wed Oct  4 2006 Anthony Green <green at redhat.com> - 1.2.2-6
 - Fix build classpath.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2006 01:51:18 -0000	1.4
+++ sources	29 Nov 2006 18:04:21 -0000	1.5
@@ -1 +1 @@
-63caafbb8d07fc131b994729e744a2b9  rssowl_1_2_2_src-CLEAN.tar.gz
+ae4e26a3665c84af24589aa9877d20be  rssowl_1_2_3_src-CLEAN.tar.gz