rpms/rssowl/devel .cvsignore, 1.2, 1.3 rssowl-browser.patch, 1.1, 1.2 rssowl-build0.patch, 1.1, 1.2 rssowl-build1.patch, 1.1, 1.2 rssowl-use-jce.patch, 1.1, 1.2 rssowl.script, 1.5, 1.6 rssowl.spec, 1.7, 1.8 sources, 1.2, 1.3 rssowl-swt31.patch, 1.1, NONE
Anthony Green (green)
fedora-extras-commits at redhat.com
Mon Jul 31 18:29:57 UTC 2006
Author: green
Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10003
Modified Files:
.cvsignore rssowl-browser.patch rssowl-build0.patch
rssowl-build1.patch rssowl-use-jce.patch rssowl.script
rssowl.spec sources
Removed Files:
rssowl-swt31.patch
Log Message:
Many changes. Updated to new sources for FC6.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Jan 2006 14:16:01 -0000 1.2
+++ .cvsignore 31 Jul 2006 18:29:57 -0000 1.3
@@ -1 +1 @@
-rssowl_1_2_src_clean.tar.gz
+rssowl_1_2_1_src-clean.tar.gz
rssowl-browser.patch:
Index: rssowl-browser.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl-browser.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rssowl-browser.patch 17 Jan 2006 14:16:01 -0000 1.1
+++ rssowl-browser.patch 31 Jul 2006 18:29:57 -0000 1.2
@@ -1,5 +1,5 @@
---- src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java~ 2005-11-06 08:06:57.000000000 -0800
-+++ src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java 2006-01-13 18:33:12.000000000 -0800
+--- src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java.orig 2006-04-23 05:30:40.000000000 -0700
++++ src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java 2006-05-06 09:54:29.000000000 -0700
@@ -36,6 +36,9 @@
import org.eclipse.swt.SWTError;
import org.eclipse.swt.program.Program;
@@ -10,14 +10,13 @@
import java.io.IOException;
/**
-@@ -267,11 +270,28 @@
+@@ -268,14 +271,31 @@
/** Try Netscape as default browser */
if (webBrowser == null) {
try {
- webBrowser = "netscape";
- p = Runtime.getRuntime().exec(webBrowser + " " + href);
- } catch (IOException e) {
-- p = null;
- webBrowser = "mozilla";
+ // This is kind of lame, but - oh well - it's slightly better than
+ // the original.
@@ -30,17 +29,29 @@
+ else if (webBrowser.startsWith("epiphany"))
+ webBrowser = "epiphany";
+ if (webBrowser.startsWith("netscape"))
-+ webBrowser = "netscape";
-+ else
-+ webBrowser = "firefox";
++ webBrowser = "netscape";
++ else
++ webBrowser = "firefox";
+ } catch (ConfException ce) {
-+ try {
-+ webBrowser = "firefox";
-+ p = Runtime.getRuntime().exec(webBrowser + " " + href);
-+ } catch (IOException e) {
-+ p = null;
-+ webBrowser = "mozilla";
-+ }
++ try {
++ webBrowser = "firefox";
++ p = Runtime.getRuntime().exec(webBrowser + " " + href);
++ } catch (IOException e) {
++ p = null;
++ webBrowser = "mozilla";
++ }
+ }
+ }
+
+- /** Try Mozilla as default browser */
+ if (p == null) {
+ try {
+ p = Runtime.getRuntime().exec(webBrowser + " " + href);
+@@ -284,6 +304,7 @@
+ errorMessage();
}
}
++
+ return p;
+ }
rssowl-build0.patch:
Index: rssowl-build0.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl-build0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rssowl-build0.patch 17 Jan 2006 14:16:01 -0000 1.1
+++ rssowl-build0.patch 31 Jul 2006 18:29:57 -0000 1.2
@@ -1,21 +1,16 @@
---- src/build.xml~ 2005-11-06 08:06:57.000000000 -0800
-+++ src/build.xml 2006-01-04 05:46:08.000000000 -0800
-@@ -127,12 +127,17 @@
+--- src/build.xml.orig 2006-04-23 05:30:41.000000000 -0700
++++ src/build.xml 2006-05-06 09:34:24.000000000 -0700
+@@ -121,7 +121,12 @@
for the special-chars of the translations.
-->
- <target name="compile_linux" depends="init">
-+ <path id="libs.classpath">
-+ <fileset dir="${root}/lib" includes="**/*.jar" />
-+ </path>
-+
- <javac excludes="**/DevShop.java"
- encoding="utf8"
- destdir="${classes}/"
-- srcdir="${src}"
-- classpath="${libs}" />
-+ srcdir="${src}">
-+ <classpath refid="libs.classpath" />
-+ </javac>
- </target>
+ <target name="compile_linux" depends="init">
+- <javac excludes="**/DevShop.java" encoding="utf8" destdir="${classes}/" srcdir="${src}" classpath="${libs}" />
++ <path id="libs.classpath">
++ <fileset dir="${root}/lib" includes="**/*.jar" />
++ </path>
++ <javac excludes="**/DevShop.java" encoding="utf8" destdir="${classes}/" srcdir="${src}">
++ <classpath refid="libs.classpath" />
++ </javac>
+ </target>
- <!--
+ <!--
rssowl-build1.patch:
Index: rssowl-build1.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl-build1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rssowl-build1.patch 17 Jan 2006 14:16:01 -0000 1.1
+++ rssowl-build1.patch 31 Jul 2006 18:29:57 -0000 1.2
@@ -1,21 +1,21 @@
---- src/build.xml~ 2006-01-04 06:11:03.000000000 -0800
-+++ src/build.xml 2006-01-04 06:12:24.000000000 -0800
-@@ -201,18 +201,7 @@
+--- 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 @@
Pack compiled RSSOwl into executable JAR file.
-->
- <target name="jar_linux" depends="compile_linux">
-- <unjar src="${SWT}" dest="${classes}" />
-- <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="${CODEC}" dest="${classes}" />
-- <unjar src="${HTTPCLIENT}" dest="${classes}" />
-- <unjar src="${LOGGING}" dest="${classes}" />
-- <unjar src="${BLOWFISH}" dest="${classes}" />
- <delete file="${classes}/META-INF/LICENSE.txt" />
- <delete file="${classes}/META-INF/info.xml" />
- <jar jarfile="${deploy}/rssowl.jar" basedir="${classes}">
+ <target name="jar_linux" depends="compile_linux">
+- <unjar src="${SWT}" dest="${classes}" />
+- <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="${CODEC}" dest="${classes}" />
+- <unjar src="${HTTPCLIENT}" dest="${classes}" />
+- <unjar src="${LOGGING}" dest="${classes}" />
+- <unjar src="${BLOWFISH}" dest="${classes}" />
+ <delete file="${classes}/META-INF/LICENSE.txt" />
+ <delete file="${classes}/META-INF/info.xml" />
+ <jar jarfile="${deploy}/rssowl.jar" basedir="${classes}">
rssowl-use-jce.patch:
Index: rssowl-use-jce.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl-use-jce.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rssowl-use-jce.patch 17 Jan 2006 14:16:01 -0000 1.1
+++ rssowl-use-jce.patch 31 Jul 2006 18:29:57 -0000 1.2
@@ -1,5 +1,5 @@
---- src/java/net/sourceforge/rssowl/util/CryptoManager.java.sav 2006-01-04 05:29:01.000000000 -0800
-+++ src/java/net/sourceforge/rssowl/util/CryptoManager.java 2006-01-04 05:31:00.000000000 -0800
+--- src/java/net/sourceforge/rssowl/util/CryptoManager.java.orig 2006-04-23 05:30:41.000000000 -0700
++++ src/java/net/sourceforge/rssowl/util/CryptoManager.java 2006-05-06 09:27:30.000000000 -0700
@@ -24,7 +24,9 @@
package net.sourceforge.rssowl.util;
@@ -11,15 +11,6 @@
import net.sourceforge.rssowl.controller.GUI;
import net.sourceforge.rssowl.util.shop.StringShop;
-@@ -41,7 +43,7 @@
- *
- * @author <a href="mailto:bpasero at rssowl.org">Benjamin Pasero </a>
- * @version 1.2
-- */
-+*/
- public class CryptoManager {
-
- /** Unique key for the proxy domain (NTLM only) */
@@ -56,15 +58,28 @@
/** An instance of the CryptoManager */
private static CryptoManager instance;
Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rssowl.script 29 Jul 2006 20:02:59 -0000 1.5
+++ rssowl.script 31 Jul 2006 18:29:57 -0000 1.6
@@ -10,4 +10,6 @@
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.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.0.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.0.I20060605-1400.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/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.0.I20060605-1400.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.4.1.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/devel/rssowl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rssowl.spec 29 Jul 2006 20:02:59 -0000 1.7
+++ rssowl.spec 31 Jul 2006 18:29:57 -0000 1.8
@@ -1,7 +1,6 @@
%define name rssowl
-%define version 1.2
-%define release 13%{?dist}
-%define jdk java
+%define version 1.2.1
+%define release 3%{?dist}
Name: %name
Summary: An RSS, RDF and Atom Newsreader
@@ -10,28 +9,28 @@
License: CPL
Group: Applications/Internet
URL: http://www.rssowl.org
-Source0: rssowl_1_2_src_clean.tar.gz
+# This is identical to the upstream tar ball, except that all binary
+# code jar files have been removed.
+Source0: rssowl_1_2_1_src-clean.tar.gz
Source1: %{name}.script
Source2: %{name}.desktop
Patch0: %{name}-use-jce.patch
Patch1: %{name}-build0.patch
-Patch2: %{name}-swt31.patch
Patch3: %{name}-build1.patch
-Patch4: %{name}-JessieX509.patch
Patch5: %{name}-browser.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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.0
+BuildRequires: ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.1.2
BuildRequires: libgconf-java
BuildRequires: ant, 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.0
+Requires: itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform
Requires: libgconf-java
BuildRequires: desktop-file-utils
Requires(post): desktop-file-utils
@@ -50,18 +49,16 @@
integrierte Browser.
%prep
-%setup -q -n %{name}_1_2_src_clean
+%setup -q -n rssowl_1_2_1_src
%patch0 -p0
%patch1 -p0
-%patch2 -p0
%patch3 -p0
-%patch4 -p0
%patch5 -p0
# This package doesn't contain any MPL licensed code.
rm doc/mpl-v11.txt
%build
-build-jar-repository -p lib swt-gtk-3.2.0 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
+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.0.I20060605-1400.jar lib
ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib
cd src
@@ -108,7 +105,7 @@
%post
%{_bindir}/rebuild-gcj-db
-update-desktop-database %{_datadir}/application
+update-desktop-database %{_datadir}/applications
# update icon themes
touch %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -138,11 +135,19 @@
%{_libdir}/gcj/%{name}
%changelog
-* Sat Jul 29 2006 Anthony Green <green at redhat.com> - 1.2-13
-- Update dependencies for FC6.
-- Update rssowl.script.
+* Sun Jul 30 2006 Anthony Green <green at redhat.com> - 1.2.1-3
+- Tweak jar references for FC6.
+- Use -p option on build-jar-repository to work around ecj misfeature.
+- Fix rssowl script (thanks aph!).
+
+* Mon May 8 2006 Anthony Green <green at redhat.com> - 1.2.1-2
+- Fix bugzilla #191044 - postinstall scriptlet typo error.
+ Thanks to Chien-Chung Yeh for the fix.
+
+* Sat May 6 2006 Anthony Green <green at redhat.com> - 1.2.1-1
+- Update sources.
-* Fri Mar 10 2006 Anthony Green <green at redhat.com> - 1.2-12
+* Fri Mar 10 2006 Anthony Green <green at redhat.com> - 1.2-13
- Fix script goof.
* Thu Mar 9 2006 Anthony Green <green at redhat.com> - 1.2-11
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 17 Jan 2006 14:16:01 -0000 1.2
+++ sources 31 Jul 2006 18:29:57 -0000 1.3
@@ -1 +1 @@
-d440e36983de3dba0239b4f1020f0837 rssowl_1_2_src_clean.tar.gz
+1086358716844de8d8d2ed3e3e7f95f1 rssowl_1_2_1_src-clean.tar.gz
--- rssowl-swt31.patch DELETED ---
More information about the fedora-extras-commits
mailing list