rpms/rssowl/FC-5 rssowl-swt31-SortingSelectionAdapter.patch, NONE, 1.1 .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-swt31.patch, 1.1, 1.2 rssowl-use-jce.patch, 1.1, 1.2 rssowl.spec, 1.7, 1.8 sources, 1.2, 1.3
Anthony Green (green)
fedora-extras-commits at redhat.com
Sat May 6 17:24:01 UTC 2006
Author: green
Update of /cvs/extras/rpms/rssowl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20377
Modified Files:
.cvsignore rssowl-browser.patch rssowl-build0.patch
rssowl-build1.patch rssowl-swt31.patch rssowl-use-jce.patch
rssowl.spec sources
Added Files:
rssowl-swt31-SortingSelectionAdapter.patch
Log Message:
Update to rssowl 1.2.1.
rssowl-swt31-SortingSelectionAdapter.patch:
--- NEW FILE rssowl-swt31-SortingSelectionAdapter.patch ---
--- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java.orig 2006-04-23 05:30:41.000000000 -0700
+++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java 2006-05-06 09:42:26.000000000 -0700
@@ -26,7 +26,6 @@
import net.sourceforge.rssowl.controller.NewsTable;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Table;
@@ -42,7 +41,7 @@
* header is clicked and update it.
*
* @author <a href="mailto:masterludo at gmx.net">Ludovic Kim-Xuan Galibert </a>
- * @version 1.2.1
+ * @version 1.1.3
*/
public class SortingSelectionAdapter extends SelectionAdapter {
@@ -101,59 +100,67 @@
}
/**
- * Sort the News using a Sorter that is identified by the given field value.
+ * Handle the sorting corresponding to the header clicked
*
- * @param field The identifier of the Sorter to use.
- * @return boolean TRUE if the sort was ascending, FALSE if descending.
+ * @param se the SelectionEvent
*/
- public boolean sort(String field) {
+ public void widgetSelected(SelectionEvent se) {
+ widgetSelected((TableColumn) se.getSource());
+ }
+
+ /**
+ * Handle the sorting corresponding to the header clicked
+ *
+ * @param tc The selected TableColumn
+ */
+ public void widgetSelected(TableColumn tc) {
Comparator sorter = null;
boolean ascending = true;
/** Sort by news title */
- if ("TABLE_HEADER_NEWSTITLE".equals(field)) {
+ if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) {
ascending = this.titleAscending;
this.titleAscending = !this.titleAscending;
sorter = new TitleSorter();
}
/** Sort by publish date */
- else if ("TABLE_HEADER_PUBDATE".equals(field)) {
+ else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) {
ascending = this.pudDateAscending;
this.pudDateAscending = !this.pudDateAscending;
sorter = new PubDateSorter(newsItems);
}
/** Sort by author */
- else if ("TABLE_HEADER_AUTHOR".equals(field)) {
+ else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) {
ascending = this.authorAscending;
this.authorAscending = !this.authorAscending;
sorter = new AuthorSorter(newsItems);
}
/** Sort by category */
- else if ("TABLE_HEADER_CATEGORY".equals(field)) {
+ else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) {
ascending = this.categoryAscending;
this.categoryAscending = !this.categoryAscending;
sorter = new CategorySorter(newsItems);
}
/** Sort by publisher */
- else if ("TABLE_HEADER_PUBLISHER".equals(field)) {
+ else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) {
ascending = this.publisherAscending;
this.publisherAscending = !this.publisherAscending;
sorter = new PublisherSorter(newsItems);
}
/** Sort by news feed */
- else if ("TABLE_HEADER_FEED".equals(field)) {
+ else if (tc.getData().equals("TABLE_HEADER_FEED")) {
ascending = this.newsfeedAscending;
this.newsfeedAscending = !this.newsfeedAscending;
sorter = new NewsFeedSorter(newsItems);
}
/** Sort by news status */
- else if ("TABLE_HEADER_STATUS".equals(field)) {
+ else if (tc.getData().equals("TABLE_HEADER_STATUS")) {
ascending = this.statusAscending;
this.statusAscending = !this.statusAscending;
sorter = new StatusSorter(newsItems);
@@ -169,28 +176,6 @@
if (!ascending)
Collections.reverse(newsItemOrder);
- return ascending;
- }
-
- /**
- * Handle the sorting corresponding to the header clicked
- *
- * @param se the SelectionEvent
- */
- public void widgetSelected(SelectionEvent se) {
- widgetSelected((TableColumn) se.getSource());
- }
-
- /**
- * Handle the sorting corresponding to the header clicked
- *
- * @param tc The selected TableColumn
- */
- public void widgetSelected(TableColumn tc) {
-
- /** Sort based on the given TableColumn */
- boolean ascending = sort((String) tc.getData());
-
/** Remember the width values of the columns */
int columnCount = table.getColumnCount();
int columnWidth[] = new int[columnCount];
@@ -202,41 +187,6 @@
if (table.getSelectionCount() > 0)
selectedNews = table.getSelection()[0].getText(1);
- /** Show a Sort Indicator inside the selected TableColumn */
- if (!tc.getData().equals("TABLE_HEADER_STATUS")) {
- table.setSortColumn(tc);
-
- /** Reset Sort Direction */
- if (table.getSortDirection() != SWT.NONE)
- table.setSortDirection(SWT.NONE);
-
- /** Apply the new direction */
- table.setSortDirection(ascending ? SWT.DOWN : SWT.UP);
-
- /**
- * The Indicator requires some space, so pack the TableColumn. In order to
- * avoid flashing, first set the Table to redraw = false before packing.
- */
- table.setRedraw(false);
- tc.pack();
- table.setRedraw(true);
-
- /** Restore Focus if necessary */
- if (!table.isFocusControl())
- table.setFocus();
-
- /** Grant the sorted Column its preferred Width */
- int sortColumnIndex = table.indexOf(tc);
- if (columnWidth[sortColumnIndex] < tc.getWidth())
- columnWidth[sortColumnIndex] = tc.getWidth();
- }
-
- /** Do not show the Indicator in the first, narrow Column */
- else if (table.getSortColumn() != null) {
- table.setSortDirection(SWT.NONE);
- table.setSortColumn(null);
- }
-
/** Remove All tableitems */
table.removeAll();
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-5/.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 6 May 2006 17:24:01 -0000 1.3
@@ -1 +1,2 @@
rssowl_1_2_src_clean.tar.gz
+rssowl_1_2_1_src.tar.gz
rssowl-browser.patch:
Index: rssowl-browser.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-5/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 6 May 2006 17:24:01 -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/FC-5/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 6 May 2006 17:24:01 -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/FC-5/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 6 May 2006 17:24:01 -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-swt31.patch:
Index: rssowl-swt31.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl-swt31.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rssowl-swt31.patch 17 Jan 2006 14:16:01 -0000 1.1
+++ rssowl-swt31.patch 6 May 2006 17:24:01 -0000 1.2
@@ -1,179 +1,3 @@
---- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java~ 2006-01-04 05:58:01.000000000 -0800
-+++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java 2005-06-14 14:15:46.000000000 -0700
-@@ -26,7 +26,6 @@
-
- import net.sourceforge.rssowl.controller.NewsTable;
-
--import org.eclipse.swt.SWT;
- import org.eclipse.swt.events.SelectionAdapter;
- import org.eclipse.swt.events.SelectionEvent;
- import org.eclipse.swt.widgets.Table;
-@@ -42,7 +41,7 @@
- * header is clicked and update it.
- *
- * @author <a href="mailto:masterludo at gmx.net">Ludovic Kim-Xuan Galibert </a>
-- * @version 1.2
-+ * @version 1.1.3
- */
- public class SortingSelectionAdapter extends SelectionAdapter {
-
-@@ -101,59 +100,67 @@
- }
-
- /**
-- * Sort the News using a Sorter that is identified by the given field value.
-+ * Handle the sorting corresponding to the header clicked
- *
-- * @param field The identifier of the Sorter to use.
-- * @return boolean TRUE if the sort was ascending, FALSE if descending.
-+ * @param se the SelectionEvent
- */
-- public boolean sort(String field) {
-+ public void widgetSelected(SelectionEvent se) {
-+ widgetSelected((TableColumn) se.getSource());
-+ }
-+
-+ /**
-+ * Handle the sorting corresponding to the header clicked
-+ *
-+ * @param tc The selected TableColumn
-+ */
-+ public void widgetSelected(TableColumn tc) {
- Comparator sorter = null;
- boolean ascending = true;
-
- /** Sort by news title */
-- if ("TABLE_HEADER_NEWSTITLE".equals(field)) {
-+ if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) {
- ascending = this.titleAscending;
- this.titleAscending = !this.titleAscending;
- sorter = new TitleSorter();
- }
-
- /** Sort by publish date */
-- else if ("TABLE_HEADER_PUBDATE".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) {
- ascending = this.pudDateAscending;
- this.pudDateAscending = !this.pudDateAscending;
- sorter = new PubDateSorter(newsItems);
- }
-
- /** Sort by author */
-- else if ("TABLE_HEADER_AUTHOR".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) {
- ascending = this.authorAscending;
- this.authorAscending = !this.authorAscending;
- sorter = new AuthorSorter(newsItems);
- }
-
- /** Sort by category */
-- else if ("TABLE_HEADER_CATEGORY".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) {
- ascending = this.categoryAscending;
- this.categoryAscending = !this.categoryAscending;
- sorter = new CategorySorter(newsItems);
- }
-
- /** Sort by publisher */
-- else if ("TABLE_HEADER_PUBLISHER".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) {
- ascending = this.publisherAscending;
- this.publisherAscending = !this.publisherAscending;
- sorter = new PublisherSorter(newsItems);
- }
-
- /** Sort by news feed */
-- else if ("TABLE_HEADER_FEED".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_FEED")) {
- ascending = this.newsfeedAscending;
- this.newsfeedAscending = !this.newsfeedAscending;
- sorter = new NewsFeedSorter(newsItems);
- }
-
- /** Sort by news status */
-- else if ("TABLE_HEADER_STATUS".equals(field)) {
-+ else if (tc.getData().equals("TABLE_HEADER_STATUS")) {
- ascending = this.statusAscending;
- this.statusAscending = !this.statusAscending;
- sorter = new StatusSorter(newsItems);
-@@ -165,33 +172,11 @@
- else
- Collections.sort(newsItemOrder, sorter);
-
-- /** Reverse if not ascending order */
-+ /** Reverse is not ascending order */
- if (!ascending)
- Collections.reverse(newsItemOrder);
-
-- return ascending;
-- }
--
-- /**
-- * Handle the sorting corresponding to the header clicked
-- *
-- * @param se the SelectionEvent
-- */
-- public void widgetSelected(SelectionEvent se) {
-- widgetSelected((TableColumn) se.getSource());
-- }
--
-- /**
-- * Handle the sorting corresponding to the header clicked
-- *
-- * @param tc The selected TableColumn
-- */
-- public void widgetSelected(TableColumn tc) {
--
-- /** Sort based on the given TableColumn */
-- boolean ascending = sort((String) tc.getData());
--
-- /** Remember the width values of the columns */
-+ /** Remember the width values of the columns before sorting */
- int columnWidth[] = new int[table.getColumnCount()];
- for (int a = 0; a < table.getColumnCount(); a++)
- columnWidth[a] = table.getColumn(a).getWidth();
-@@ -201,41 +186,6 @@
- if (table.getSelectionCount() > 0)
- selectedNews = table.getSelection()[0].getText(1);
-
-- /** Show a Sort Indicator inside the selected TableColumn */
-- if (!tc.getData().equals("TABLE_HEADER_STATUS")) {
-- table.setSortColumn(tc);
--
-- /** Reset Sort Direction */
-- if (table.getSortDirection() != SWT.NONE)
-- table.setSortDirection(SWT.NONE);
--
-- /** Apply the new direction */
-- table.setSortDirection(ascending ? SWT.DOWN : SWT.UP);
--
-- /**
-- * The Indicator requires some space, so pack the TableColumn. In order to
-- * avoid flashing, first set the Table visible before packing the Column.
-- */
-- table.setVisible(false);
-- tc.pack();
-- table.setVisible(true);
--
-- /** Restore Focus if necessary */
-- if (!table.isFocusControl())
-- table.setFocus();
--
-- /** Grant the sorted Column its preferred Width */
-- int sortColumnIndex = table.indexOf(tc);
-- if (columnWidth[sortColumnIndex] < tc.getWidth())
-- columnWidth[sortColumnIndex] = tc.getWidth();
-- }
--
-- /** Do not show the Indicator in the first, narrow Column */
-- else if (table.getSortColumn() != null) {
-- table.setSortDirection(SWT.NONE);
-- table.setSortColumn(null);
-- }
--
- /** Remove All tableitems */
- table.removeAll();
-
--- src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java~ 2006-01-04 06:01:14.000000000 -0800
+++ src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java 2005-07-15 16:44:50.000000000 -0700
@@ -54,7 +54,6 @@
@@ -188,7 +12,7 @@
* Table. A selection on a newstitle will open it inside the Newstext panel.
*
* @author <a href="mailto:bpasero at rssowl.org">Benjamin Pasero </a>
-- * @version 1.2
+- * @version 1.2.1
+ * @version 1.1.3
*/
public class NewsfeedPanel {
rssowl-use-jce.patch:
Index: rssowl-use-jce.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-5/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 6 May 2006 17:24:01 -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.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rssowl.spec 2 Apr 2006 03:59:39 -0000 1.7
+++ rssowl.spec 6 May 2006 17:24:01 -0000 1.8
@@ -1,6 +1,6 @@
%define name rssowl
-%define version 1.2
-%define release 13%{?dist}
+%define version 1.2.1
+%define release 1%{?dist}
%define jdk java
Name: %name
@@ -10,15 +10,16 @@
License: CPL
Group: Applications/Internet
URL: http://www.rssowl.org
-Source0: rssowl_1_2_src_clean.tar.gz
+Source0: rssowl_1_2_1_src.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
+#Patch4: %{name}-JessieX509.patch
Patch5: %{name}-browser.patch
+Patch6: %{name}-swt31-SortingSelectionAdapter.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: jre >= 1.4.2-
@@ -50,13 +51,14 @@
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
+#%patch4 -p0
%patch5 -p0
+%patch6 -p0
# This package doesn't contain any MPL licensed code.
rm doc/mpl-v11.txt
@@ -138,6 +140,9 @@
%{_libdir}/gcj/%{name}
%changelog
+* 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-13
- Fix script goof.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-5/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 6 May 2006 17:24:01 -0000 1.3
@@ -1 +1,2 @@
d440e36983de3dba0239b4f1020f0837 rssowl_1_2_src_clean.tar.gz
+be9c070343aa145807e1e708ed535a9b rssowl_1_2_1_src.tar.gz
More information about the fedora-extras-commits
mailing list