[jgoodies-common/f17] Update to 1.3.1
Mohamed ElMorabity
melmorabity at fedoraproject.org
Fri May 4 00:14:39 UTC 2012
commit df3b92ddc0ae69a219753e84d75de5fb223ff7c2
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date: Fri May 4 02:10:01 2012 +0200
Update to 1.3.1
.gitignore | 1 +
jgoodies-common.spec | 38 ++++++++++++++++++++++++++++----------
sources | 2 +-
3 files changed, 30 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e6b7fe3..87a8204 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/jgoodies-common-1_1_1.zip
/jgoodies-common-1_2_1.zip
/jgoodies-common-1_3_0.zip
+/jgoodies-common-1_3_1.zip
diff --git a/jgoodies-common.spec b/jgoodies-common.spec
index e7e9719..51fd994 100644
--- a/jgoodies-common.spec
+++ b/jgoodies-common.spec
@@ -1,7 +1,7 @@
%global shortname common
Name: jgoodies-common
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: Common library shared by JGoodies libraries and applications
@@ -10,9 +10,14 @@ License: BSD
URL: http://www.jgoodies.com/
Source0: http://www.jgoodies.com/download/libraries/%{shortname}/%{name}-%(tr "." "_" <<<%{version}).zip
-BuildRequires: ant
+# Fontconfig and DejaVu fonts needed for tests
+BuildRequires: dejavu-sans-fonts
+BuildRequires: fontconfig
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
+BuildRequires: maven
+BuildRequires: maven-dependency-plugin
+BuildRequires: maven-surefire-provider-junit4
Requires: java >= 1:1.6.0
Requires: jpackage-utils
BuildArch: noarch
@@ -25,7 +30,6 @@ libraries and applications.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
-Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
%description javadoc
@@ -35,6 +39,15 @@ This package contains the API documentation for %{name}.
%prep
%setup -q
+# Unzip source and test files from provided JARs
+mkdir -p src/main/java/ src/test/java/
+pushd src/main/java/
+jar -xf ../../../%{name}-%{version}-sources.jar
+popd
+pushd src/test/java/
+jar -xf ../../../%{name}-%{version}-tests.jar
+popd
+
# Delete prebuild JARs
find -name "*.jar" -exec rm {} \;
@@ -47,30 +60,35 @@ done
%build
-ant \
- jar \
- javadoc
+mvn-rpmbuild install javadoc:aggregate
%install
-install -Dpm 0644 build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -Dpm 0644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+install -Dpm 0644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
-cp -a build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+cp -a target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt README.html RELEASE-NOTES.txt
%{_javadir}/*.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}/
%changelog
+* Thu May 03 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.3.1-1
+- Update to 1.3.1
+
* Wed Feb 15 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.3.0-1
- Update to 1.3.0
diff --git a/sources b/sources
index 0303c50..80690b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-538e04b89e855a47103ed510210de27b jgoodies-common-1_3_0.zip
+f260fc3eef00014af071c51dd4e6d767 jgoodies-common-1_3_1.zip
More information about the scm-commits
mailing list