commit jflex for openSUSE:Factory
Hello community,
here is the log from the commit of package jflex for openSUSE:Factory checked
in at 2017-10-06 10:55:19
Comparing /work/SRC/openSUSE:Factory/jflex (Old)
and /work/SRC/openSUSE:Factory/.jflex.new (New)
Package is "jflex"
Fri Oct 6 10:55:19 2017 rev:19 rq:531061 version:1.4.3
Changes:
--- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes2013-12-03
09:06:48.0 +0100
+++ /work/SRC/openSUSE:Factory/.jflex.new/jflex-bootstrap.changes
2017-10-06 10:55:20.466906400 +0200
@@ -2 +2 @@
-Mon Dec 2 12:44:30 UTC 2013 - mvysko...@suse.com
+Wed Oct 4 07:49:17 UTC 2017 - fst...@suse.com
@@ -4 +4,16 @@
-- conflicts with non-bootstrap variant
+- Removed a jflex-lex-scan.patch again, so that bot is happy
+
+---
+Tue Oct 3 17:31:18 UTC 2017 - fst...@suse.com
+
+- Don't BuildRequire java-1_5_0-gcj-compat-devel, since it will be
+ soon gone; BuildRequire java-devel
+- Build with java source and target level 1.6 to allow building
+ with jdk9
+- Sync the bootstrap and non-bootstrap spec files using the
+ jpackage-bootstrap-prepare.sh script and clean spec file
+
+---
+Mon Dec 2 12:44:19 UTC 2013 - mvysko...@suse.com
+
+- conflict the non-bootstrap variant with the bootstrap variant
--- /work/SRC/openSUSE:Factory/jflex/jflex.changes 2013-12-03
09:06:48.0 +0100
+++ /work/SRC/openSUSE:Factory/.jflex.new/jflex.changes 2017-10-06
10:55:20.502900959 +0200
@@ -1,0 +2,15 @@
+Wed Oct 4 07:49:17 UTC 2017 - fst...@suse.com
+
+- Removed a jflex-lex-scan.patch again, so that bot is happy
+
+---
+Tue Oct 3 17:31:18 UTC 2017 - fst...@suse.com
+
+- Don't BuildRequire java-1_5_0-gcj-compat-devel, since it will be
+ soon gone; BuildRequire java-devel
+- Build with java source and target level 1.6 to allow building
+ with jdk9
+- Sync the bootstrap and non-bootstrap spec files using the
+ jpackage-bootstrap-prepare.sh script and clean spec file
+
+---
@@ -4 +19 @@
-- conflicts with bootstrap variant
+- conflict the non-bootstrap variant with the bootstrap variant
Old:
jflex-lex-scan.patch
Other differences:
--
++ jflex-bootstrap.spec ++
--- /var/tmp/diff_new_pack.XQNvjb/_old 2017-10-06 10:55:21.314778245 +0200
+++ /var/tmp/diff_new_pack.XQNvjb/_new 2017-10-06 10:55:21.314778245 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jflex-bootstrap
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,13 +20,9 @@
%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
%define bcond_with()%{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-
# WARNING: please do not edit this auto generated spec file. Use the
jflex.spec! #
%define with_bootstrap 1
-%bcond_withbootstrap
-
%define sectionfree
-
Name: jflex-bootstrap
# This line is not a comment, please do not remove it!
#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name})
@@ -38,22 +34,26 @@
Url:http://www.jflex.de/
Source0:http://www.jflex.de/jflex-%{version}.tar.bz2
Source1:jflex.script
+Source100: jpackage-bootstrap-prepare.sh
Patch0: jflex-javac-no-target.patch
Patch1: jflex-no-cup-no-jflex.patch
Patch2: jflex-classpath.patch
-Patch3: jflex-lex-scan.patch
Patch4: jflex-byaccj-utl.patch
-Requires: java_cup
-Requires: javapackages-tools
+#PATCH-FIX-OPENSUSE: make AllTests.main empty, code was not compatible with
junit 4
+Patch5: jflex-junit4.patch
BuildRequires: ant
BuildRequires: java-cup-bootstrap
+BuildRequires: java-devel
+Requires: java_cup
+Requires: javapackages-tools
+BuildArch: noarch
%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
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
JFlex is a lexical analyzer generator for Java written in Java. It is
@@ -71,7 +71,6 @@
* JLex compatibility
%if %without bootstrap
-
%package doc
Summary:Documentation and examples for %{name}
Group:
commit jflex for openSUSE:Factory
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.changes2013-09-11
13:38:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new/jflex-bootstrap.changes
2013-12-03 09:06:48.0 +0100
@@ -2 +2,12 @@
-Mon Sep 9 11:32:01 UTC 2013 - tchva...@suse.com
+Mon Dec 2 12:44:30 UTC 2013 - mvysko...@suse.com
+
+- conflicts with non-bootstrap variant
+
+---
+Thu Nov 14 12:31:24 UTC 2013 - mvysko...@suse.com
+
+- Fix build with junit 4
+ * jflex-junit4.patch
+
+---
+Mon Sep 9 11:06:00 UTC 2013 - tchva...@suse.com
--- /work/SRC/openSUSE:Factory/jflex/jflex.changes 2013-09-11
13:38:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new/jflex.changes 2013-12-03
09:06:48.0 +0100
@@ -1,0 +2,11 @@
+Mon Dec 2 12:44:19 UTC 2013 - mvysko...@suse.com
+
+- conflicts with bootstrap variant
+
+---
+Thu Nov 14 12:31:24 UTC 2013 - mvysko...@suse.com
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.USoJC7/_new 2013-12-03 09:06:49.0 +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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jflex for openSUSE:Factory
Hello community,
here is the log from the commit of package jflex for openSUSE:Factory checked
in at 2013-09-11 13:38:36
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.changes2011-09-23
02:04:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new/jflex-bootstrap.changes
2013-09-11 13:38:37.0 +0200
@@ -1,0 +2,22 @@
+Mon Sep 9 11:32:01 UTC 2013 - tchva...@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+---
+Mon Aug 26 12:18:15 UTC 2013 - mvysko...@suse.com
+
+- don't build tests when bootstrapping
+- properly synchronized both spec files
+- drop antlr-bootstrap dependency, it's pointless withouth javadoc
+
+---
+Fri Aug 23 09:06:21 UTC 2013 - mvysko...@suse.com
+
+- don't build javadoc
+
+---
+Thu Feb 17 00:59:58 CET 2011 - mvysko...@suse.cz
+
+- fix build with antlr-bootstrap
+
+---
--- /work/SRC/openSUSE:Factory/jflex/jflex.changes 2011-09-23
02:04:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new/jflex.changes 2013-09-11
13:38:37.0 +0200
@@ -1,0 +2,17 @@
+Mon Sep 9 11:06:00 UTC 2013 - tchva...@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+---
+Mon Aug 26 12:18:15 UTC 2013 - mvysko...@suse.com
+
+- don't build tests when bootstrapping
+- properly synchronized both spec files
+- drop antlr-bootstrap dependency, it's pointless withouth javadoc
+
+---
+Fri Aug 23 09:06:21 UTC 2013 - mvysko...@suse.com
+
+- don't build javadoc
+
+---
Other differences:
--
++ jflex-bootstrap.spec ++
--- /var/tmp/diff_new_pack.xUfUW5/_old 2013-09-11 13:38:37.0 +0200
+++ /var/tmp/diff_new_pack.xUfUW5/_new 2013-09-11 13:38:37.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jflex-bootstrap
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,7 +31,7 @@
# This line is not a comment, please do not remove it!
#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name})
Version:1.4.3
-Release:10
+Release:0
Summary:Lexical Analyzer Generator for Java
License:GPL-2.0+
Group: Development/Libraries/Java
@@ -44,14 +44,14 @@
Patch3: jflex-lex-scan.patch
Patch4: jflex-byaccj-utl.patch
Requires: java_cup
-Requires: jpackage-utils
+Requires: javapackages-tools
BuildRequires: ant
BuildRequires: java-cup-bootstrap
%if %without bootstrap
BuildRequires: jflex-bootstrap
+BuildRequires: junit
%endif
BuildRequires: java-1_5_0-gcj-compat-devel
-BuildRequires: junit
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -72,32 +72,9 @@
%if %without bootstrap
-%package javadoc
-License:GPL-2.0+
-Group: Development/Libraries/Java
-Summary:Javadoc for %{name}
-
-%description javadoc
-JFlex is a lexical analyzer generator for Java written in Java. It is
-also a rewrite of the very useful tool JLex which was developed by
-Elliot Berk at Princeton University. As Vern Paxson states for his C/C++
-tool flex: they do not share any code though.
-
-Design goals The main design goals of JFlex are:
-
-* Full unicode support
-* Fast generated scanners
-* Fast scanner generation
-* Convenient specification syntax
-* Platform independence
-* JLex compatibility
-
-This package contains javadoc for %{name}.
-
%package doc
-License:GPL-2.0+
-Group: Development/Libraries/Java
Summary:Documentation and examples for %{name}
+Group: Development/Libraries/Java
%description doc
JFlex is a lexical analyzer generator for Java written in Java. It is
@@ -131,9 +108,13 @@
popd
%endif
%patch0 -p1
+
%if %with bootstrap
%patch1 -p1
-%else
+
+echo `pwd`
+rm -rf src/JFlex/tests
+%else # with bootstrap
# You must use Re jflex.spec and have a java-cup and jflex installed
%patch2 -p1
#%patch3 -p1
@@ -143,16 +124,13 @@
%build
pushd src
%if %without bootstrap
-export
commit jflex for openSUSE:Factory
Hello community,
here is the log from the commit of package jflex for openSUSE:Factory checked
in at 2011-12-06 18:20:39
Comparing /work/SRC/openSUSE:Factory/jflex (Old)
and /work/SRC/openSUSE:Factory/.jflex.new (New)
Package is "jflex", Maintainer is "bnc-team-j...@forge.provo.novell.com"
Changes:
jflex.changes: same change
Other differences:
--
++ jflex-bootstrap.spec ++
--- /var/tmp/diff_new_pack.TqdrM8/_old 2011-12-06 18:35:54.0 +0100
+++ /var/tmp/diff_new_pack.TqdrM8/_new 2011-12-06 18:35:54.0 +0100
@@ -33,7 +33,7 @@
Version:1.4.3
Release:10
Summary:Lexical Analyzer Generator for Java
-License:GPLv2+
+License:GPL-2.0+
Group: Development/Libraries/Java
Url:http://www.jflex.de/
Source0:http://www.jflex.de/jflex-%{version}.tar.bz2
@@ -73,7 +73,7 @@
%if %without bootstrap
%package javadoc
-License:GPLv2+
+License:GPL-2.0+
Group: Development/Libraries/Java
Summary:Javadoc for %{name}
@@ -95,7 +95,7 @@
This package contains javadoc for %{name}.
%package doc
-License:GPLv2+
+License:GPL-2.0+
Group: Development/Libraries/Java
Summary:Documentation and examples for %{name}
++ jflex.spec ++
--- /var/tmp/diff_new_pack.TqdrM8/_old 2011-12-06 18:35:54.0 +0100
+++ /var/tmp/diff_new_pack.TqdrM8/_new 2011-12-06 18:35:54.0 +0100
@@ -32,7 +32,7 @@
Version:1.4.3
Release:13
Summary:Lexical Analyzer Generator for Java
-License:GPLv2+
+License:GPL-2.0+
Group: Development/Libraries/Java
Url:http://www.jflex.de/
Source0:http://www.jflex.de/jflex-%{version}.tar.bz2
@@ -73,7 +73,7 @@
%if %without bootstrap
%package javadoc
-License:GPLv2+
+License:GPL-2.0+
Group: Development/Libraries/Java
Summary:Javadoc for %{name}
@@ -95,7 +95,7 @@
This package contains javadoc for %{name}.
%package doc
-License:GPLv2+
+License:GPL-2.0+
Group: Development/Libraries/Java
Summary:Documentation and examples for %{name}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
