[hamcrest] Split hamcrest-core subpackage to allow other frameworks to reduce deps.

Alexander Kurtakov akurtakov at fedoraproject.org
Mon Feb 23 17:15:30 UTC 2015


commit 4a88f092ea4c079bf1fdc4f47a653f7168b3bb80
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Feb 23 19:15:25 2015 +0200

    Split hamcrest-core subpackage to allow other frameworks to reduce deps.

 hamcrest.spec | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/hamcrest.spec b/hamcrest.spec
index 00038b5..c414795 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -42,7 +42,7 @@
 
 Name:           hamcrest
 Version:        1.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Summary:        Library of matchers for building test expressions
 License:        BSD
@@ -72,14 +72,15 @@ Patch4:         %{name}-%{version}-qdox-2.0.patch
 
 Requires:       java-headless >= 1:1.6.0
 Requires:       qdox
-Requires:       easymock3
+Requires:       easymock >= 3.0
+Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 
 BuildRequires:  jpackage-utils >= 0:1.7.4
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  ant >= 0:1.6.5
 BuildRequires:  ant-junit
 BuildRequires:  zip
-BuildRequires:  easymock3
+BuildRequires:  easymock >= 3.0
 BuildRequires:  perl
 %if %with jarjar
 BuildRequires:  jarjar
@@ -98,10 +99,16 @@ allowing 'match' rules to be defined declaratively, to be used in other
 frameworks. Typical scenarios include testing frameworks, mocking libraries and
 UI validation rules.
 
+%package core
+Summary:        Core API of hamcrest matcher framework.
+
+%description core
+The core API of hamcrest matcher framework to be used by third-party framework providers. 
+This includes the a foundation set of matcher implementations for common operations. 
+
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
-BuildArch:      noarch
 
 %description javadoc
 Javadoc for %{name}.
@@ -189,7 +196,7 @@ zip -u build/%{name}-generator-%{version}.jar META-INF/MANIFEST.MF
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-parent.pom
+%add_maven_depmap JPP.%{name}-parent.pom -f core
 
 install -m 644 build/%{name}-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/all.jar
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-all.pom
@@ -197,7 +204,7 @@ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-all.pom
 
 install -m 644 build/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core.jar
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-core.pom
-%add_maven_depmap JPP.%{name}-core.pom %{name}/core.jar
+%add_maven_depmap JPP.%{name}-core.pom %{name}/core.jar -f core
 
 install -m 644 build/%{name}-generator-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/generator.jar
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-generator.pom
@@ -234,6 +241,8 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 %{_javadir}/%{name}/unit-test.jar
 %endif
 
+%files core -f .mfiles-core
+
 %files javadoc
 %{_javadocdir}/%{name}
 
@@ -241,6 +250,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 %{_datadir}/%{name}
 
 %changelog
+* Mon Feb 23 2015 Alexander Kurtakov <akurtako at redhat.com> 0:1.3-10
+- Split hamcrest-core subpackage to allow other frameworks to reduce deps.
+
 * Wed Feb  4 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.3-9
 - Port to QDox 2.0
 - Resolves: rhbz#1166700


More information about the scm-commits mailing list