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] 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