rpm/jflex
SHA256
1
0
Fork 0
forked from pool/jflex
Code Pull Requests Activity

Accepting request 209151 from Java:packages

Browse Source 
- conflicts with non-bootstrap variant

- Fix build with junit 4
  * jflex-junit4.patch

- conflicts with bootstrap variant

- Fix build with junit 4
  * jflex-junit4.patch

OBS-URL: https://build.opensuse.org/request/show/209151
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jflex?expand=0&rev=17
This commit is contained in:
Stephan Kulow 2013-12-03 08:06:47 +00:00 committed by Git OBS Bridge
commit 63a56737b5
4 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jflex-bootstrap.changes
View File

@ -1,5 +1,16 @@
-------------------------------------------------------------------
Mon Sep 9 11:32:01 UTC 2013 - tchvatal@suse.com
Mon Dec 2 12:44:30 UTC 2013 - mvyskocil@suse.com
- conflicts with non-bootstrap variant
-------------------------------------------------------------------
Thu Nov 14 12:31:24 UTC 2013 - mvyskocil@suse.com
- Fix build with junit 4
* jflex-junit4.patch
-------------------------------------------------------------------
Mon Sep 9 11:06:00 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools

13
jflex-junit4.patch Normal file
View File

@ -0,0 +1,13 @@
Index: jflex-1.4.3/src/JFlex/tests/AllTests.java
===================================================================
--- jflex-1.4.3.orig/src/JFlex/tests/AllTests.java
+++ jflex-1.4.3/src/JFlex/tests/AllTests.java
@@ -32,7 +32,7 @@ import junit.framework.TestSuite;
public class AllTests {
public static void main(String[] args) {
- junit.textui.TestRunner.run(AllTests.class);
+ //junit.textui.TestRunner.run(AllTests.class);
}
public static Test suite() {

11
jflex.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Dec 2 12:44:19 UTC 2013 - mvyskocil@suse.com
- conflicts with bootstrap variant
-------------------------------------------------------------------
Thu Nov 14 12:31:24 UTC 2013 - mvyskocil@suse.com
- Fix build with junit 4
* jflex-junit4.patch
-------------------------------------------------------------------
Mon Sep 9 11:06:00 UTC 2013 - tchvatal@suse.com

6
jflex.spec
View File

@ -42,6 +42,8 @@ Patch1: jflex-no-cup-no-jflex.patch
Patch2: jflex-classpath.patch
Patch3: jflex-lex-scan.patch
Patch4: jflex-byaccj-utl.patch
#PATCH-FIX-OPENSUSE: make AllTests.main empty, code was not compatible with junit 4
Patch5: jflex-junit4.patch
Requires: java_cup
Requires: javapackages-tools
BuildRequires: ant
@ -49,6 +51,9 @@ BuildRequires: java-cup-bootstrap
%if %without bootstrap
BuildRequires: jflex-bootstrap
BuildRequires: junit
Conflicts: jflex-bootstrap
%else
Conflicts: jflex
%endif
BuildRequires: java-1_5_0-gcj-compat-devel
BuildArch: noarch
@ -119,6 +124,7 @@ rm -rf src/JFlex/tests
#%patch3 -p1
%patch4 -p1
%endif
%patch5 -p1
%build
pushd src