From cfdb3b61ca616d46bb38ba9ae83e3e4062c30d0a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 25 Sep 2017 18:08:01 +0200 Subject: [PATCH] Remove bogus hamcrest-text JAR --- hamcrest-text-MANIFEST.MF | 14 -------------- hamcrest.spec | 6 +----- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 hamcrest-text-MANIFEST.MF diff --git a/hamcrest-text-MANIFEST.MF b/hamcrest-text-MANIFEST.MF deleted file mode 100644 index 88d1e4e..0000000 --- a/hamcrest-text-MANIFEST.MF +++ /dev/null @@ -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 diff --git a/hamcrest.spec b/hamcrest.spec index a0ee1b4..e5dbbdf 100644 --- a/hamcrest.spec +++ b/hamcrest.spec @@ -39,7 +39,6 @@ Source0: https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-% Source8: hamcrest-core-MANIFEST.MF Source9: hamcrest-library-MANIFEST.MF -Source10: hamcrest-text-MANIFEST.MF Source11: hamcrest-integration-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 jar ufm build/%{name}-core-%{version}.jar %{SOURCE8} 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}-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 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-core core @@ -168,6 +163,7 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/ * Mon Sep 25 2017 Mikolaj Izdebski - 0:1.3-22 - Elimitate race condition when injecting JAR manifest - Resolves: rhbz#1495234 +- Remove bogus hamcrest-text JAR * Wed Jul 26 2017 Fedora Release Engineering - 0:1.3-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild