From 0af37e9612331be5c8fd4eb204734a7e6b1e664008e26e1126194001615f680f Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 9 Mar 2022 08:58:04 +0000
Subject: [PATCH 1/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/java-cup?expand=0&rev=24

---
 java-cup-bootstrap.changes |  7 +++++++
 java-cup-bootstrap.spec    | 15 ++++++++++++---
 java-cup.changes           |  7 +++++++
 java-cup.spec              | 15 ++++++++++++---
 java_cup_v9e.tar.gz        |  3 +++
 5 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 java_cup_v9e.tar.gz

diff --git a/java-cup-bootstrap.changes b/java-cup-bootstrap.changes
index e8b67d5..80e74d8 100644
--- a/java-cup-bootstrap.changes
+++ b/java-cup-bootstrap.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  9 08:52:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build and package also the previous API version 0.9e, since the
+  jump from 0.9 to 0.10 is completely API incompatible and the
+  build does not require any additional dependencies
+
 -------------------------------------------------------------------
 Fri Jan 14 06:59:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-cup-bootstrap.spec b/java-cup-bootstrap.spec
index f775d90..b56fba1 100644
--- a/java-cup-bootstrap.spec
+++ b/java-cup-bootstrap.spec
@@ -22,6 +22,8 @@
 %define real_name   java-cup
 %define git_hash d69c832
 %define git_date 20210814
+%define compat_name java_cup
+%define compat_version 9e
 %bcond_with                bootstrap
 Name:           java-cup-bootstrap
 Version:        0.11
@@ -32,6 +34,7 @@ Group:          Development/Libraries/Java
 URL:            http://www2.cs.tum.edu/projects/cup/
 Source0:        %{real_name}-%{git_hash}.tar.xz
 Source1:        %{real_name}-generated-files.tar.xz
+Source2:        https://www.cs.princeton.edu/~appel/modern/java/CUP/%{compat_name}_v%{compat_version}.tar.gz
 Source100:      java-cup-nogit.patch.in
 Patch0:         java-cup-no-classpath-in-manifest.patch
 Patch1:         java-cup-java8.patch
@@ -93,6 +96,7 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: *
 
 %prep
 %setup -q -n %{real_name}-%{git_hash}
+%setup -q -T -D -a 2 -n %{real_name}-%{git_hash}/compat
 cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_date}#g' | patch -p1 -u -l
 %patch0 -p1
 %patch1 -p1
@@ -104,6 +108,7 @@ cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_da
 %endif
 find . -name '*.jar' -print -delete
 mkdir -p target/classes
+mkdir -p compat/classes
 
 %build
 %if %{with bootstrap}
@@ -113,21 +118,25 @@ export CLASSPATH=$(build-classpath java-cup jflex)
 %endif
 export OPT_JAR_LIST=:
 ant
