From 03fcdd986ea5691d9df9b01e6c944b4d2f88ce8d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 25 Sep 2017 17:45:49 +0200
Subject: [PATCH] Elimitate race condition when injecting JAR manifest
 Resolves: rhbz#1495233

---
 java_cup.spec | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/java_cup.spec b/java_cup.spec
index 1fba56c..4ee100a 100644
--- a/java_cup.spec
+++ b/java_cup.spec
@@ -3,7 +3,7 @@
 
 Name:           java_cup
 Version:        0.11b
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary:        LALR parser generator for Java
 License:        MIT
@@ -25,7 +25,6 @@ BuildRequires:  jflex
 %if ! %{with_bootstrap}
 BuildRequires:  java_cup >= 1:0.11a
 %endif
-BuildRequires:  zip
 
 
 %description
@@ -50,6 +49,8 @@ Documentation for java_cup.
 # remove all binary files
 find -name "*.class" -delete
 
+%mvn_file ':{*}' @1
+
 %if ! %{with_bootstrap}
 # remove prebuilt JFlex
 rm -rf java_cup-%{version}/bin/JFlex.jar
@@ -67,17 +68,11 @@ ant -Dcupversion=20150326 -Dsvnversion=65
 find -name parser.cup -delete
 ant javadoc
 
-%install
 # inject OSGi manifests
-mkdir -p META-INF
-cp -p %{SOURCE2} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u dist/java-cup-%{pkg_version}.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE4} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF
+jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2}
+jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
 
-%mvn_file ':{*}' @1
+%install
 %mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar
 %mvn_artifact %{name}:%{name}-runtime:%{version} dist/java-cup-%{pkg_version}-runtime.jar
 
@@ -95,6 +90,10 @@ zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF
 %license licence.txt
 
 %changelog
+* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-7
+- Elimitate race condition when injecting JAR manifest
+- Resolves: rhbz#1495233
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild