From 405304cbd2085e75c07813130b5b53e230b3308746748a7b9a09482b68c4dc99 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 4 Oct 2017 05:38:01 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jflex?expand=0&rev=18

---
 jflex-bootstrap.changes | 10 ++++++++++
 jflex-bootstrap.spec    |  1 +
 jflex-lex-scan.patch    | 12 ------------
 jflex.spec              |  1 +
 4 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 jflex-lex-scan.patch

diff --git a/jflex-bootstrap.changes b/jflex-bootstrap.changes
index ee34e24..f4ec7dc 100644
--- a/jflex-bootstrap.changes
+++ b/jflex-bootstrap.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Oct  3 17:31:18 UTC 2017 - fstrba@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 - mvyskocil@suse.com
 
diff --git a/jflex-bootstrap.spec b/jflex-bootstrap.spec
index 8080ac8..b692222 100644
--- a/jflex-bootstrap.spec
+++ b/jflex-bootstrap.spec
@@ -34,6 +34,7 @@ Group:          Development/Libraries/Java
 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
diff --git a/jflex-lex-scan.patch b/jflex-lex-scan.patch
deleted file mode 100644
index aec411f..0000000
--- a/jflex-lex-scan.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- jflex-1.4.3/src/JFlex/LexScan.java
-+++ jflex-1.4.3/src/JFlex/LexScan.java
-@@ -1642,9 +1642,6 @@
-     }
-   }
- 
--  /** denotes if the user-EOF-code has already been executed */
--  private boolean zzEOFDone;
--
-   /* user code: */
-   int balance = 0;
-   int commentbalance = 0;
diff --git a/jflex.spec b/jflex.spec
index 95a4028..edc5e6b 100644
--- a/jflex.spec
+++ b/jflex.spec
@@ -33,6 +33,7 @@ Group:          Development/Libraries/Java
 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