[jgoodies-looks] Fix conflict

[Mohamed ElMorabity]

commit 54da8aa49600a94f4dfcad02394bca51786728c0
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Sat May 19 17:07:02 2012 +0200

    Fix conflict

 jgoodies-looks.spec |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/jgoodies-looks.spec b/jgoodies-looks.spec
index 372bb1b..7fae575 100644
--- a/jgoodies-looks.spec
+++ b/jgoodies-looks.spec
@@ -2,7 +2,7 @@
 
 Name:           jgoodies-looks
 Version:        2.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free high-fidelity Windows and multi-platform appearance
 
 Group:          Development/Libraries
@@ -52,6 +52,13 @@ pushd src/test/java/
 jar -xf ../../../%{name}-%{version}-tests.jar
 popd
 
+# Move the resources into a "resources" directory so they end up packaged
+# properly
+mkdir -p src/main/resources/com/jgoodies/looks/plastic/
+mv src/main/java/com/jgoodies/looks/plastic/icons/ src/main/resources/com/jgoodies/looks/plastic/
+mkdir -p src/main/resources/com/jgoodies/looks/common
+mv src/main/java/com/jgoodies/looks/common/*.png src/main/resources/com/jgoodies/looks/common/
+
 # Delete prebuild JARs
 find -name "*.jar" -exec rm {} \;
 
@@ -94,6 +101,10 @@ cp -a target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 %changelog
 * Thu May 03 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.5.1-1
+- Include missing resources in JAR file (reported and fixed by Mary Ellen
+  Foster)
+
+* Fri May 04 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