+pushd compat
+javac -d classes -source 1.7 -target 1.7 %{compat_name}/runtime/*.java %{compat_name}/*.java
+jar -cf %{compat_name}.jar -c classes .
+popd
 
 %install
 # jar
 mkdir -p %{buildroot}%{_javadir}
 cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
 cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
+cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}.jar
 
 %if %{without bootstrap}
 # maven data
 %add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
 %add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
+%add_maven_depmap %{compat_name}:${compat_name}:%{compat_version} %{compat_name}.jar
 %endif
 
-# compatibility symlinks
-(cd %{buildroot}%{_javadir} && ln -s %{real_name}.jar java_cup.jar && ln -s %{real_name}-runtime.jar java_cup-runtime.jar)
 mkdir -p %{buildroot}%{_bindir}
 
 %jpackage_script java_cup.Main "" "" %{real_name}:%{real_name}-runtime %{real_name} true
@@ -135,6 +144,7 @@ mkdir -p %{buildroot}%{_bindir}
 %if %{with bootstrap}
 %files
 %{_javadir}/%{real_name}*.jar
+%{_javadir}/%{compat_name}.jar
 %else
 
 %files -f .mfiles
@@ -142,7 +152,6 @@ mkdir -p %{buildroot}%{_bindir}
 %license licence.txt
 %doc changelog.txt
 %attr(0755,root,root) %{_bindir}/%{real_name}
-%{_javadir}/java_cup*.jar
 
 %if %{without bootstrap}
 %files manual
diff --git a/java-cup.changes b/java-cup.changes
index e8b67d5..80e74d8 100644
--- a/java-cup.changes
+++ b/java-cup.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  9 08:52:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build and package also the previous API version 0.9e, since the
+  jump from 0.9 to 0.10 is completely API incompatible and the
+  build does not require any additional dependencies
+
 -------------------------------------------------------------------
 Fri Jan 14 06:59:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-cup.spec b/java-cup.spec
index ca8ef47..1bc1104 100644
--- a/java-cup.spec
+++ b/java-cup.spec
@@ -21,6 +21,8 @@
 %define real_name   java-cup
 %define git_hash d69c832
 %define git_date 20210814
+%define compat_name java_cup
+%define compat_version 9e
 %bcond_with                bootstrap
 Name:           java-cup
 Version:        0.11
@@ -31,6 +33,7 @@ Group:          Development/Libraries/Java
 URL:            http://www2.cs.tum.edu/projects/cup/
 Source0:        %{real_name}-%{git_hash}.tar.xz
 Source1:        %{real_name}-generated-files.tar.xz
+Source2:        https://www.cs.princeton.edu/~appel/modern/java/CUP/%{compat_name}_v%{compat_version}.tar.gz
 Source100:      java-cup-nogit.patch.in
 Patch0:         java-cup-no-classpath-in-manifest.patch
 Patch1:         java-cup-java8.patch
@@ -92,6 +95,7 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: *
 
 %prep
 %setup -q -n %{real_name}-%{git_hash}
+%setup -q -T -D -a 2 -n %{real_name}-%{git_hash}/compat
 cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_date}#g' | patch -p1 -u -l
 %patch0 -p1
 %patch1 -p1
@@ -103,6 +107,7 @@ cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_da
 %endif
 find . -name '*.jar' -print -delete
 mkdir -p target/classes
+mkdir -p compat/classes
 
 %build
 %if %{with bootstrap}
@@ -112,21 +117,25 @@ export CLASSPATH=$(build-classpath java-cup jflex)
 %endif
 export OPT_JAR_LIST=:
 ant
+pushd compat
+javac -d classes -source 1.7 -target 1.7 %{compat_name}/runtime/*.java %{compat_name}/*.java
+jar -cf %{compat_name}.jar -c classes .
+popd
 
 %install
 # jar
 mkdir -p %{buildroot}%{_javadir}
 cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
 cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
+cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}.jar
 
 %if %{without bootstrap}
 # maven data
 %add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
 %add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
+%add_maven_depmap %{compat_name}:${compat_name}:%{compat_version} %{compat_name}.jar
 %endif
 
-# compatibility symlinks
-(cd %{buildroot}%{_javadir} && ln -s %{real_name}.jar java_cup.jar && ln -s %{real_name}-runtime.jar java_cup-runtime.jar)
 mkdir -p %{buildroot}%{_bindir}
 
 %jpackage_script java_cup.Main "" "" %{real_name}:%{real_name}-runtime %{real_name} true
@@ -134,6 +143,7 @@ mkdir -p %{buildroot}%{_bindir}
 %if %{with bootstrap}
 %files
 %{_javadir}/%{real_name}*.jar
+%{_javadir}/%{compat_name}.jar
 %else
 
 %files -f .mfiles
@@ -141,7 +151,6 @@ mkdir -p %{buildroot}%{_bindir}
 %license licence.txt
 %doc changelog.txt
 %attr(0755,root,root) %{_bindir}/%{real_name}
-%{_javadir}/java_cup*.jar
 
 %if %{without bootstrap}
 %files manual
diff --git a/java_cup_v9e.tar.gz b/java_cup_v9e.tar.gz
new file mode 100644
index 0000000..3c2b134
--- /dev/null
+++ b/java_cup_v9e.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be176e9356ff1695c64d08277ba31cea14ea4f617b93787502cf93c6fd35625f
+size 93657

From 551e17e5fb2449408b1ee7bcf10d8b8ce5da74dc8a47320c801670fce9972d2d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 9 Mar 2022 09:11:09 +0000
Subject: [PATCH 2/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/java-cup?expand=0&rev=25

---
 java-cup-bootstrap.spec | 4 ++--
 java-cup.spec           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-cup-bootstrap.spec b/java-cup-bootstrap.spec
index b56fba1..1436d7f 100644
--- a/java-cup-bootstrap.spec
+++ b/java-cup-bootstrap.spec
@@ -96,7 +96,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: *
 
 %prep
 %setup -q -n %{real_name}-%{git_hash}
-%setup -q -T -D -a 2 -n %{real_name}-%{git_hash}/compat
 cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_date}#g' | patch -p1 -u -l
 %patch0 -p1
 %patch1 -p1
@@ -109,6 +108,7 @@ cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_da
 find . -name '*.jar' -print -delete
 mkdir -p target/classes
 mkdir -p compat/classes
+tar xf %{SOURCE2} -C compat
 
 %build
 %if %{with bootstrap}
@@ -120,7 +120,7 @@ export OPT_JAR_LIST=:
 ant
 pushd compat
 javac -d classes -source 1.7 -target 1.7 %{compat_name}/runtime/*.java %{compat_name}/*.java
-jar -cf %{compat_name}.jar -c classes .
+jar -cf %{compat_name}.jar -C classes .
 popd
 
 %install
diff --git a/java-cup.spec b/java-cup.spec
index 1bc1104..5d435a9 100644
--- a/java-cup.spec
+++ b/java-cup.spec
@@ -95,7 +95,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: *
 
 %prep
 %setup -q -n %{real_name}-%{git_hash}
-%setup -q -T -D -a 2 -n %{real_name}-%{git_hash}/compat
 cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_date}#g' | patch -p1 -u -l
 %patch0 -p1
 %patch1 -p1
@@ -108,6 +107,7 @@ cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_da
 find . -name '*.jar' -print -delete
 mkdir -p target/classes
 mkdir -p compat/classes
+tar xf %{SOURCE2} -C compat
 
 %build
 %if %{with bootstrap}
@@ -119,7 +119,7 @@ export OPT_JAR_LIST=:
 ant
 pushd compat
 javac -d classes -source 1.7 -target 1.7 %{compat_name}/runtime/*.java %{compat_name}/*.java
-jar -cf %{compat_name}.jar -c classes .
+jar -cf %{compat_name}.jar -C classes .
 popd
 
 %install

From 9fe4923d457a1d04c528c0d4245bc9830b72ee74f71c504f8179f39c769dced2 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 9 Mar 2022 09:23:35 +0000
Subject: [PATCH 3/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/java-cup?expand=0&rev=26

---
 java-cup-bootstrap.spec | 11 +++++++----
 java-cup.spec           | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/java-cup-bootstrap.spec b/java-cup-bootstrap.spec
index 1436d7f..fb92784 100644
--- a/java-cup-bootstrap.spec
+++ b/java-cup-bootstrap.spec
@@ -125,18 +125,20 @@ popd
 
 %install
 # jar
-mkdir -p %{buildroot}%{_javadir}
+mkdir -p %{buildroot}%{_javadir}/%{compat_name}_compat
 cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
 cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
-cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}.jar
+cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}_compat/%{compat_name}.jar
 
 %if %{without bootstrap}
 # maven data
 %add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
 %add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
-%add_maven_depmap %{compat_name}:${compat_name}:%{compat_version} %{compat_name}.jar
+%add_maven_depmap %{compat_name}:${compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
 %endif
 
+# compatibility symlinks
+(cd %{buildroot}%{_javadir} && ln -s %{real_name}.jar java_cup.jar && ln -s %{real_name}-runtime.jar java_cup-runtime.jar)
 mkdir -p %{buildroot}%{_bindir}
 
 %jpackage_script java_cup.Main "" "" %{real_name}:%{real_name}-runtime %{real_name} true
@@ -144,7 +146,7 @@ mkdir -p %{buildroot}%{_bindir}
 %if %{with bootstrap}
 %files
 %{_javadir}/%{real_name}*.jar
-%{_javadir}/%{compat_name}.jar
+%{_javadir}/%{compat_name}_compat
 %else
 
 %files -f .mfiles
@@ -152,6 +154,7 @@ mkdir -p %{buildroot}%{_bindir}
 %license licence.txt
 %doc changelog.txt
 %attr(0755,root,root) %{_bindir}/%{real_name}
+%{_javadir}/java_cup*.jar
 
 %if %{without bootstrap}
 %files manual
diff --git a/java-cup.spec b/java-cup.spec
index 5d435a9..961a227 100644
--- a/java-cup.spec
+++ b/java-cup.spec
@@ -124,18 +124,20 @@ popd
 
 %install
 # jar
-mkdir -p %{buildroot}%{_javadir}
+mkdir -p %{buildroot}%{_javadir}/%{compat_name}_compat
 cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
 cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
-cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}.jar
+cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}_compat/%{compat_name}.jar
 
 %if %{without bootstrap}
 # maven data
 %add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
 %add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
-%add_maven_depmap %{compat_name}:${compat_name}:%{compat_version} %{compat_name}.jar
+%add_maven_depmap %{compat_name}:${compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
 %endif
 
+# compatibility symlinks
+(cd %{buildroot}%{_javadir} && ln -s %{real_name}.jar java_cup.jar && ln -s %{real_name}-runtime.jar java_cup-runtime.jar)
 mkdir -p %{buildroot}%{_bindir}
 
 %jpackage_script java_cup.Main "" "" %{real_name}:%{real_name}-runtime %{real_name} true
@@ -143,7 +145,7 @@ mkdir -p %{buildroot}%{_bindir}
 %if %{with bootstrap}
 %files
 %{_javadir}/%{real_name}*.jar
-%{_javadir}/%{compat_name}.jar
+%{_javadir}/%{compat_name}_compat
 %else
 
 %files -f .mfiles
@@ -151,6 +153,7 @@ mkdir -p %{buildroot}%{_bindir}
 %license licence.txt
 %doc changelog.txt
 %attr(0755,root,root) %{_bindir}/%{real_name}
+%{_javadir}/java_cup*.jar
 
 %if %{without bootstrap}
 %files manual

From cca27232000cdcace1c2c1d53f4b51742ea57b78f8361c140716d3c0ea5783fa Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 9 Mar 2022 09:33:04 +0000
Subject: [PATCH 4/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/java-cup?expand=0&rev=27

---
 java-cup-classpath.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-cup-classpath.patch b/java-cup-classpath.patch
index 1e5c518..339aa42 100644
--- a/java-cup-classpath.patch
+++ b/java-cup-classpath.patch
@@ -6,7 +6,7 @@
  
 -  <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="${bin}/java-cup-11.jar" />
 -  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar" />
-+  <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="/usr/share/java/java_cup.jar" />
++  <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="/usr/share/java/java-cup.jar" />
 +  <taskdef name="jflex" classname="jflex.anttask.JFlexTask" classpath="/usr/share/java/jflex.jar" />
  
    <target name="cup" depends="init">

From 3b397d0c1d45660d6377402f4e8012d66a893e7a471da77898341ab430398eb6 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 9 Mar 2022 10:00:05 +0000
Subject: [PATCH 5/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/java-cup?expand=0&rev=28

---
 java-cup-bootstrap.spec | 2 +-
 java-cup.spec           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-cup-bootstrap.spec b/java-cup-bootstrap.spec
index fb92784..e1ad738 100644
--- a/java-cup-bootstrap.spec
+++ b/java-cup-bootstrap.spec
@@ -134,7 +134,7 @@ cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}_compat/%{
 # maven data
 %add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
 %add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
-%add_maven_depmap %{compat_name}:${compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
+%add_maven_depmap %{compat_name}:%{compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
 %endif
 
 # compatibility symlinks
diff --git a/java-cup.spec b/java-cup.spec
index 961a227..f4431e5 100644
--- a/java-cup.spec
+++ b/java-cup.spec
@@ -133,7 +133,7 @@ cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}_compat/%{
 # maven data
 %add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
 %add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
-%add_maven_depmap %{compat_name}:${compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
+%add_maven_depmap %{compat_name}:%{compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
 %endif
 
 # compatibility symlinks

From 7633f33dc28464abd5aef2ddc947599598635db4ad696d18bc1782abddffb30e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 14 Mar 2022 13:17:30 +0000
Subject: [PATCH 6/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/java-cup?expand=0&rev=29

---
 java-cup-bootstrap.changes      |  9 +++++----
 java-cup-bootstrap.spec         | 14 +-------------
 java-cup-generated-files.tar.xz |  4 ++--
 java-cup.changes                |  9 +++++----
 java-cup.spec                   | 14 +-------------
 java_cup_v9e.tar.gz             |  3 ---
 6 files changed, 14 insertions(+), 39 deletions(-)
 delete mode 100644 java_cup_v9e.tar.gz

diff --git a/java-cup-bootstrap.changes b/java-cup-bootstrap.changes
index 80e74d8..9648ad8 100644
--- a/java-cup-bootstrap.changes
+++ b/java-cup-bootstrap.changes
@@ -1,9 +1,10 @@
 -------------------------------------------------------------------
-Wed Mar  9 08:52:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+Mon Mar 14 13:15:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
-- Build and package also the previous API version 0.9e, since the
-  jump from 0.9 to 0.10 is completely API incompatible and the
-  build does not require any additional dependencies
+- Modified patch:
+  * java-cup-classpath.patch
+    + use the java-cup name instead of the java_cup one
+- Regenerate the generated files with newer flex
 
 -------------------------------------------------------------------
 Fri Jan 14 06:59:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
diff --git a/java-cup-bootstrap.spec b/java-cup-bootstrap.spec
index e1ad738..f775d90 100644
--- a/java-cup-bootstrap.spec
+++ b/java-cup-bootstrap.spec
@@ -22,8 +22,6 @@
 %define real_name   java-cup
 %define git_hash d69c832
 %define git_date 20210814
-%define compat_name java_cup
-%define compat_version 9e
 %bcond_with                bootstrap
 Name:           java-cup-bootstrap
 Version:        0.11
@@ -34,7 +32,6 @@ Group:          Development/Libraries/Java
 URL:            http://www2.cs.tum.edu/projects/cup/
 Source0:        %{real_name}-%{git_hash}.tar.xz
 Source1:        %{real_name}-generated-files.tar.xz
-Source2:        https://www.cs.princeton.edu/~appel/modern/java/CUP/%{compat_name}_v%{compat_version}.tar.gz
 Source100:      java-cup-nogit.patch.in
 Patch0:         java-cup-no-classpath-in-manifest.patch
 Patch1:         java-cup-java8.patch
@@ -107,8 +104,6 @@ cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_da
 %endif
 find . -name '*.jar' -print -delete
 mkdir -p target/classes
-mkdir -p compat/classes
-tar xf %{SOURCE2} -C compat
 
 %build
 %if %{with bootstrap}
@@ -118,23 +113,17 @@ export CLASSPATH=$(build-classpath java-cup jflex)
 %endif
 export OPT_JAR_LIST=:
 ant
-pushd compat
-javac -d classes -source 1.7 -target 1.7 %{compat_name}/runtime/*.java %{compat_name}/*.java
-jar -cf %{compat_name}.jar -C classes .
-popd
 
 %install
 # jar
-mkdir -p %{buildroot}%{_javadir}/%{compat_name}_compat
+mkdir -p %{buildroot}%{_javadir}
 cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
 cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
-cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}_compat/%{compat_name}.jar
 
 %if %{without bootstrap}
 # maven data
 %add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
 %add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
-%add_maven_depmap %{compat_name}:%{compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
 %endif
 
 # compatibility symlinks
@@ -146,7 +135,6 @@ mkdir -p %{buildroot}%{_bindir}
 %if %{with bootstrap}
 %files
 %{_javadir}/%{real_name}*.jar
-%{_javadir}/%{compat_name}_compat
 %else
 
 %files -f .mfiles
diff --git a/java-cup-generated-files.tar.xz b/java-cup-generated-files.tar.xz
index 7e97a93..02d6430 100644
--- a/java-cup-generated-files.tar.xz
+++ b/java-cup-generated-files.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c288990c111b2787c169e311c14dd581a03da84e4a9c1bf75702dbd8a1e879a9
-size 17780
+oid sha256:2e0fbaba016eaaf9abca1e4afe2225d952789fc8249183d75f3e8355707859e7
+size 19368
diff --git a/java-cup.changes b/java-cup.changes
index 80e74d8..9648ad8 100644
--- a/java-cup.changes
+++ b/java-cup.changes
@@ -1,9 +1,10 @@
 -------------------------------------------------------------------
-Wed Mar  9 08:52:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+Mon Mar 14 13:15:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
-- Build and package also the previous API version 0.9e, since the
-  jump from 0.9 to 0.10 is completely API incompatible and the
-  build does not require any additional dependencies
+- Modified patch:
+  * java-cup-classpath.patch
+    + use the java-cup name instead of the java_cup one
+- Regenerate the generated files with newer flex
 
 -------------------------------------------------------------------
 Fri Jan 14 06:59:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
diff --git a/java-cup.spec b/java-cup.spec
index f4431e5..ca8ef47 100644
--- a/java-cup.spec
+++ b/java-cup.spec
@@ -21,8 +21,6 @@
 %define real_name   java-cup
 %define git_hash d69c832
 %define git_date 20210814
-%define compat_name java_cup
-%define compat_version 9e
 %bcond_with                bootstrap
 Name:           java-cup
 Version:        0.11
@@ -33,7 +31,6 @@ Group:          Development/Libraries/Java
 URL:            http://www2.cs.tum.edu/projects/cup/
 Source0:        %{real_name}-%{git_hash}.tar.xz
 Source1:        %{real_name}-generated-files.tar.xz
-Source2:        https://www.cs.princeton.edu/~appel/modern/java/CUP/%{compat_name}_v%{compat_version}.tar.gz
 Source100:      java-cup-nogit.patch.in
 Patch0:         java-cup-no-classpath-in-manifest.patch
 Patch1:         java-cup-java8.patch
@@ -106,8 +103,6 @@ cat %{SOURCE100} | sed 's#@GIT_HASH@#%{git_hash}#g' | sed 's#@GIT_DATE@#%{git_da
 %endif
 find . -name '*.jar' -print -delete
 mkdir -p target/classes
-mkdir -p compat/classes
-tar xf %{SOURCE2} -C compat
 
 %build
 %if %{with bootstrap}
@@ -117,23 +112,17 @@ export CLASSPATH=$(build-classpath java-cup jflex)
 %endif
 export OPT_JAR_LIST=:
 ant
-pushd compat
-javac -d classes -source 1.7 -target 1.7 %{compat_name}/runtime/*.java %{compat_name}/*.java
-jar -cf %{compat_name}.jar -C classes .
-popd
 
 %install
 # jar
-mkdir -p %{buildroot}%{_javadir}/%{compat_name}_compat
+mkdir -p %{buildroot}%{_javadir}
 cp -a target/dist/%{real_name}-%{cvs_version}.jar %{buildroot}%{_javadir}/%{real_name}.jar
 cp -a target/dist/%{real_name}-%{cvs_version}-runtime.jar %{buildroot}%{_javadir}/%{real_name}-runtime.jar
-cp -a compat/%{compat_name}.jar %{buildroot}%{_javadir}/%{compat_name}_compat/%{compat_name}.jar
 
 %if %{without bootstrap}
 # maven data
 %add_maven_depmap com.github.vbmacher:%{real_name}:%{cvs_version}-%{git_date} %{real_name}.jar
 %add_maven_depmap com.github.vbmacher:%{real_name}-runtime:%{cvs_version}-%{git_date} %{real_name}-runtime.jar
-%add_maven_depmap %{compat_name}:%{compat_name}:%{compat_version} %{compat_name}_compat/%{compat_name}.jar
 %endif
 
 # compatibility symlinks
@@ -145,7 +134,6 @@ mkdir -p %{buildroot}%{_bindir}
 %if %{with bootstrap}
 %files
 %{_javadir}/%{real_name}*.jar
-%{_javadir}/%{compat_name}_compat
 %else
 
 %files -f .mfiles
diff --git a/java_cup_v9e.tar.gz b/java_cup_v9e.tar.gz
deleted file mode 100644
index 3c2b134..0000000
--- a/java_cup_v9e.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be176e9356ff1695c64d08277ba31cea14ea4f617b93787502cf93c6fd35625f
-size 93657