From 2702706b9451251b60633f2e6433d7d23ae27a6c Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 31 Jul 2012 13:35:20 +0300
Subject: [PATCH] Add OSGi metadata for hamcrest-library.

---
 hamcrest-library-MANIFEST.MF | 15 +++++++++++++++
 hamcrest.spec                | 19 +++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 hamcrest-library-MANIFEST.MF

diff --git a/hamcrest-library-MANIFEST.MF b/hamcrest-library-MANIFEST.MF
new file mode 100644
index 0000000..829a9a8
--- /dev/null
+++ b/hamcrest-library-MANIFEST.MF
@@ -0,0 +1,15 @@
+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.library
+Require-Bundle: org.hamcrest.core;bundle-version="1.1.0"
+Bundle-Version: 1.1.0.v20090501071000
+Export-Package: org.hamcrest;version="1.1.0";library=split;mandatory:=
+ library,org.hamcrest.beans;version="1.1.0",org.hamcrest.collection;ve
+ rsion="1.1.0",org.hamcrest.number;version="1.1.0",org.hamcrest.object
+ ;version="1.1.0",org.hamcrest.text;version="1.1.0",org.hamcrest.xml;v
+ ersion="1.1.0"
+Bundle-ManifestVersion: 2
diff --git a/hamcrest.spec b/hamcrest.spec
index 14748d0..dd1ec24 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -50,7 +50,7 @@
 
 Name:           hamcrest
 Version:        1.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Epoch:          0
 Summary:        Library of matchers for building test expressions
 License:        BSD
@@ -65,6 +65,7 @@ Source5:        http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.1/ham
 Source6:        http://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1.pom
 Source7:        hamcrest-text-1.1.pom
 Source8:        hamcrest-core-MANIFEST.MF
+Source9:        hamcrest-library-MANIFEST.MF
 Patch0:         hamcrest-1.1-build.patch
 Patch1:         hamcrest-1.1-no-jarjar.patch
 Patch2:         hamcrest-1.1-no-integration.patch
@@ -89,7 +90,6 @@ BuildRequires:  jarjar
 BuildRequires:  jmock
 %endif
 BuildRequires:  junit
-BuildRequires:  junit4
 BuildRequires:  qdox
 %if %with tests
 BuildRequires:  testng
@@ -97,9 +97,6 @@ BuildRequires:  testng
 
 BuildArch:      noarch
 
-Requires(post): jpackage-utils >= 0:1.7.4
-Requires(postun): jpackage-utils >= 0:1.7.4
-
 %description
 Provides a library of matcher objects (also known as constraints or predicates)
 allowing 'match' rules to be defined declaratively, to be used in other
@@ -119,7 +116,6 @@ Group:          Development/Libraries
 Summary:        Demos for %{name}
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       junit
-Requires:       junit4
 %if %with tests
 Requires:       testng
 %endif
@@ -146,8 +142,6 @@ ln -sf $(build-classpath jmock) lib/integration/
 %endif
 # BUILD/hamcrest-1.1/lib/integration/junit-3.8.1.jar.no
 ln -sf $(build-classpath junit) lib/integration/
-# BUILD/hamcrest-1.1/lib/integration/junit-4.0.jar.no
-ln -sf $(build-classpath junit4) lib/integration/
 # BUILD/hamcrest-1.1/lib/integration/testng-4.6-jdk15.jar.no
 %if %with tests
 ln -sf $(build-classpath testng-jdk15) lib/integration/
@@ -177,6 +171,12 @@ cp -p %{SOURCE8} META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
 zip -u build/%{name}-core-%{version}.jar META-INF/MANIFEST.MF
 
+rm -fr META-INF
+mkdir -p META-INF
+cp -p %{SOURCE9} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/%{name}-library-%{version}.jar META-INF/MANIFEST.MF
+
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -249,6 +249,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jul 31 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-14
+- Add OSGi metadata for hamcrest-library.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild