rpms/hamcrest
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove bogus hamcrest-text JAR

Browse Source
This commit is contained in:
Mikolaj Izdebski 2017-09-25 18:08:01 +02:00
parent 035a1ae43c
commit cfdb3b61ca
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hamcrest-text-MANIFEST.MF
View File

@ -1,14 +0,0 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
Bundle-SymbolicName: org.hamcrest.text
Require-Bundle: org.hamcrest.core;bundle-version="1.3.0",org.hamcrest.
library;bundle-version="1.3.0"
Bundle-Version: 1.3.0.v20090501071000
Export-Package: org.hamcrest.text.pattern;version="1.3.0",org.hamcrest
.text.pattern.internal.ast;version="1.3.0";x-internal:=true,org.hamcr
est.text.pattern.internal.naming;version="1.3.0";x-internal:=true
Bundle-ManifestVersion: 2

6
hamcrest.spec
View File

@ -39,7 +39,6 @@ Source0: https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-%
Source8: hamcrest-core-MANIFEST.MF Source8: hamcrest-core-MANIFEST.MF
Source9: hamcrest-library-MANIFEST.MF Source9: hamcrest-library-MANIFEST.MF
Source10: hamcrest-text-MANIFEST.MF
Source11: hamcrest-integration-MANIFEST.MF Source11: hamcrest-integration-MANIFEST.MF
Source12: hamcrest-generator-MANIFEST.MF Source12: hamcrest-generator-MANIFEST.MF
@ -126,7 +125,6 @@ ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=last
# inject OSGi manifests # inject OSGi manifests
jar ufm build/%{name}-core-%{version}.jar %{SOURCE8} jar ufm build/%{name}-core-%{version}.jar %{SOURCE8}
jar ufm build/%{name}-library-%{version}.jar %{SOURCE9} jar ufm build/%{name}-library-%{version}.jar %{SOURCE9}
#jar ufm build/%{name}-text-%{version}.jar %{SOURCE10}
jar ufm build/%{name}-integration-%{version}.jar %{SOURCE11} jar ufm build/%{name}-integration-%{version}.jar %{SOURCE11}
jar ufm build/%{name}-generator-%{version}.jar %{SOURCE12} jar ufm build/%{name}-generator-%{version}.jar %{SOURCE12}
@ -139,9 +137,6 @@ for mod in all core generator library integration; do
%mvn_artifact pom/hamcrest-$mod.pom build/%{name}-$mod-%{version}.jar %mvn_artifact pom/hamcrest-$mod.pom build/%{name}-$mod-%{version}.jar
done done
# hamcrest-text doesn't have a pom
%mvn_artifact org.hamcrest:hamcrest-text:%{version} build/%{name}-text-%{version}.jar
%mvn_package :hamcrest-parent core %mvn_package :hamcrest-parent core
%mvn_package :hamcrest-core core %mvn_package :hamcrest-core core
@ -168,6 +163,7 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3-22 * Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3-22
- Elimitate race condition when injecting JAR manifest - Elimitate race condition when injecting JAR manifest
- Resolves: rhbz#1495234 - Resolves: rhbz#1495234
- Remove bogus hamcrest-text JAR
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-21 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild