[apache-commons-math] Updated to 2.1 Removed dependency on main package for -javadoc subpackage Fixed maven depmap entry A
spike
spike at fedoraproject.org
Fri Oct 22 02:03:02 UTC 2010
commit 1aa36371fc71387757030e85438d1ebe8f1665de
Author: spike <spike at fedoraproject.org>
Date: Fri Oct 22 04:01:45 2010 +0200
Updated to 2.1
Removed dependency on main package for -javadoc subpackage
Fixed maven depmap entry
Added jarfile symlinks (rhbz#612455)
Added javadoc symlinks
Added license file to -javadoc subpackage
.gitignore | 1 +
apache-commons-math.spec | 114 ++++++++++++++++-------------
commons-math-remove-clirr-from-pom.patch | 35 +++++++++
sources | 2 +-
4 files changed, 100 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aafde05..68e9658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
commons-math-2.0-src.tar.gz
+/commons-math-2.1-src.tar.gz
diff --git a/apache-commons-math.spec b/apache-commons-math.spec
index 92339dc..5dc40e4 100644
--- a/apache-commons-math.spec
+++ b/apache-commons-math.spec
@@ -1,39 +1,38 @@
%global base_name math
%global short_name commons-%{base_name}
-Name: apache-commons-math
-Version: 2.0
-Release: 6%{?dist}
-Summary: Java library of lightweight mathematics and statistics components
-
-Group: Development/Libraries
-License: ASL 1.1 and ASL 2.0 and BSD
-URL: http://commons.apache.org/math/
-Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# Cannot build with gcj, gjdoc currently blocks this (bug similar to
-# rhbz#510243)
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: junit4
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-Requires: java >= 1:1.6.0
-Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun):jpackage-utils
-BuildArch: noarch
+Name: apache-%{short_name}
+Version: 2.1
+Release: 1%{?dist}
+Summary: Java library of lightweight mathematics and statistics components
+
+Group: Development/Libraries
+License: ASL 1.1 and ASL 2.0 and BSD
+URL: http://commons.apache.org/%{base_name}/
+Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Patch0: %{short_name}-remove-clirr-from-pom.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: junit4
+BuildRequires: maven2 >= 2.2.1
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+BuildArch: noarch
%description
Commons Math is a library of lightweight, self-contained mathematics and
@@ -42,10 +41,9 @@ Java programming language or Commons Lang.
%package javadoc
-Summary: Javadocs for %{name}
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
+Summary: Javadoc for %{name}
+Group: Documentation
+Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -53,6 +51,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
+%patch0 -p0
%build
@@ -62,24 +61,28 @@ mvn-jpp \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
-
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar
+# jars
+install -d -m 0755 %{buildroot}%{_javadir}
+install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-cp -p pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+# javadoc
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
@@ -89,21 +92,30 @@ rm -rf $RPM_BUILD_ROOT
%postun
%update_maven_depmap
-
%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+%{_javadir}/*
%{_mavenpomdir}/*
-%{_javadir}/*.jar
%{_mavendepmapfragdir}/*
-
%files javadoc
%defattr(-,root,root,-)
+%doc LICENSE.txt
+%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
+
%changelog
+* Fri Oct 22 2010 Chris Spike <chris.spike at arcor.de> 2.1-1
+- Updated to 2.1
+- Removed dependency on main package for -javadoc subpackage
+- Fixed maven depmap entry
+- Added jarfile symlinks (rhbz#612455)
+- Added javadoc symlinks
+- Added license file to -javadoc subpackage
+
* Wed Feb 3 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 2.0-6
- Add missing %%post/%%postun Requires
- Use macro %%{_mavendepmapfragdir} instead of %%{_datadir}/maven2/pom
diff --git a/commons-math-remove-clirr-from-pom.patch b/commons-math-remove-clirr-from-pom.patch
new file mode 100644
index 0000000..adf545a
--- /dev/null
+++ b/commons-math-remove-clirr-from-pom.patch
@@ -0,0 +1,35 @@
+--- pom.xml 2010-10-22 03:37:42.930470377 +0200
++++ pom.xml 2010-10-22 03:38:07.199469768 +0200
+@@ -269,17 +269,6 @@
+ </descriptors>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>clirr-maven-plugin</artifactId>
+- <version>2.2.2</version>
+- <executions>
+- <execution>
+- <goals>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+ </plugins>
+ </build>
+ <reporting>
+@@ -324,14 +313,6 @@
+ <headerFile>${basedir}/license-header.txt</headerFile>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>clirr-maven-plugin</artifactId>
+- <version>2.2.2</version>
+- <configuration>
+- <minSeverity>info</minSeverity>
+- </configuration>
+- </plugin>
+ </plugins>
+ </reporting>
+ </project>
diff --git a/sources b/sources
index d967afc..d5004c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0572a2e542c0e138328466ff2c8dafce commons-math-2.0-src.tar.gz
+5e7f431d77e87888c79f74b0d5a603f0 commons-math-2.1-src.tar.gz
More information about the scm-commits
mailing list