rpms/jgoodies-looks/devel jgoodies-looks-demo-manifest.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 jgoodies-looks.spec, 1.2, 1.3 sources, 1.2, 1.3

[Mary Ellen Foster]

Author: mef

Update of /cvs/pkgs/rpms/jgoodies-looks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19932

Modified Files:
	.cvsignore jgoodies-looks.spec sources 
Added Files:
	jgoodies-looks-demo-manifest.patch 
Log Message:
Update to 2.2.1, add demo subpackage

jgoodies-looks-demo-manifest.patch:

--- NEW FILE jgoodies-looks-demo-manifest.patch ---
--- looks-2.2.1/build.xml.orig	2009-01-28 17:04:48.000000000 +0100
+++ looks-2.2.1/build.xml	2009-01-28 17:04:51.000000000 +0100
@@ -286,14 +286,6 @@
                         excludes="Tiny.*, FontTest.*"          />
 			<fileset    dir="${src.demo.dir}" 
 			            includes="com/jgoodies/looks/demo/resources/**/*" />
-			<manifest>
-                <attribute name ="Built-By" 
-                           value="${user.name}"/>
-                <attribute name ="Main-Class" 
-                           value="com.jgoodies.looks.demo.DemoFrame"/>
-                <attribute name ="Class-Path" 
-                           value="../lib/${lib.forms.name} ../${dist.all.name}"/>
-            </manifest>		
         </jar>
 	</target>
 	


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Nov 2007 20:07:59 -0000	1.2
+++ .cvsignore	28 Jan 2009 16:10:32 -0000	1.3
@@ -1 +1 @@
-looks-2_1_4.zip
+looks-2_2_1.zip


Index: jgoodies-looks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/jgoodies-looks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jgoodies-looks.spec	20 Nov 2007 20:28:31 -0000	1.2
+++ jgoodies-looks.spec	28 Jan 2009 16:10:32 -0000	1.3
@@ -5,8 +5,8 @@
 Summary: Free high-fidelity Windows and multi-platform appearance
 URL: http://www.jgoodies.com/freeware/looks/
 Group: Development/Libraries
-Version: 2.1.4
-Release: 6%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 License: BSD
 
 BuildRequires: jpackage-utils >= 0:1.6
@@ -17,11 +17,15 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 # Unfortunately, the filename has the version in an annoying way
-Source0: http://www.jgoodies.com/download/libraries/%{shortname}/%{shortname}-2_1_4.zip
-# Source1: %{name}.README
+Source0: http://www.jgoodies.com/download/libraries/%{shortname}/%{shortname}-2_2_1.zip
+# Let the build work without a bootclasspath
 Patch0: %{name}-build.patch
+# Remove some classes that depend on com.sun packages
 Patch1: %{name}-no-com-sun.patch
+# Remove some included JDK source
 Patch2: %{name}-remove-jdk-stuff.patch
+# Don't put a special manifest into the demo jar
+Patch3: %{name}-demo-manifest.patch
 
 %description
 The JGoodies look&feels make your Swing applications and applets look better.
@@ -37,12 +41,22 @@
 %package javadoc
 Summary: Javadoc documentation for JGoodies Looks
 Group: Documentation
+Requires: %{name} = %{version}-%{release}
 %description javadoc
 The JGoodies look&feels make your Swing applications and applets look better.
 They have been optimized for readability, precise micro-design and usability.
 
 This package contains the Javadoc documentation for JGoodies Looks.
 
+
+%package demo
+Summary: Demo applications for the JGoodies look&feels
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description demo
+This package contains demo applications for the JGoodies look&feels,
+including the "uif_lite" classes.
+
 %prep
 %setup -q -n %{shortname}-%{version}
 %patch0 -p1
@@ -71,6 +85,8 @@
 rm src/core/com/jgoodies/looks/common/ExtBasicArrowButtonHandler.java
 %patch2 -p1
 
+%patch3 -p1
+
 %build
 %ant -Ddescriptors.dir=. compile jar javadoc
 
@@ -80,6 +96,8 @@
         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p build/%{shortname}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p build/demo.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-demo-%{version}.jar
+ln -s %{name}-demo-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-demo.jar
 cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 # install -m 644 %SOURCE1 README_RPM.txt
 # Fix the line endings!
@@ -103,7 +121,17 @@
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
+%files demo
+%defattr(-,root,root,-)
+%{_javadir}/%{name}-demo.jar
+%{_javadir}/%{name}-demo-%{version}.jar
+
 %changelog
+* Wed Jan 28 2009 Mary Ellen Foster <mefoster at gmail.com> - 2.2.1-1
+- Upgrade to upstream 2.2.1
+- Include "demo" subpackage
+- Make subpackages Require the main package
+
 * Tue Nov 20 2007 Mary Ellen Foster <mefoster at gmail.com> - 2.1.4-6
 - Add LICENSE.txt to documentation
 - Correctly add all files to CVS


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Nov 2007 20:07:59 -0000	1.2
+++ sources	28 Jan 2009 16:10:32 -0000	1.3
@@ -1 +1 @@
-2e59ea5ec9f5640d5902485a252b3056  looks-2_1_4.zip
+0d191029f45b81a90c835263e0c5af2e  looks-2_2_1.zip