packages: java-jgoodies-looks/java-jgoodies-looks.spec - more undos; rel 2

glen glen at pld-linux.org
Sun Apr 4 14:31:42 CEST 2010


Author: glen                         Date: Sun Apr  4 12:31:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more undos; rel 2

---- Files affected:
packages/java-jgoodies-looks:
   java-jgoodies-looks.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/java-jgoodies-looks/java-jgoodies-looks.spec
diff -u packages/java-jgoodies-looks/java-jgoodies-looks.spec:1.1 packages/java-jgoodies-looks/java-jgoodies-looks.spec:1.2
--- packages/java-jgoodies-looks/java-jgoodies-looks.spec:1.1	Sun Apr  4 14:14:57 2010
+++ packages/java-jgoodies-looks/java-jgoodies-looks.spec	Sun Apr  4 14:31:37 2010
@@ -11,11 +11,11 @@
 Summary:	Free high-fidelity Windows and multi-platform appearance
 Name:		java-%{srcname}
 Version:	2.2.1
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries/Java
 URL:		http://www.jgoodies.com/freeware/looks/
-Source0:	http://www.jgoodies.com/download/libraries/%{shortname}/%{shortname}-2_2_1.zip
+Source0:	http://www.jgoodies.com/download/libraries/%{shortname}/%{shortname}-%{ver}.zip
 # Source0-md5:	0d191029f45b81a90c835263e0c5af2e
 Patch0:		build.patch
 Patch1:		no-com-sun.patch
@@ -86,6 +86,10 @@
 
 %prep
 %setup -q -n %{shortname}-%{version}
+%undos build.xml
+%undos *.txt *.html docs/*.* docs/guide/*.*
+find -name '*.java' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+
 %patch0 -p1
 
 # unzip the look&feel settings from bundled jar before we delete it
@@ -114,11 +118,6 @@
 
 %patch3 -p1
 
-# Fix the line endings!
-for file in *.txt *.html docs/*.* docs/guide/*.*; do
-	sed -i 's/\r//' $file
-done
-
 %build
 %ant -Ddescriptors.dir=. compile jar %{?with_javadoc:javadoc}
 
@@ -170,5 +169,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/04/04 12:31:37  glen
+- more undos; rel 2
+
 Revision 1.1  2010/04/04 12:14:57  glen
 - new, based on fc package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jgoodies-looks/java-jgoodies-looks.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list