[jgoodies-looks/f17] Update to 2.5.1

Fri May 4 00:38:05 UTC 2012

commit 3c43d4297aeec2e01ca864499e14719a6cb51a2e
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Fri May 4 02:37:56 2012 +0200

    Update to 2.5.1

 .gitignore                       |    1 +
 jgoodies-looks-2.5.1-build.patch |   28 ++++++++++++++++++
 jgoodies-looks.spec              |   58 +++++++++++++++++++++++++++----------
 sources                          |    2 +-
 4 files changed, 72 insertions(+), 17 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index cbea89b..6dc2591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 looks-2_2_1.zip
 /jgoodies-looks-2_4_0.zip
 /jgoodies-looks-2_4_2.zip
+/jgoodies-looks-2_5_1.zip
diff --git a/jgoodies-looks-2.5.1-build.patch b/jgoodies-looks-2.5.1-build.patch
new file mode 100644
index 0000000..5527bac
--- /dev/null
+++ b/jgoodies-looks-2.5.1-build.patch
@@ -0,0 +1,28 @@
+diff -up jgoodies-looks-2.5.1/pom.xml.orig jgoodies-looks-2.5.1/pom.xml
+--- jgoodies-looks-2.5.1/pom.xml.orig	2012-04-18 12:19:04.000000000 +0200
++++ jgoodies-looks-2.5.1/pom.xml	2012-05-04 01:38:11.905552885 +0200
+@@ -1,5 +1,8 @@
+ <project>
+ 	<modelVersion>4.0.0</modelVersion>
++	<properties>
++	    <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
++	</properties>
+ 	<groupId>com.jgoodies</groupId>
+ 	<artifactId>jgoodies-looks</artifactId>
+ 	<version>@impl.version</version>
+@@ -16,7 +19,7 @@
+ 	        <groupId>com.jgoodies</groupId>
+ 	        <artifactId>jgoodies-common</artifactId>
+ 	        <version>1.4.0</version>
+-	        <scope>runtime</scope>
++	        <scope>compile</scope>
+ 	    </dependency>
+ 	    <dependency>
+ 	    	<groupId>junit</groupId>
+@@ -64,4 +67,4 @@
+         <tag>head</tag>
+         <url>https://svn.java.net/svn/looks~svn</url>
+     </scm>
+-</project>
+\ Pas de fin de ligne à la fin du fichier
++</project>
diff --git a/jgoodies-looks.spec b/jgoodies-looks.spec
index e440839..67d8e14 100644
--- a/jgoodies-looks.spec
+++ b/jgoodies-looks.spec
@@ -1,23 +1,26 @@
 %define shortname looks
 
 Name:           jgoodies-looks
-Version:        2.4.2
-Release:        3%{?dist}
+Version:        2.5.1
+Release:        1%{?dist}
 Summary:        Free high-fidelity Windows and multi-platform appearance
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.jgoodies.com/freeware/looks/
 Source0:        http://www.jgoodies.com/download/libraries/%{shortname}/%{name}-%(tr "." "_" <<<%{version}).zip
+# Fix pom.xml
+Patch0:         %{name}-2.5.1-build.patch
 
-BuildRequires:  ant
-BuildRequires:  java-devel
-BuildRequires:  jgoodies-common
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jgoodies-common >= 1.3.0
 BuildRequires:  jpackage-utils
-Requires:       java
-Requires:       jgoodies-common
+BuildRequires:  maven
+BuildRequires:  maven-dependency-plugin
+Requires:       java >= 1:1.6.0
+Requires:       jgoodies-common >= 1.3.0
 Requires:       jpackage-utils
-# JGoodies Looks 2.4.2 doesn't provide demo jars anymore
+# JGoodies Looks <= 2.4.2 doesn't provide demo jars anymore
 Provides:       %{name}-demo = %{version}-%{release}
 Obsoletes:      %{name}-demo < 2.4.2
 BuildArch:      noarch
@@ -38,10 +41,23 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .build
+
+# 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 {} \;
 
+# Fix version in pom.xml
+sed -i "s/@impl.version/%{version}/" pom.xml
+
 # Fix wrong end-of-line encoding
 for file in LICENSE.txt RELEASE-NOTES.txt; do
   sed -i.orig "s/\r//" $file && \
@@ -51,22 +67,25 @@ done
 
 
 %build
-ant \
-  -Dlib.common.jar=$(build-classpath jgoodies-common) \
-  -Ddescriptors.dir=. \
-  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}/
+install -dm 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+cp -a target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 
 %files
 %doc LICENSE.txt README.html RELEASE-NOTES.txt
-%{_javadir}/*.jar
+%{_javadir}/%{name}.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
 
 
 %files javadoc
@@ -74,6 +93,13 @@ cp -a build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 
 %changelog
+* Thu May 03 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.5.1-1
+- Update to 2.5.1
+
+* Thu Feb 16 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.5.0-1
+- Update to 2.5.0
+- Add missing look jars
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 1c89b16..404da71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-726989fe0a2d59ad4149d58de0372ded  jgoodies-looks-2_4_2.zip
+e710d4b890f26b6525a82ff7067a683d  jgoodies-looks-2_5_1.zip
