[jgoodies-forms] Update to 1.6.0

[Mohamed ElMorabity]

commit 4058eb904fd0138db35310bdbdf7984440962494
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Wed Jan 2 03:58:42 2013 +0100

    Update to 1.6.0

 .gitignore                                         |    1 +
 ...build.patch => jgoodies-forms-1.6.0-build.patch |   13 ++++++-------
 jgoodies-forms.spec                                |   19 +++++++++++--------
 sources                                            |    2 +-
 4 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 445fa86..e6e6ab1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ forms-1_2_0.zip
 /jgoodies-forms-1_4_2.zip
 /jgoodies-forms-1_5_0.zip
 /jgoodies-forms-1_5_1.zip
+/jgoodies-forms-1_6_0.zip
diff --git a/jgoodies-forms-1.5.1-build.patch b/jgoodies-forms-1.6.0-build.patch
similarity index 54%
rename from jgoodies-forms-1.5.1-build.patch
rename to jgoodies-forms-1.6.0-build.patch
index 95e6b16..e14e006 100644
--- a/jgoodies-forms-1.5.1-build.patch
+++ b/jgoodies-forms-1.6.0-build.patch
@@ -1,16 +1,15 @@
-diff -up jgoodies-forms-1.5.1/pom.xml.orig jgoodies-forms-1.5.1/pom.xml
---- jgoodies-forms-1.5.1/pom.xml.orig	2012-04-17 14:10:54.000000000 +0200
-+++ jgoodies-forms-1.5.1/pom.xml	2012-05-04 15:24:19.933097718 +0200
-@@ -15,7 +15,7 @@
+diff -up jgoodies-forms-1.6.0/pom.xml.orig jgoodies-forms-1.6.0/pom.xml
+--- jgoodies-forms-1.6.0/pom.xml.orig	2012-07-24 10:27:58.000000000 +0200
++++ jgoodies-forms-1.6.0/pom.xml	2013-01-02 03:27:37.772864330 +0100
+@@ -15,7 +15,6 @@
  	        <groupId>com.jgoodies</groupId>
  	        <artifactId>jgoodies-common</artifactId>
- 	        <version>1.3.1</version>
+ 	        <version>1.4.0</version>
 -	        <scope>runtime</scope>
-+	        <scope>compile</scope>
  	    </dependency>
  	    <dependency>
  	    	<groupId>junit</groupId>
-@@ -63,4 +63,4 @@
+@@ -63,4 +62,4 @@
          <tag>head</tag>
          <url>https://svn.java.net/svn/forms~svn</url>
      </scm>
diff --git a/jgoodies-forms.spec b/jgoodies-forms.spec
index dfa2dce..273f1db 100644
--- a/jgoodies-forms.spec
+++ b/jgoodies-forms.spec
@@ -1,8 +1,8 @@
 %define shortname forms
 
 Name:           jgoodies-forms
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Framework to lay out and implement elegant Swing panels in Java
 
 Group:          Development/Libraries
@@ -10,18 +10,19 @@ License:        BSD
 URL:            http://www.jgoodies.com/freeware/forms/
 Source0:        http://www.jgoodies.com/download/libraries/%{shortname}/%{name}-%(tr "." "_" <<<%{version}).zip
 # Fix pom.xml
-Patch0:         %{name}-1.5.1-build.patch
+Patch0:         %{name}-1.6.0-build.patch
 
 # Fontconfig and DejaVu fonts needed for tests
 BuildRequires:  dejavu-sans-fonts
 BuildRequires:  fontconfig
 BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jgoodies-common >= 1.3.0
+BuildRequires:  jgoodies-common >= 1.4.0
 BuildRequires:  jpackage-utils
 BuildRequires:  maven
+BuildRequires:  maven-clean-plugin
 BuildRequires:  maven-surefire-provider-junit4
 Requires:       java >= 1:1.6.0
-Requires:       jgoodies-common >= 1.3.0
+Requires:       jgoodies-common >= 1.4.0
 Requires:       jpackage-utils
 BuildArch:      noarch
 
@@ -56,7 +57,7 @@ popd
 # Delete prebuild JARs
 find -name "*.jar" -exec rm {} \;
 
-# Delete tests that require a running X11 server
+# Drop tests that require a running X11 server
 rm src/test/java/com/jgoodies/forms/layout/SerializationTest.java
 sed -i "/SerializationTest.class,/d" src/test/java/com/jgoodies/forms/layout/AllFormsTests.java
 
@@ -78,8 +79,7 @@ mvn-rpmbuild install javadoc:aggregate
 
 
 %install
-install -Dpm 0644 target/jgoodies%{shortname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s $RPM_BUILD_ROOT%{_javadir}/%{name}.jar jgoodies%{shortname}.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
 
@@ -101,6 +101,9 @@ cp -a target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 
 %changelog
+* Wed Jan 02 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.6.0-1
+- Update to 1.6.0
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 7d2e156..97e9aae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-013f3134ef78f314c3a91d04a075ba81  jgoodies-forms-1_5_1.zip
+48eb2e91632a8684288ba5e58cda0f81  jgoodies-forms-1_6_0.zip