Fix FTBFS rhbz #991965
This commit is contained in:
Mat Booth
parent
798ef70c47
commit
2a00779554
@ -3,12 +3,13 @@
|
||||
|
||||
Name: apache-%{short_name}
|
||||
Version: 3.2.1
|
||||
Release: 18%{?dist}
|
||||
Release: 19%{?dist}
|
||||
Summary: Provides new interfaces, implementations and utilities for Java Collections
|
||||
License: ASL 2.0
|
||||
Group: Development/Libraries
|
||||
URL: http://commons.apache.org/%{base_name}/
|
||||
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
||||
Source1: commons-collections-testframework.pom
|
||||
|
||||
Patch0: jakarta-%{short_name}-javadoc-nonet.patch
|
||||
Patch4: commons-collections-3.2-build_xml.patch
|
||||
@ -18,17 +19,6 @@ BuildArch: noarch
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: maven-antrun-plugin
|
||||
BuildRequires: maven-assembly-plugin
|
||||
BuildRequires: maven-compiler-plugin
|
||||
BuildRequires: maven-jar-plugin
|
||||
BuildRequires: maven-javadoc-plugin
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-resources-plugin
|
||||
BuildRequires: maven-doxia-sitetools
|
||||
BuildRequires: maven-plugin-bundle
|
||||
BuildRequires: maven-surefire-plugin
|
||||
BuildRequires: maven-surefire-provider-junit
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-commons-parent
|
||||
Requires: java
|
||||
@ -66,8 +56,6 @@ Obsoletes: jakarta-%{short_name}-testframework < %{version}-%{release}
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: jpackage-utils
|
||||
Provides: jakarta-%{short_name}-javadoc = %{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release}
|
||||
|
||||
@ -77,7 +65,6 @@ Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release}
|
||||
%package testframework-javadoc
|
||||
Summary: Javadoc for %{name}-testframework
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: jakarta-%{short_name}-testframework-javadoc = %{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name}-testframework-javadoc < %{version}-%{release}
|
||||
|
||||
@ -85,10 +72,11 @@ Obsoletes: jakarta-%{short_name}-testframework-javadoc < %{version}-%{relea
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q -n %{short_name}-%{version}-src
|
||||
|
||||
# remove all binary libs
|
||||
find . -name "*.jar" -exec rm -f {} \;
|
||||
find . -name "*.class" -exec rm -f {} \;
|
||||
|
||||
%patch0 -p1
|
||||
%patch4 -b .sav
|
||||
@ -100,9 +88,12 @@ find . -name "*.jar" -exec rm -f {} \;
|
||||
%{__sed} -i 's/\r//' README.txt
|
||||
%{__sed} -i 's/\r//' NOTICE.txt
|
||||
|
||||
%build
|
||||
# Substitute version into testframework pom
|
||||
cp -p %{SOURCE1} pom-testframework.xml
|
||||
sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
|
||||
|
||||
mvn-rpmbuild install javadoc:aggregate
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
ant tf.javadoc
|
||||
|
||||
@ -116,12 +107,12 @@ install -Dm 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROO
|
||||
|
||||
# poms
|
||||
install -Dpm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||
install -Dpm 644 pom-testframework.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-testframework.pom
|
||||
|
||||
|
||||
# fragments
|
||||
%add_maven_depmap -a "org.apache.commons:%{short_name}" JPP-%{short_name}.pom %{short_name}.jar
|
||||
%add_to_maven_depmap org.apache.commons %{short_name}-testframework %{version} JPP %{short_name}-testframework
|
||||
%add_to_maven_depmap %{short_name} %{short_name}-testframework %{version} JPP %{short_name}-testframework
|
||||
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
|
||||
%add_maven_depmap JPP-%{short_name}-testframework.pom %{short_name}-testframework.jar -f "testframework" -a "org.apache.commons:%{short_name}-testframework"
|
||||
|
||||
|
||||
# javadoc
|
||||
@ -145,19 +136,26 @@ ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-tes
|
||||
%{_javadir}/%{short_name}.jar
|
||||
|
||||
%files testframework
|
||||
%{_mavenpomdir}/JPP-%{short_name}-testframework.pom
|
||||
%{_mavendepmapfragdir}/%{name}-testframework
|
||||
%{_javadir}/%{name}-testframework.jar
|
||||
%{_javadir}/%{short_name}-testframework.jar
|
||||
|
||||
%files javadoc
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
%{_javadocdir}/%{name}-%{version}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%files testframework-javadoc
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
%{_javadocdir}/%{name}-testframework-%{version}
|
||||
%{_javadocdir}/%{name}-testframework
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 12 2013 Mat Booth <fedora@matbooth.co.uk> - 3.2.1-19
|
||||
- Fix FTBFS rhbz #991965
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
@ -197,7 +195,7 @@ ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-tes
|
||||
- Fix pom name.
|
||||
- Use newer maven plugins names.
|
||||
|
||||
* Tue Aug 30 2010 Carl Green <carlgreen at gmail.com> - 3.2.1-6
|
||||
* Tue Aug 31 2010 Carl Green <carlgreen at gmail.com> - 3.2.1-6
|
||||
- Change package to own files in directories, not the directories
|
||||
|
||||
* Mon Aug 30 2010 Carl Green <carlgreen at gmail.com> - 3.2.1-5
|
||||
|
||||
6
commons-collections-testframework.pom
Normal file
6
commons-collections-testframework.pom
Normal file
@ -0,0 +1,6 @@
|
||||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>commons-collections</groupId>
|
||||
<artifactId>commons-collections-testframework</artifactId>
|
||||
<version>@VERSION@</version>
|
||||
</project>
|
||||
Loading…
Reference in New Issue
Block a user