rpms/swingx/devel import.log, NONE, 1.1 swingx-0.9.4-LoginService.patch, NONE, 1.1 swingx-0.9.4-project-properties.patch, NONE, 1.1 swingx-0.9.4-swinglabs-build-impl.patch, NONE, 1.1 swingx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Mary Ellen Foster]

Author: mef

Update of /cvs/pkgs/rpms/swingx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19787/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log swingx-0.9.4-LoginService.patch 
	swingx-0.9.4-project-properties.patch 
	swingx-0.9.4-swinglabs-build-impl.patch swingx.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
swingx-0_9_4-5_fc10:HEAD:swingx-0.9.4-5.fc10.src.rpm:1228901807

swingx-0.9.4-LoginService.patch:

--- NEW FILE swingx-0.9.4-LoginService.patch ---
--- swingx-0.9.4-src/src/java/org/jdesktop/swingx/auth/LoginService.java	2008-09-07 06:10:24.000000000 +0200
+++ swingx-0.9.4-src.mef/src/java/org/jdesktop/swingx/auth/LoginService.java	2008-11-04 16:35:33.000000000 +0100
@@ -24,10 +24,10 @@
 import java.util.logging.Logger;
 
 import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
 import javax.swing.event.EventListenerList;
 
 import org.jdesktop.beans.AbstractBean;
-import org.jdesktop.swingworker.SwingWorker;
 
 /**
  * <b>LoginService</b> is the abstract base class for all classes implementing

swingx-0.9.4-project-properties.patch:

--- NEW FILE swingx-0.9.4-project-properties.patch ---
--- swingx-0.9.4-src/nbproject/project.properties	2008-09-07 06:10:24.000000000 +0200
+++ swingx-0.9.4-src.mef/nbproject/project.properties	2008-11-04 16:52:52.000000000 +0100
@@ -28,11 +28,10 @@
 # Library references                                     #
 ##########################################################
 file.reference.jmock-1.1.0RC1.jar=lib/jmock-1.1.0RC1.jar
-file.reference.MultipleGradientPaint.jar=lib/optional/MultipleGradientPaint.jar
+file.reference.batik-all.jar=/usr/share/java/batik-all.jar
 file.reference.src-java=src/java
 file.reference.src-test=src/test
-file.reference.swing-worker.jar=lib/optional/swing-worker.jar
-file.reference.Filters.jar=lib/optional/Filters.jar
+# file.reference.Filters.jar=lib/optional/Filters.jar
 
 ##########################################################
 # Build, test, debug, etc Classpaths                     #
@@ -42,9 +41,7 @@
 debug.test.classpath=\
     ${run.test.classpath}
 javac.classpath=\
-    ${file.reference.MultipleGradientPaint.jar}:\
-    ${file.reference.swing-worker.jar}:\
-    ${file.reference.Filters.jar}
+    ${file.reference.batik-all.jar}
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
@@ -102,7 +99,7 @@
 # Properties for a "main class" and running that class.
 # These are generally not used in SwingX
 #####
-main.class=org.jdesktop.swingx.painter.demo.PainterDemoSet
+# main.class=org.jdesktop.swingx.painter.demo.PainterDemoSet
 application.args=
 # Space-separated list of JVM arguments used when running the project
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
@@ -135,4 +132,4 @@
 build.branch=MAIN
 
 # Location of the demo-taglet jar file
-demo.taglet.jar=lib/build-only/demo-taglet.jar
\ No newline at end of file
+demo.taglet.jar=lib/build-only/demo-taglet.jar

swingx-0.9.4-swinglabs-build-impl.patch:

--- NEW FILE swingx-0.9.4-swinglabs-build-impl.patch ---
--- swingx-0.9.4-src/swinglabs-build-impl.xml	2008-09-07 06:10:24.000000000 +0200
+++ swingx-0.9.4-src.mef/swinglabs-build-impl.xml	2008-11-04 17:19:01.000000000 +0100
@@ -232,11 +232,7 @@
             </classpath>
             <packageset dir="${src.beaninfo.dir}" includes="*/**"/>
             <packageset dir="${java.dir}" includes="*/**"/>
