Do not BR/R openjdk6 but java >= 1:1.6.0
- Adapt to current guidelines.
This commit is contained in:
parent
bd9de61bae
commit
573976c1fa
@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
Name: hamcrest
|
Name: hamcrest
|
||||||
Version: 1.1
|
Version: 1.1
|
||||||
Release: 10.4%{?dist}
|
Release: 11%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
Summary: Library of matchers for building test expressions
|
Summary: Library of matchers for building test expressions
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -68,14 +68,14 @@ Source8: hamcrest-core-MANIFEST.MF
|
|||||||
Patch0: hamcrest-1.1-build.patch
|
Patch0: hamcrest-1.1-build.patch
|
||||||
Patch1: hamcrest-1.1-no-jarjar.patch
|
Patch1: hamcrest-1.1-no-jarjar.patch
|
||||||
Patch2: hamcrest-1.1-no-integration.patch
|
Patch2: hamcrest-1.1-no-integration.patch
|
||||||
Requires: java-1.6.0
|
Requires: java >= 1:1.6.0
|
||||||
%if %with integration
|
%if %with integration
|
||||||
Requires: easymock2
|
Requires: easymock2
|
||||||
Requires: jmock
|
Requires: jmock
|
||||||
%endif
|
%endif
|
||||||
Requires: qdox
|
Requires: qdox
|
||||||
BuildRequires: jpackage-utils >= 0:1.7.4
|
BuildRequires: jpackage-utils >= 0:1.7.4
|
||||||
BuildRequires: java-1.6.0-devel
|
BuildRequires: java-devel >= 1:1.6.0
|
||||||
BuildRequires: ant >= 0:1.6.5
|
BuildRequires: ant >= 0:1.6.5
|
||||||
BuildRequires: ant-junit
|
BuildRequires: ant-junit
|
||||||
BuildRequires: zip
|
BuildRequires: zip
|
||||||
@ -95,7 +95,6 @@ BuildRequires: qdox
|
|||||||
BuildRequires: testng
|
BuildRequires: testng
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
Requires(post): jpackage-utils >= 0:1.7.4
|
Requires(post): jpackage-utils >= 0:1.7.4
|
||||||
@ -179,105 +178,81 @@ touch META-INF/MANIFEST.MF
|
|||||||
zip -u build/%{name}-core-%{version}.jar META-INF/MANIFEST.MF
|
zip -u build/%{name}-core-%{version}.jar META-INF/MANIFEST.MF
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
# jars
|
# jars
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
|
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
||||||
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
|
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-parent.pom
|
||||||
%add_to_maven_depmap org.hamcrest %{name}-parent %{version} JPP/%{name} parent
|
%add_maven_depmap JPP.%{name}-parent.pom
|
||||||
|
|
||||||
install -m 644 build/%{name}-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/all-%{version}.jar
|
install -m 644 build/%{name}-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/all.jar
|
||||||
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-all.pom
|
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-all.pom
|
||||||
%add_to_maven_depmap org.hamcrest %{name}-all %{version} JPP/%{name} all
|
%add_maven_depmap JPP.%{name}-all.pom %{name}/all.jar
|
||||||
|
|
||||||
install -m 644 build/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
|
install -m 644 build/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core.jar
|
||||||
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-core.pom
|
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-core.pom
|
||||||
%add_to_maven_depmap org.hamcrest %{name}-core %{version} JPP/%{name} core
|
%add_maven_depmap JPP.%{name}-core.pom %{name}/core.jar
|
||||||
|
|
||||||
install -m 644 build/%{name}-generator-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/generator-%{version}.jar
|
install -m 644 build/%{name}-generator-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/generator.jar
|
||||||
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-generator.pom
|
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-generator.pom
|
||||||
%add_to_maven_depmap org.hamcrest %{name}-generator %{version} JPP/%{name} generator
|
%add_maven_depmap JPP.%{name}-generator.pom %{name}/generator.jar
|
||||||
|
|
||||||
install -m 644 build/%{name}-library-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/library-%{version}.jar
|
install -m 644 build/%{name}-library-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/library.jar
|
||||||
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-library.pom
|
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-library.pom
|
||||||
%add_to_maven_depmap org.hamcrest %{name}-library %{version} JPP/%{name} library
|
%add_maven_depmap JPP.%{name}-library.pom %{name}/library.jar
|
||||||
|
|
||||||
%if %with integration
|
%if %with integration
|
||||||
install -m 644 build/%{name}-integration-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/integration-%{version}.jar
|
install -m 644 build/%{name}-integration-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/integration.jar
|
||||||
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-integration.pom
|
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-integration.pom
|
||||||
%add_to_maven_depmap org.hamcrest %{name}-integration %{version} JPP/%{name} integration
|
%add_maven_depmap JPP.%{name}-integration.pom %{name}/integration.jar
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
install -m 644 build/%{name}-text-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/text-%{version}.jar
|
install -m 644 build/%{name}-text-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/text.jar
|
||||||
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-text.pom
|
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-text.pom
|
||||||
%add_to_maven_depmap org.hamcrest %{name}-text %{version} JPP/%{name} text
|
%add_maven_depmap JPP.%{name}-text.pom %{name}/text.jar
|
||||||
|
|
||||||
%if %with tests
|
%if %with tests
|
||||||
install -m 644 build/%{name}-unit-test-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/unit-test-%{version}.jar
|
install -m 644 build/%{name}-unit-test-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/unit-test.jar
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
|
|
||||||
for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done
|
|
||||||
popd
|
|
||||||
|
|
||||||
# javadoc
|
# javadoc
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||||
cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
|
||||||
|
|
||||||
# demo
|
# demo
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
|
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||||
%if %with integration
|
%if %with integration
|
||||||
install -m 644 build/%{name}-examples-%{version}.jar $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
|
install -m 644 build/%{name}-examples-%{version}.jar $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||||
%endif
|
%endif
|
||||||
cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/
|
cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
|
||||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%post
|
|
||||||
%update_maven_depmap
|
|
||||||
|
|
||||||
%postun
|
|
||||||
%update_maven_depmap
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc LICENSE.txt
|
%doc LICENSE.txt
|
||||||
%dir %{_javadir}/%{name}
|
%dir %{_javadir}/%{name}
|
||||||
%{_javadir}/%{name}/all-%{version}.jar
|
|
||||||
%{_javadir}/%{name}/all.jar
|
%{_javadir}/%{name}/all.jar
|
||||||
%{_javadir}/%{name}/core-%{version}.jar
|
|
||||||
%{_javadir}/%{name}/core.jar
|
%{_javadir}/%{name}/core.jar
|
||||||
%{_javadir}/%{name}/generator-%{version}.jar
|
|
||||||
%{_javadir}/%{name}/generator.jar
|
%{_javadir}/%{name}/generator.jar
|
||||||
%if %with integration
|
%if %with integration
|
||||||
%{_javadir}/%{name}/integration-%{version}.jar
|
|
||||||
%{_javadir}/%{name}/integration.jar
|
%{_javadir}/%{name}/integration.jar
|
||||||
%endif
|
%endif
|
||||||
%{_javadir}/%{name}/library-%{version}.jar
|
|
||||||
%{_javadir}/%{name}/library.jar
|
%{_javadir}/%{name}/library.jar
|
||||||
%{_javadir}/%{name}/text-%{version}.jar
|
|
||||||
%{_javadir}/%{name}/text.jar
|
%{_javadir}/%{name}/text.jar
|
||||||
%if %with tests
|
%if %with tests
|
||||||
%{_javadir}/%{name}/unit-test-%{version}.jar
|
|
||||||
%{_javadir}/%{name}/unit-test.jar
|
%{_javadir}/%{name}/unit-test.jar
|
||||||
%endif
|
%endif
|
||||||
%{_datadir}/maven2/*
|
%{_mavenpomdir}/*
|
||||||
%{_mavendepmapfragdir}/*
|
%{_mavendepmapfragdir}/*
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_javadocdir}/%{name}-%{version}
|
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%files demo
|
%files demo
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_datadir}/%{name}-%{version}
|
|
||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 25 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-11
|
||||||
|
- Do not BR/R openjdk6 but java >= 1:1.6.0
|
||||||
|
- Adapt to current guidelines.
|
||||||
|
|
||||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-10.4
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-10.4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user