[jgoodies-looks] Update to 2.4.2

[Mohamed ElMorabity]

commit 5042e4a7f96834f3d20e7f81f647083c5d369bf2
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Thu Dec 22 00:12:05 2011 +0100

    Update to 2.4.2

 .gitignore          |    1 +
 jgoodies-looks.spec |   41 ++++++++++++++---------------------------
 sources             |    2 +-
 3 files changed, 16 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f9a180..cbea89b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 looks-2_2_1.zip
 /jgoodies-looks-2_4_0.zip
+/jgoodies-looks-2_4_2.zip
diff --git a/jgoodies-looks.spec b/jgoodies-looks.spec
index a5a9ce4..03d6c08 100644
--- a/jgoodies-looks.spec
+++ b/jgoodies-looks.spec
@@ -1,7 +1,7 @@
-%global shortname looks
+%define shortname looks
 
 Name:           jgoodies-looks
-Version:        2.4.0
+Version:        2.4.2
 Release:        1%{?dist}
 Summary:        Free high-fidelity Windows and multi-platform appearance
 
@@ -23,18 +23,10 @@ BuildArch:      noarch
 The JGoodies look&feels make your Swing applications and applets look better.
 They have been optimized for readability, precise micro-design and usability.
 
-Main Benefits:
-
-* Improved readability, legibility and in turn usability.
-* Improved aesthetics - looks good on the majority of desktops
-* Simplified multi-platform support
-* Precise micro-design
-
 
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
 Requires:       jpackage-utils
 
 %description javadoc
@@ -45,13 +37,13 @@ This package contains the API documentation for %{name}.
 %setup -q
 
 # Delete prebuild JARs
-find -name "*.jar" -exec rm -f {} \;
+find -name "*.jar" -exec rm {} \;
 
-# Remove DOS line endings
-for file in LICENSE.txt RELEASE-NOTES.txt docs/style.css; do
-  sed 's|\r||g' $file > $file.new && \
-  touch -r $file $file.new && \
-  mv $file.new $file
+# Fix wrong end-of-line encoding
+for file in LICENSE.txt RELEASE-NOTES.txt; do
+  sed -i.orig "s/\r//" $file && \
+  touch -r $file.orig $file && \
+  rm $file.orig
 done
 
 
@@ -59,33 +51,28 @@ done
 ant \
   -Dlib.common.jar=$(build-classpath jgoodies-common) \
   -Ddescriptors.dir=. \
-  jar \
-  javadoc
+  jar javadoc
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}/
-install -pm 0644 -t $RPM_BUILD_ROOT%{_javadir}/%{name}/ build/*.jar
+install -Dpm 0644 build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 cp -a build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
-rm -r docs/api
 
 
 %files
-%defattr(-,root,root,-)
-%doc LICENSE.txt README.html RELEASE-NOTES.txt docs/*
-%{_javadir}/%{name}/
+%doc LICENSE.txt README.html RELEASE-NOTES.txt
+%{_javadir}/*.jar
 
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}/
 
 
 %changelog
-* Sun Feb 20 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.4.0-1
-- Update to 2.4.0
+* Fri Dec 16 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.4.2-1
+- Update to 2.4.2
 - Spec cleanup
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
diff --git a/sources b/sources
index b580f74..1c89b16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83dd6bf243e330ffcc9139a311f6cd89  jgoodies-looks-2_4_0.zip
+726989fe0a2d59ad4149d58de0372ded  jgoodies-looks-2_4_2.zip