Attachment 295148 Details for Bug 433272 – jflex SRPM patch 1.3.5 -> 1.4.1

[patch] jflex SRPM patch 1.3.5 -> 1.4.1

jflex-1-3-5-1.4.1.diff (text/plain), 5.29 KB, created by Lubomir Kundrak on 2008-02-18 09:25:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Kundrak

Created: 2008-02-18 09:25:32 UTC

Size: 5.29 KB

patch

obsolete

>Binary files jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex-1.3.5.tar.gz and jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex-1.3.5.tar.gz differ
>Binary files jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex-1.4.1.tar.gz and jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex-1.4.1.tar.gz differ
>diff -Nur jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex-CharSet_java.patch jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex-CharSet_java.patch
>--- jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex-CharSet_java.patch	2008-02-18 10:18:09.000000000 +0100
>+++ jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex-CharSet_java.patch	1970-01-01 01:00:00.000000000 +0100
>@@ -1,21 +0,0 @@
>---- ./src/JFlex/CharSet.java.orig	2007-04-02 11:03:11.000000000 -0400
>-+++ ./src/JFlex/CharSet.java	2007-04-02 11:03:47.000000000 -0400
>-@@ -94,14 +94,14 @@
>-   }
>-   
>-   public String toString() {
>--    CharSetEnumerator enum = characters();
>-+    CharSetEnumerator enumer = characters();
>- 
>-     StringBuffer result = new StringBuffer("{");
>- 
>--    if ( enum.hasMoreElements() ) result.append(""+enum.nextElement());
>-+    if ( enumer.hasMoreElements() ) result.append(""+enumer.nextElement());
>- 
>--    while ( enum.hasMoreElements() ) {
>--      int i = enum.nextElement();
>-+    while ( enumer.hasMoreElements() ) {
>-+      int i = enumer.nextElement();
>-       result.append( ", "+(int)i);
>-     }
>- 
>diff -Nur jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex-Makefile.patch jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex-Makefile.patch
>--- jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex-Makefile.patch	2008-02-18 10:18:09.000000000 +0100
>+++ jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex-Makefile.patch	1970-01-01 01:00:00.000000000 +0100
>@@ -1,33 +0,0 @@
>---- src/Makefile.sav	2001-10-08 05:57:06.000000000 -0400
>-+++ src/Makefile	2007-02-13 10:50:00.000000000 -0500
>-@@ -3,14 +3,16 @@
>- JFLEX     = jflex -skel skeleton.nested
>- CUP       = java java_cup.Main 
>- 
>--JAVAC     = javac -target 1.1 -bootclasspath /usr/lib/jdk1.1/lib/classes.zip
>-+JAVAC     = javac -target 1.4 -bootclasspath /usr/lib/jvm/java/jre/lib/rt.jar
>- #JAVAC     = jikes   
>- JAR       = jar
>- 
>-+JAVADOC   = javadoc
>-+
>- DEST      = ../lib
>- 
>- # jdk 1.2 
>--CLPATH    = -classpath /usr/lib/java/jre/lib/rt.jar:.
>-+CLPATH    = -classpath /usr/lib/jvm/java/jre/lib/rt.jar:.
>- 
>- # jdk 1.1
>- #CLPATH    = -classpath /usr/lib/java/lib/classes.zip:.
>-@@ -58,6 +60,10 @@
>- 
>- jar: jarclean
>- 	echo "Main-Class: JFlex.Main" > $(DEST)/manifest
>--	cd $(DEST); $(JAR) -c0mf manifest $(JARFILE) JFlex java_cup
>-+	cd $(DEST); $(JAR) -cmf manifest $(JARFILE) JFlex java_cup
>- 	rm -rf $(DEST)/java_cup $(DEST)/JFlex $(DEST)/manifest
>- 
>-+javadoc: 
>-+	$(JAVADOC) -sourcepath . -d ../api JFlex
>-+
>-+
>diff -Nur jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex.spec jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex.spec
>--- jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex.spec	2008-02-18 10:18:09.000000000 +0100
>+++ jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex.spec	2008-02-18 10:18:09.000000000 +0100
>@@ -32,16 +32,13 @@
> 
> Summary:        Fast Scanner Generator
> Name:           jflex
>-Version:        1.3.5
>-Release:        2jpp.2%{?dist}
>+Version:        1.4.1
>+Release:        2jpp.1%{?dist}
> Epoch:          0
> License:        GPL
> URL:            http://jflex.de/
> Group:          Development/Libraries/Java
>-Source0:        http://downloads.sourceforge.net/jflex/jflex-1.3.5.tar.gz
>-Patch0:         jflex-Makefile.patch
>-Patch1:         jflex-CharSet_java.patch
>-Patch2:         jflex-StateSet_java.patch
>+Source0:        http://jflex.de/%{name}-%{version}.tar.gz
> BuildRequires:  jpackage-utils >= 0:1.5
> BuildRequires:  make
> BuildRequires:  java-devel
>@@ -69,18 +66,17 @@
> %{summary}.
> 
> %prep
>-%setup -q -n JFlex
>+%setup -q
> for j in $(find . -name "*.jar"); do mv $j $j.no; done
> find . -name "*.class" -exec rm {} \;
> 
> %{__sed} -i 's/\r//' COPYRIGHT
>-%patch0 -b .sav
>-%patch1 -b .sav
>-%patch2 -b .sav
>+
> %build
> 
> pushd src
>-make all javadoc
>+CLASSPATH=%{_javadir}/junit.jar:%{_javadir}/jflex.jar:%{_javadir}/java_cup.jar ant jar
>+javadoc -sourcepath . -d ../api JFlex
> popd
> 
> %install
>@@ -119,6 +115,9 @@
> # -----------------------------------------------------------------------------
> 
> %changelog
>+* Mon Feb 18 2008 Lubomir Kundrak <lkundrak@redhat.com> - 0:1.4.1-2jpp.1
>+- Naive attempt to update to newer version
>+
> * Mon Apr 02 2007 Matt Wringe <mwringe@redhat.com> - 0:1.3.5-2jpp.2
> - Add patches jflex-CharSet_java.patch and jflex-StateSet_java.patch
>   to allow building with the new gcj
>diff -Nur jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex-StateSet_java.patch jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex-StateSet_java.patch
>--- jflex-1.3.5-2jpp.2.fc9.src.rpm/jflex-StateSet_java.patch	2008-02-18 10:18:09.000000000 +0100
>+++ jflex-1.4.1-2jpp.1.fc8.src.rpm/jflex-StateSet_java.patch	1970-01-01 01:00:00.000000000 +0100
>@@ -1,21 +0,0 @@
>---- ./src/JFlex/StateSet.java.orig	2007-04-02 11:04:11.000000000 -0400
>-+++ ./src/JFlex/StateSet.java	2007-04-02 11:04:38.000000000 -0400
>-@@ -276,14 +276,14 @@
>- 
>-   
>-   public String toString() {
>--    StateSetEnumerator enum = states();
>-+    StateSetEnumerator enumer = states();
>- 
>-     StringBuffer result = new StringBuffer("{");
>- 
>--    if ( enum.hasMoreElements() ) result.append(""+enum.nextElement());
>-+    if ( enumer.hasMoreElements() ) result.append(""+enumer.nextElement());
>- 
>--    while ( enum.hasMoreElements() ) {
>--      int i = enum.nextElement();
>-+    while ( enumer.hasMoreElements() ) {
>-+      int i = enumer.nextElement();
>-       result.append( ", "+i);
>-     }
>-

Actions: View | Diff

Attachments on bug 433272: 295148