Hello community, here is the log from the commit of package jflex for openSUSE:Factory checked in at 2013-12-03 09:06:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jflex (Old) and /work/SRC/openSUSE:Factory/.jflex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jflex" Changes: -------- --- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes 2013-09-11 13:38:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jflex.new/jflex-bootstrap.changes 2013-12-03 09:06:48.000000000 +0100 @@ -2 +2,12 @@ -Mon Sep 9 11:32:01 UTC 2013 - [email protected] +Mon Dec 2 12:44:30 UTC 2013 - [email protected] + +- conflicts with non-bootstrap variant + +------------------------------------------------------------------- +Thu Nov 14 12:31:24 UTC 2013 - [email protected] + +- Fix build with junit 4 + * jflex-junit4.patch + +------------------------------------------------------------------- +Mon Sep 9 11:06:00 UTC 2013 - [email protected] --- /work/SRC/openSUSE:Factory/jflex/jflex.changes 2013-09-11 13:38:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jflex.new/jflex.changes 2013-12-03 09:06:48.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Dec 2 12:44:19 UTC 2013 - [email protected] + +- conflicts with bootstrap variant + +------------------------------------------------------------------- +Thu Nov 14 12:31:24 UTC 2013 - [email protected] + +- Fix build with junit 4 + * jflex-junit4.patch + +------------------------------------------------------------------- New: ---- jflex-junit4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jflex.spec ++++++ --- /var/tmp/diff_new_pack.USoJC7/_old 2013-12-03 09:06:49.000000000 +0100 +++ /var/tmp/diff_new_pack.USoJC7/_new 2013-12-03 09:06:49.000000000 +0100 @@ -42,6 +42,8 @@ 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 @@ %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 @@ #%patch3 -p1 %patch4 -p1 %endif +%patch5 -p1 %build pushd src ++++++ jflex-junit4.patch ++++++ 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() { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
