Elimitate race condition when injecting JAR manifest
Resolves: rhbz#1495249
This commit is contained in:
parent
515a3d996f
commit
c28f980150
@ -1,6 +1,6 @@
|
|||||||
Name: xml-commons-apis
|
Name: xml-commons-apis
|
||||||
Version: 1.4.01
|
Version: 1.4.01
|
||||||
Release: 23%{?dist}
|
Release: 24%{?dist}
|
||||||
Summary: APIs for DOM, SAX, and JAXP
|
Summary: APIs for DOM, SAX, and JAXP
|
||||||
License: ASL 2.0 and W3C and Public Domain
|
License: ASL 2.0 and W3C and Public Domain
|
||||||
URL: http://xml.apache.org/commons/
|
URL: http://xml.apache.org/commons/
|
||||||
@ -17,7 +17,6 @@ Source4: http://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-ap
|
|||||||
|
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: zip
|
|
||||||
BuildRequires: apache-parent
|
BuildRequires: apache-parent
|
||||||
|
|
||||||
Provides: xml-commons = %{version}-%{release}
|
Provides: xml-commons = %{version}-%{release}
|
||||||
@ -66,13 +65,8 @@ sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
|
|||||||
ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc
|
ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc
|
||||||
|
|
||||||
# inject OSGi manifests
|
# inject OSGi manifests
|
||||||
mkdir -p META-INF
|
jar ufm build/xml-apis.jar %{SOURCE1}
|
||||||
cp -p %{SOURCE1} META-INF/MANIFEST.MF
|
jar ufm build/xml-apis-ext.jar %{SOURCE2}
|
||||||
touch META-INF/MANIFEST.MF
|
|
||||||
zip -u build/xml-apis.jar META-INF/MANIFEST.MF
|
|
||||||
cp -p %{SOURCE2} META-INF/MANIFEST.MF
|
|
||||||
touch META-INF/MANIFEST.MF
|
|
||||||
zip -u build/xml-apis-ext.jar META-INF/MANIFEST.MF
|
|
||||||
|
|
||||||
%mvn_artifact xml-apis-[0-9]*.pom build/xml-apis.jar
|
%mvn_artifact xml-apis-[0-9]*.pom build/xml-apis.jar
|
||||||
%mvn_artifact xml-apis-ext*.pom build/xml-apis-ext.jar
|
%mvn_artifact xml-apis-ext*.pom build/xml-apis-ext.jar
|
||||||
@ -97,6 +91,10 @@ rm -rf build/docs/javadoc
|
|||||||
%{_javadocdir}/*
|
%{_javadocdir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.01-24
|
||||||
|
- Elimitate race condition when injecting JAR manifest
|
||||||
|
- Resolves: rhbz#1495249
|
||||||
|
|
||||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-23
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-23
|
||||||
- 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