Elimitate race condition when injecting JAR manifest
Resolves: rhbz#1495233
This commit is contained in:
parent
fd1b1e227d
commit
03fcdd986e
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: java_cup
|
Name: java_cup
|
||||||
Version: 0.11b
|
Version: 0.11b
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Summary: LALR parser generator for Java
|
Summary: LALR parser generator for Java
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -25,7 +25,6 @@ BuildRequires: jflex
|
|||||||
%if ! %{with_bootstrap}
|
%if ! %{with_bootstrap}
|
||||||
BuildRequires: java_cup >= 1:0.11a
|
BuildRequires: java_cup >= 1:0.11a
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: zip
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -50,6 +49,8 @@ Documentation for java_cup.
|
|||||||
# remove all binary files
|
# remove all binary files
|
||||||
find -name "*.class" -delete
|
find -name "*.class" -delete
|
||||||
|
|
||||||
|
%mvn_file ':{*}' @1
|
||||||
|
|
||||||
%if ! %{with_bootstrap}
|
%if ! %{with_bootstrap}
|
||||||
# remove prebuilt JFlex
|
# remove prebuilt JFlex
|
||||||
rm -rf java_cup-%{version}/bin/JFlex.jar
|
rm -rf java_cup-%{version}/bin/JFlex.jar
|
||||||
@ -67,17 +68,11 @@ ant -Dcupversion=20150326 -Dsvnversion=65
|
|||||||
find -name parser.cup -delete
|
find -name parser.cup -delete
|
||||||
ant javadoc
|
ant javadoc
|
||||||
|
|
||||||
%install
|
|
||||||
# inject OSGi manifests
|
# inject OSGi manifests
|
||||||
mkdir -p META-INF
|
jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2}
|
||||||
cp -p %{SOURCE2} META-INF/MANIFEST.MF
|
jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
|
||||||
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
|
|
||||||
|
|
||||||
%mvn_file ':{*}' @1
|
%install
|
||||||
%mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar
|
%mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar
|
||||||
%mvn_artifact %{name}:%{name}-runtime:%{version} dist/java-cup-%{pkg_version}-runtime.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
|
%license licence.txt
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user