[flexdock] * Apply (modified, ws cleanup) patches from https://bugzilla.redhat.com/attachment.cgi?id=520222,
mycae
mycae at fedoraproject.org
Sat Sep 3 13:32:33 UTC 2011
commit 2dc14e8af184288171611316892d00229e369168
Author: mycae <mycae(atime)yahoo.com>
Date: Mon Aug 22 23:47:06 2011 +0100
* Apply (modified, ws cleanup) patches from https://bugzilla.redhat.com/attachment.cgi?id=520222,
bug 733861
flexdock-build.patch | 250 +++++++++++++++++-----------------
flexdock-generate-tarball.sh | 28 +++--
flexdock-jni.patch | 20 ++--
flexdock-nojmf.patch | 16 +-
flexdock-skinlfPainter-path.patch | 18 ++--
flexdock-skinlfTitlebarui-path.patch | 18 ++--
flexdock.spec | 21 ++-
7 files changed, 191 insertions(+), 180 deletions(-)
---
diff --git a/flexdock-build.patch b/flexdock-build.patch
index 9d60457..117bcbc 100644
--- a/flexdock-build.patch
+++ b/flexdock-build.patch
@@ -1,132 +1,132 @@
--- build.xml 2008-12-10 20:54:53.000000000 +1100
-+++ build.xml.new 2008-12-10 20:55:13.000000000 +1100
++++ build.xml 2008-12-10 20:55:13.000000000 +1100
@@ -118,7 +118,8 @@
- <condition property="os.unixWithXlib">
- <and>
- <os family="unix"/>
-- <available file="/usr/X11R6/include/X11/Xlib.h"/>
-+ <available file="/usr/include/X11/Xlib.h"/>
-+
- </and>
- </condition>
- </target>
-@@ -135,7 +136,7 @@
- </target>
-
- <target name="compile" depends="init, resources"
-- description="Compile java sources for the framework, demos, and tests">
-+ description="Compile java sources for the framework, and tests">
- <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" source="1.4">
- <src path="${java.src.core}" />
- <!-- the next 3 are interdependent -->
+ <condition property="os.unixWithXlib">
+ <and>
+ <os family="unix"/>
+- <available file="/usr/X11R6/include/X11/Xlib.h"/>
++ <available file="/usr/include/X11/Xlib.h"/>
++
+ </and>
+ </condition>
+ </target>
+@@ -135,7 +135,7 @@
+ </target>
+
+ <target name="compile" depends="init, resources"
+- description="Compile java sources for the framework, demos, and tests">
++ description="Compile java sources for the framework, and tests">
+ <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" source="1.4" includeAntRuntime="no">
+ <src path="${java.src.core}" />
+ <!-- the next 3 are interdependent -->
@@ -145,8 +146,6 @@
- <src path="${java.src.drag}"/>
- <src path="${java.src.perspective}"/>
- </javac>
-- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4"/>
-- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
- </target>
-
-
+ <src path="${java.src.drag}"/>
+ <src path="${java.src.perspective}"/>
+ </javac>
+- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4" includeAntRuntime="no"/>
+- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4" includeAntRuntime="no"/>
+ </target>
+
+
@@ -291,12 +290,15 @@
-
- <exec executable="gcc" failonerror="true">
- <arg value="-lX11"/>
-- <arg value="-L/usr/X11R6/lib"/>
-- <arg value="-I/usr/X11R6/include"/>
-+ <arg value="-L/usr/lib"/>
-+ <arg value="-I/usr/include/X11"/>
-+ <arg value="-fPIC"/>
-+ <arg value="-g"/>
- <arg value="-o"/>
- <arg value="${so.dir}/libRubberBand${library.key}.so"/>
- <arg value="-shared"/>
- <arg value="${c.dir}/RubberBand.c"/>
-+ <arg value="-Wl,-soname=libRubberBand-0.so"/>
- <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
- </exec>
- </target>
+
+ <exec executable="gcc" failonerror="true">
+ <arg value="-lX11"/>
+- <arg value="-L/usr/X11R6/lib"/>
+- <arg value="-I/usr/X11R6/include"/>
++ <arg value="-L/usr/lib"/>
++ <arg value="-I/usr/include/X11"/>
++ <arg value="-fPIC"/>
++ <arg value="-g"/>
+ <arg value="-o"/>
+ <arg value="${so.dir}/libRubberBand${library.key}.so"/>
+ <arg value="-shared"/>
+ <arg value="${c.dir}/RubberBand.c"/>
++ <arg value="-Wl,-soname=libRubberBand-0.so"/>
+ <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
+ </exec>
+ </target>
@@ -414,60 +416,6 @@
- <java fork="yes" dir="${bin.dir.demo}" classpathref="rt.classpath.demo" />
- </presetdef>
-
-- <!-- Targets to run demos -->
--
-- <target name="demo" depends="resources,compile" description="Run org.flexdock.demos.AllDemos">
-- <java.demo classname="org.flexdock.demos.AllDemos" />
-- </target>
--
-- <target name="demo.maximizing" depends="resources,compile" description="Run org.flexdock.demos.maximizing.MaximizationDemo">
-- <java.demo classname="org.flexdock.demos.perspective.MaximizationDemo" />
-- </target>
--
-- <target name="demo.perspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.PerspectivesDemo">
-- <java.demo classname="org.flexdock.demos.perspective.PerspectivesDemo" />
-- </target>
--
-- <target name="demo.xmlperspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.XMLPerspectivesDemo">
-- <java.demo classname="org.flexdock.demos.perspective.XMLPerspectivesDemo" />
-- </target>
--
-- <target name="demo.adapter" depends="resources,compile" description="Run org.flexdock.demos.raw.adapter.AdapterDemo">
-- <java.demo classname="org.flexdock.demos.raw.adapter.AdapterDemo" />
-- </target>
--
-- <target name="demo.border" depends="resources,compile" description="Run org.flexdock.demos.raw.border.BorderDemo">
-- <java.demo classname="org.flexdock.demos.raw.border.BorderDemo" />
-- </target>
--
-- <target name="demo.compound" depends="resources,compile" description="Run org.flexdock.demos.raw.CompoundDemo">
-- <java.demo classname="org.flexdock.demos.raw.CompoundDemo" />
-- </target>
--
-- <target name="demo.elegant" depends="resources,compile" description="Run org.flexdock.demos.raw.elegant.ElegantDemo">
-- <java.demo classname="org.flexdock.demos.raw.elegant.ElegantDemo" />
-- </target>
--
-- <target name="demo.jmf" depends="resources,compile" description="Run org.flexdock.demos.raw.jmf.JMFDemo">
-- <java.demo classname="org.flexdock.demos.raw.jmf.JMFDemo" />
-- </target>
--
-- <target name="demo.simple" depends="resources,compile" description="Run org.flexdock.demos.raw.SimpleDemo">
-- <java.demo classname="org.flexdock.demos.raw.SimpleDemo" />
-- </target>
--
-- <target name="demo.splitpane" depends="resources,compile" description="Run org.flexdock.demos.raw.SplitPaneDemo">
-- <java.demo classname="org.flexdock.demos.raw.SplitPaneDemo" />
-- </target>
--
-- <target name="demo.tabbedpane" depends="resources,compile" description="Run org.flexdock.demos.raw.TabbedPaneDemo">
-- <java.demo classname="org.flexdock.demos.raw.TabbedPaneDemo" />
-- </target>
--
-- <target name="demo.view" depends="resources,compile" description="Run org.flexdock.demos.view.ViewDemo">
-- <java.demo classname="org.flexdock.demos.view.ViewDemo" />
-- </target>
--
-
- <!-- define a java task preset to run tests forked from the test bin dir with the right stuff in the classpath -->
- <presetdef name="java.test">
+ <java fork="yes" dir="${bin.dir.demo}" classpathref="rt.classpath.demo" />
+ </presetdef>
+
+- <!-- Targets to run demos -->
+-
+- <target name="demo" depends="resources,compile" description="Run org.flexdock.demos.AllDemos">
+- <java.demo classname="org.flexdock.demos.AllDemos" />
+- </target>
+-
+- <target name="demo.maximizing" depends="resources,compile" description="Run org.flexdock.demos.maximizing.MaximizationDemo">
+- <java.demo classname="org.flexdock.demos.perspective.MaximizationDemo" />
+- </target>
+-
+- <target name="demo.perspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.PerspectivesDemo">
+- <java.demo classname="org.flexdock.demos.perspective.PerspectivesDemo" />
+- </target>
+-
+- <target name="demo.xmlperspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.XMLPerspectivesDemo">
+- <java.demo classname="org.flexdock.demos.perspective.XMLPerspectivesDemo" />
+- </target>
+-
+- <target name="demo.adapter" depends="resources,compile" description="Run org.flexdock.demos.raw.adapter.AdapterDemo">
+- <java.demo classname="org.flexdock.demos.raw.adapter.AdapterDemo" />
+- </target>
+-
+- <target name="demo.border" depends="resources,compile" description="Run org.flexdock.demos.raw.border.BorderDemo">
+- <java.demo classname="org.flexdock.demos.raw.border.BorderDemo" />
+- </target>
+-
+- <target name="demo.compound" depends="resources,compile" description="Run org.flexdock.demos.raw.CompoundDemo">
+- <java.demo classname="org.flexdock.demos.raw.CompoundDemo" />
+- </target>
+-
+- <target name="demo.elegant" depends="resources,compile" description="Run org.flexdock.demos.raw.elegant.ElegantDemo">
+- <java.demo classname="org.flexdock.demos.raw.elegant.ElegantDemo" />
+- </target>
+-
+- <target name="demo.jmf" depends="resources,compile" description="Run org.flexdock.demos.raw.jmf.JMFDemo">
+- <java.demo classname="org.flexdock.demos.raw.jmf.JMFDemo" />
+- </target>
+-
+- <target name="demo.simple" depends="resources,compile" description="Run org.flexdock.demos.raw.SimpleDemo">
+- <java.demo classname="org.flexdock.demos.raw.SimpleDemo" />
+- </target>
+-
+- <target name="demo.splitpane" depends="resources,compile" description="Run org.flexdock.demos.raw.SplitPaneDemo">
+- <java.demo classname="org.flexdock.demos.raw.SplitPaneDemo" />
+- </target>
+-
+- <target name="demo.tabbedpane" depends="resources,compile" description="Run org.flexdock.demos.raw.TabbedPaneDemo">
+- <java.demo classname="org.flexdock.demos.raw.TabbedPaneDemo" />
+- </target>
+-
+- <target name="demo.view" depends="resources,compile" description="Run org.flexdock.demos.view.ViewDemo">
+- <java.demo classname="org.flexdock.demos.view.ViewDemo" />
+- </target>
+-
+
+ <!-- define a java task preset to run tests forked from the test bin dir with the right stuff in the classpath -->
+ <presetdef name="java.test">
@@ -555,9 +503,7 @@
- <fileset dir="${webstart.src}"/>
- <filterset begintoken="@" endtoken="@">
- <filter token="VERSION" value="${version}"/>
-- <filter token="DEMO_JAR_NAME" value="${dist.demo.jar.name}"/>
- <filter token="FRAMEWORK_JAR_NAME" value="${dist.jar.name}"/>
-- <filter token="JMF_JAR_NAME" value="jmf.jar"/>
- <filter token="APACHE_LOGGING" value="commons-logging-1.1.jar"/>
- <filter token="LOOKS" value="looks-2.1.1.jar"/>
- <filter token="SKIN_LF" value="skinlf.jar"/>
+ <fileset dir="${webstart.src}"/>
+ <filterset begintoken="@" endtoken="@">
+ <filter token="VERSION" value="${version}"/>
+- <filter token="DEMO_JAR_NAME" value="${dist.demo.jar.name}"/>
+ <filter token="FRAMEWORK_JAR_NAME" value="${dist.jar.name}"/>
+- <filter token="JMF_JAR_NAME" value="jmf.jar"/>
+ <filter token="APACHE_LOGGING" value="commons-logging-1.1.jar"/>
+ <filter token="LOOKS" value="looks-2.1.1.jar"/>
+ <filter token="SKIN_LF" value="skinlf.jar"/>
@@ -567,12 +513,6 @@
- jarname="${build.dir}/${dist.jar.name}"
- sjarname="${bin.dir.webstart}/${dist.jar.name}"/>
- <mysignjar
-- jarname="${build.dir}/${dist.demo.jar.name}"
-- sjarname="${bin.dir.webstart}/${dist.demo.jar.name}"/>
-- <mysignjar
-- jarname="${build.dir}/lib/jmf/lib/jmf.jar"
-- sjarname="${bin.dir.webstart}/jmf.jar"/>
-- <mysignjar
- jarname="${build.dir}/lib/commons-logging-1.1.jar"
- sjarname="${bin.dir.webstart}/commons-logging-1.1.jar"/>
- <mysignjar
+ jarname="${build.dir}/${dist.jar.name}"
+ sjarname="${bin.dir.webstart}/${dist.jar.name}"/>
+ <mysignjar
+- jarname="${build.dir}/${dist.demo.jar.name}"
+- sjarname="${bin.dir.webstart}/${dist.demo.jar.name}"/>
+- <mysignjar
+- jarname="${build.dir}/lib/jmf/lib/jmf.jar"
+- sjarname="${bin.dir.webstart}/jmf.jar"/>
+- <mysignjar
+ jarname="${build.dir}/lib/commons-logging-1.1.jar"
+ sjarname="${bin.dir.webstart}/commons-logging-1.1.jar"/>
+ <mysignjar
diff --git a/flexdock-generate-tarball.sh b/flexdock-generate-tarball.sh
old mode 100644
new mode 100755
index d34dfc2..2eb01fd
--- a/flexdock-generate-tarball.sh
+++ b/flexdock-generate-tarball.sh
@@ -1,31 +1,37 @@
#!/bin/bash
VERSION=$1
+UNDERSCORED_VERSION=$(echo $VERSION |sed 's/\./_/g')
#ensure version
if [ x$VERSION == "x" ] ; then
echo Please provide version as argument
- exit
+ exit 1
fi
-#Original source located at:
+rm -rf flexdock-$VERSION flexdock-$VERSION.tar.gz
+if [ x`which svn` = x"" ] ; then
+ echo "SVN not found. Please install svn."
+ exit 1
+fi
+
+#Get original source out of repository on java.net
+svn export https://svn.java.net/svn/flexdock~svn/tags/flexdock_$UNDERSCORED_VERSION
-rm -rf flexdock-$VERSION
pushd .
-mkdir flexdock-$VERSION
+mv flexdock_$UNDERSCORED_VERSION flexdock-$VERSION
cd flexdock-$VERSION
-unzip ../flexdock-$VERSION-src.zip
-#ensure unzip OK
-if [ $? != 0 ] ; then
- echo Unzip failed. Aborting.
- exit
-fi
+
+#remove the website copy
+rm -rf ./www
#remove unpackagable Java media framework
rm -rf ./lib/jmf
#Remove unneeded jars, seeing as we are repackaging
rm -f ./lib/*.jar
-tar -czvf ../flexdock-$VERSION-clean.tar.gz ./
+
popd
+tar -czvf flexdock-$VERSION.tar.gz flexdock-$VERSION
+
diff --git a/flexdock-jni.patch b/flexdock-jni.patch
index 5a9037e..2ff6eb8 100644
--- a/flexdock-jni.patch
+++ b/flexdock-jni.patch
@@ -1,12 +1,12 @@
--- ./src/java/core/org/flexdock/util/ResourceManager.java 2007-01-02 10:15:46.000000000 +1100
-+++ - 2008-10-26 19:41:32.207448092 +1100
++++ ./src/java/core/org/flexdock/util/ResourceManager.java 2008-10-26 19:41:32.207448092 +1100
@@ -313,7 +313,8 @@
- }
-
- // determine a file from which we can load our library.
-- File file = new File(System.getProperty("user.home") + "/flexdock");
-+ // FEDORA PATCH -- Override java search location
-+ File file = new File("%{_libdir}/%{name}");
- file.mkdirs();
- file = new File(file.getAbsolutePath() + "/" + library
- + LIBRARY_EXTENSION);
+ }
+
+ // determine a file from which we can load our library.
+- File file = new File(System.getProperty("user.home") + "/flexdock");
++ // FEDORA PATCH -- Override java search location
++ File file = new File("%{_libdir}/%{name}");
+ file.mkdirs();
+ file = new File(file.getAbsolutePath() + "/" + library
+ + LIBRARY_EXTENSION);
diff --git a/flexdock-nojmf.patch b/flexdock-nojmf.patch
index d613c05..7def2f9 100644
--- a/flexdock-nojmf.patch
+++ b/flexdock-nojmf.patch
@@ -1,10 +1,10 @@
--- src/java/demo/org/flexdock/demos/AllDemos.java 2007-01-11 15:52:00.000000000 +1100
-+++ src/java/demo/org/flexdock/demos/AllDemos.java.new 2008-10-27 07:53:10.000000000 +1100
++++ src/java/demo/org/flexdock/demos/AllDemos.java 2008-10-27 07:53:10.000000000 +1100
@@ -33,7 +33,6 @@
- "org.flexdock.demos.raw.border.BorderDemo",
- "org.flexdock.demos.raw.CompoundDemo",
- "org.flexdock.demos.raw.elegant.ElegantDemo",
-- "org.flexdock.demos.raw.jmf.JMFDemo",
- "org.flexdock.demos.raw.SimpleDemo",
- "org.flexdock.demos.raw.SplitPaneDemo",
- "org.flexdock.demos.raw.TabbedPaneDemo",
+ "org.flexdock.demos.raw.border.BorderDemo",
+ "org.flexdock.demos.raw.CompoundDemo",
+ "org.flexdock.demos.raw.elegant.ElegantDemo",
+- "org.flexdock.demos.raw.jmf.JMFDemo",
+ "org.flexdock.demos.raw.SimpleDemo",
+ "org.flexdock.demos.raw.SplitPaneDemo",
+ "org.flexdock.demos.raw.TabbedPaneDemo",
diff --git a/flexdock-skinlfPainter-path.patch b/flexdock-skinlfPainter-path.patch
index 92fcb15..20d7dfc 100644
--- a/flexdock-skinlfPainter-path.patch
+++ b/flexdock-skinlfPainter-path.patch
@@ -1,11 +1,11 @@
--- src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFPainter.java 2005-04-30 19:43:46.000000000 +1000
-+++ src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFPainter.java.new 2008-11-24 02:16:28.000000000 +1100
++++ src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFPainter.java 2008-11-24 02:16:28.000000000 +1100
@@ -1,7 +1,7 @@
- /*
- * Created on 15.04.2005
- */
--package org.flexdock.plaf.theme.skinlf;
-+package com.flexdock.plaf.theme.skinlf;
-
- import java.awt.Graphics;
-
+ /*
+ * Created on 15.04.2005
+ */
+-package org.flexdock.plaf.theme.skinlf;
++package com.flexdock.plaf.theme.skinlf;
+
+ import java.awt.Graphics;
+
diff --git a/flexdock-skinlfTitlebarui-path.patch b/flexdock-skinlfTitlebarui-path.patch
index 5f02190..89c76d4 100644
--- a/flexdock-skinlfTitlebarui-path.patch
+++ b/flexdock-skinlfTitlebarui-path.patch
@@ -1,11 +1,11 @@
--- src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFTitlebarUI.java 2005-04-30 19:43:46.000000000 +1000
-+++ src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFTitlebarUI.java.new 2008-11-24 02:17:10.000000000 +1100
++++ src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFTitlebarUI.java 2008-11-24 02:17:10.000000000 +1100
@@ -1,7 +1,7 @@
- /*
- * Created on 17.04.2005
- */
--package org.flexdock.plaf.theme.skinlf;
-+package com.flexdock.plaf.theme.skinlf;
-
- import java.awt.Graphics;
- import java.awt.Rectangle;
+ /*
+ * Created on 17.04.2005
+ */
+-package org.flexdock.plaf.theme.skinlf;
++package com.flexdock.plaf.theme.skinlf;
+
+ import java.awt.Graphics;
+ import java.awt.Rectangle;
diff --git a/flexdock.spec b/flexdock.spec
index 69e7e21..edfbcda 100644
--- a/flexdock.spec
+++ b/flexdock.spec
@@ -1,6 +1,6 @@
Name: flexdock
-Version: 0.5.1
-Release: 19%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
Summary: Docking framework for Java Swing GUI apps
Group: Development/Libraries
@@ -9,12 +9,12 @@ Group: Development/Libraries
License: MIT
URL: https://flexdock.dev.java.net/
-Source0: %{name}-%{version}-clean.tar.gz
+Source0: %{name}-%{version}.tar.gz
-# Original Source# Contains code that we cannot ship.
-# Download the upstream tarball and invoke this script while in the
-# tarball's directory
-Source1: %{name}-generate-tarball.sh
+# Invoke this script to download and remove non-free components
+# * Original Source# contains code that we cannot ship.
+# * Upstream does not provide a tarball
+Source1: %{name}-generate-tarball.sh
# This patch is fedora specific -- System.loadLibrary fix to help locate JNI components
Patch0: flexdock-jni.patch
@@ -51,7 +51,7 @@ FlexDock is a Java docking framework for use in cross-platform
Swing applications.
%prep
-%setup -qc
+%setup -q
#Modify the jni dir that is hardcoded in the patch
cp %{PATCH0} ./tmpJniPatch
@@ -137,6 +137,11 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 16 2011 Clément David <c.david86 at gmail.com> 0.5.2-1
+- Bump version
+- Normalize patches
+- Normalize tarball name and root
+
* Thu Jun 23 2011 <mycae(a!t)yahoo.com> 0.5.1-19
- Fix FTBFS bug 715626 - classpath change
More information about the scm-commits
mailing list