-            <taglet name="org.jdesktop.swinglabs.javadoc.DemoTaglet">
-                <path path="${demo.taglet.jar}" />
-            </taglet>
         </javadoc>
-        <copy todir="${dist.javadoc.dir}" file="${demo.taglet.jar}" />
         <copy todir="${dist.javadoc.dir}" file="dist/swingx.jar" />
         <rename src="${dist.javadoc.dir}/swingx.jar" dest="${dist.javadoc.dir}/demos.jar" />
     </target>


--- NEW FILE swingx.spec ---
Name:           swingx
Version:        0.9.4
Release:        5%{?dist}
Summary:        A collection of Swing components
License:        LGPLv2
Group:          Development/Libraries
Url:            https://swingx.dev.java.net/
Source0:        https://swingx.dev.java.net/files/documents/2981/110622/%{name}-%{version}-src.zip
# Remove external dependency that's now included in JDK 1.6
# See http://forums.java.net/jive/thread.jspa?messageID=318384
Patch0:         swingx-0.9.4-LoginService.patch
# Remove build dependencies on included binary jars and add system jars
# Remove main class from manifest
Patch1:         swingx-0.9.4-project-properties.patch
# Don't do the "demo taglet" stuff
Patch2:         swingx-0.9.4-swinglabs-build-impl.patch

Requires: java >= 0:1.6.0

BuildRequires:  ant, ant-nodeps
BuildRequires:  java-devel >= 0:1.6.0
BuildRequires:        jpackage-utils >= 0:1.5
BuildRequires:  batik
BuildArch:      noarch
Requires(post): jpackage-utils
Requires(postun): jpackage-utils

BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
SwingX contains a collection of powerful, useful, and just plain fun Swing
components. Each of the Swing components have been extended, providing
data-aware functionality out of the box. New useful components have been
created like the JXDatePicker, JXTaskPane, and JXImagePanel.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
%description javadoc
Documentation for the SwingX widgets

%prep
%setup -q -n %{name}-%{version}-src
%patch0 -p1
%patch1 -p1
%patch2 -p1
rm -rf lib/

%build
ant jar javadoc

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}%{_javadocdir}/
cp -r dist/javadoc ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version}
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p dist/%{name}.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%add_to_maven_depmap org.jdesktop.swingx %{name} %{version} JPP %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_javadir}/*.jar
%config(noreplace) %{_mavendepmapfragdir}/%{name}

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}

%changelog
* Tue Dec  9 2008 Mary Ellen Foster <mefoster at gmail.com> - 0.9.4-5
- Add dist to version
- Fix BuildRoot to follow the latest guidelines

* Mon Nov 24 2008 Mary Ellen Foster <mefoster at gmail.com> - 0.9.4-4
- Add comments explaining the patches
- Update Summary following discussion on fedora-devel list

* Thu Nov  6 2008 Mary Ellen Foster <mefoster at gmail.com> - 0.9.4-3
- Flag Maven depmap as "config"

* Wed Nov  5 2008 Mary Ellen Foster <mefoster at gmail.com> - 0.9.4-2
- Fix cosmetic issues in spec file
- Add ant-nodeps to BuildRequires

* Tue Nov  4 2008 Mary Ellen Foster <mefoster at gmail.com> - 0.9.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swingx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Dec 2008 03:19:28 -0000	1.1
+++ .cvsignore	10 Dec 2008 09:39:01 -0000	1.2
@@ -0,0 +1 @@
+swingx-0.9.4-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swingx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Dec 2008 03:19:28 -0000	1.1
+++ sources	10 Dec 2008 09:39:01 -0000	1.2
@@ -0,0 +1 @@
+dbfaa67a5ee90d3f88d3bcd48cf8a495  swingx-0.9.4-src.zip