[flexdock] Update version Rebase patches (thanks to git format-patch)
Clément David
davidcl at fedoraproject.org
Tue Jan 17 14:10:31 UTC 2012
commit 8cbb76056b617b36e7572519ce91c19d6273afec
Author: Clément DAVID <c.david86 at gmail.com>
Date: Tue Jan 17 11:14:00 2012 +0100
Update version
Rebase patches (thanks to git format-patch)
.gitignore | 8 +-
0001-flexdock-jni.patch | 26 +++++++
0002-flexdock-nojmf.patch | 24 ++++++
flexdock-build.patch => 0003-flexdock-build.patch | 83 +++++++++++++--------
0004-flexdock-skinlf.patch | 39 ++++++++++
flexdock-jni.patch | 12 ---
flexdock-nojmf.patch | 10 ---
flexdock-skinlfPainter-path.patch | 11 ---
flexdock-skinlfTitlebarui-path.patch | 11 ---
flexdock.spec | 64 ++++++----------
sources | 2 +-
11 files changed, 169 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 485991b..bdcca3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-flexdock-0.5.1-clean.tar.gz
-/flexdock-0.5.2.tar.gz
-/flexdock-0.5.4.tar.gz
-/flexdock-1.0.tar.gz
+/flexdock-*.tar.gz
clog
*~
+*.rpm
+results_flexdock/
+
diff --git a/0001-flexdock-jni.patch b/0001-flexdock-jni.patch
new file mode 100644
index 0000000..3b2906a
--- /dev/null
+++ b/0001-flexdock-jni.patch
@@ -0,0 +1,26 @@
+From bc96317d5f591081366d09dab1b8fdeb3501b2d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Fri, 23 Dec 2011 07:40:54 +0100
+Subject: [PATCH 1/4] flexdock-jni
+
+---
+ .../core/org/flexdock/util/ResourceManager.java | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/java/core/org/flexdock/util/ResourceManager.java b/src/java/core/org/flexdock/util/ResourceManager.java
+index 7b6d875..f57c418 100644
+--- a/src/java/core/org/flexdock/util/ResourceManager.java
++++ b/src/java/core/org/flexdock/util/ResourceManager.java
+@@ -312,7 +312,8 @@ public class ResourceManager {
+ }
+
+ // 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("%{_jnidir}");
+ file.mkdirs();
+ file = new File(file.getAbsolutePath() + "/" + library
+ + LIBRARY_EXTENSION);
+--
+1.7.7.5
+
diff --git a/0002-flexdock-nojmf.patch b/0002-flexdock-nojmf.patch
new file mode 100644
index 0000000..e98bede
--- /dev/null
+++ b/0002-flexdock-nojmf.patch
@@ -0,0 +1,24 @@
+From 8acc21bc1cbfecd3b8c15e60c21a31b08f00fced Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Fri, 23 Dec 2011 07:41:14 +0100
+Subject: [PATCH 2/4] flexdock-nojmf
+
+---
+ src/java/demo/org/flexdock/demos/AllDemos.java | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/java/demo/org/flexdock/demos/AllDemos.java b/src/java/demo/org/flexdock/demos/AllDemos.java
+index 82d586d..be17b31 100644
+--- a/src/java/demo/org/flexdock/demos/AllDemos.java
++++ b/src/java/demo/org/flexdock/demos/AllDemos.java
+@@ -32,7 +32,6 @@ public class AllDemos extends JFrame {
+ "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",
+--
+1.7.7.5
+
diff --git a/flexdock-build.patch b/0003-flexdock-build.patch
similarity index 66%
rename from flexdock-build.patch
rename to 0003-flexdock-build.patch
index 63a5bff..7e53ddc 100644
--- a/flexdock-build.patch
+++ b/0003-flexdock-build.patch
@@ -1,34 +1,44 @@
---- build.xml 2008-12-10 20:54:53.000000000 +1100
-+++ build.xml 2008-12-10 20:55:13.000000000 +1100
-@@ -118,7 +118,8 @@
+From aa9b0f6aa6294773fb91449a124fef5864849625 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Fri, 23 Dec 2011 07:41:24 +0100
+Subject: [PATCH 3/4] flexdock-build
+
+---
+ build.xml | 74 +++++--------------------------------------------------------
+ 1 files changed, 6 insertions(+), 68 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 7dc1be1..145b5cf 100644
+--- a/build.xml
++++ b/build.xml
+@@ -59,7 +59,7 @@
+ <path id="javac.classpath.demo">
+ <path refid="javac.classpath" />
+ <pathelement location="${lib.dir}/jmf/lib/jmf.jar" />
+- <pathelement location="${lib.dir}/looks-2.1.1.jar" />
++ <pathelement location="${lib.dir}/jgoodies-looks.jar" />
+ </path>
+ <path id="javac.classpath.test">
+ <path refid="javac.classpath" />
+@@ -115,7 +115,7 @@
<condition property="os.unixWithXlib">
<and>
<os family="unix"/>
- <available file="/usr/X11R6/include/X11/Xlib.h"/>
-+ <available file="/usr/include/X11/Xlib.h"/>
-+
++ <available file="/usr/include/X11/Xlib.h"/>
</and>
</condition>
</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>
-@@ -414,60 +416,6 @@
+@@ -209,7 +209,7 @@
+ I believe this BUG is the cause: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4490798 -->
+ <manifest>
+ <!-- matches core jar name -->
+- <attribute name="Class-Path" value="${dist.jar.name} lib/jmf/lib/jmf.jar lib/looks-2.1.1.jar"/>
++ <attribute name="Class-Path" value="${dist.jar.name} lib/jmf/lib/jmf.jar lib/jgoodies-looks.jar"/>
+ <attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
+ </manifest>
+ </jar>
+@@ -289,60 +289,6 @@
<java fork="yes" dir="${bin.dir.demo}" classpathref="rt.classpath.demo" />
</presetdef>
@@ -89,26 +99,35 @@
<!-- 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 @@
+@@ -430,25 +376,17 @@ The signing.properties file must specify all of the following properties:
<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="LOOKS" value="looks-2.1.1.jar"/>
++ <filter token="LOOKS" value="jgoodies-looks.jar"/>
<filter token="SKIN_LF" value="skinlf.jar"/>
-@@ -567,12 +513,6 @@
+ </filterset>
+ </copy>
+ <mysignjar
jarname="${build.dir}/${dist.jar.name}"
sjarname="${bin.dir.webstart}/${dist.jar.name}"/>
- <mysignjar
+- <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}/lib/looks-2.1.1.jar"
+- sjarname="${bin.dir.webstart}/looks-2.1.1.jar"/>
++ jarname="${build.dir}/lib/jgoodies-looks.jar"
++ sjarname="${bin.dir.webstart}/jgoodies-looks.jar"/>
+ <mysignjar
+ jarname="${build.dir}/lib/skinlf.jar"
+ sjarname="${bin.dir.webstart}/skinlf.jar"/>
+--
+1.7.7.5
+
diff --git a/0004-flexdock-skinlf.patch b/0004-flexdock-skinlf.patch
new file mode 100644
index 0000000..dea7ff0
--- /dev/null
+++ b/0004-flexdock-skinlf.patch
@@ -0,0 +1,39 @@
+From 9e4039dfc2cb2a1cf82701167e6981ed5516b9a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Fri, 23 Dec 2011 07:41:39 +0100
+Subject: [PATCH 4/4] flexdock-skinlf
+
+---
+ .../flexdock/plaf/theme/skinlf/SkinLFPainter.java | 2 +-
+ .../plaf/theme/skinlf/SkinLFTitlebarUI.java | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFPainter.java b/src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFPainter.java
+index 5ede34a..a325425 100644
+--- a/src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFPainter.java
++++ b/src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFPainter.java
+@@ -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;
+
+diff --git a/src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFTitlebarUI.java b/src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFTitlebarUI.java
+index b329953..42158ca 100644
+--- a/src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFTitlebarUI.java
++++ b/src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFTitlebarUI.java
+@@ -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;
+--
+1.7.7.5
+
diff --git a/flexdock.spec b/flexdock.spec
index 18b6359..eccdb26 100644
--- a/flexdock.spec
+++ b/flexdock.spec
@@ -1,6 +1,6 @@
Name: flexdock
-Version: 1.0
-Release: 4%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
Summary: Docking framework for Java Swing GUI apps
Group: Development/Libraries
@@ -17,31 +17,27 @@ Source0: %{name}-%{version}.tar.gz
Source1: %{name}-generate-tarball.sh
# This patch is fedora specific -- System.loadLibrary fix to help locate JNI components
-Patch0: flexdock-jni.patch
+Patch1: 0001-flexdock-jni.patch
#Removes the java media framework from the demos to satisfy reqs
-Patch1: flexdock-nojmf.patch
+Patch2: 0002-flexdock-nojmf.patch
#Modifies the build process -- fedora specific
-Patch2: flexdock-build.patch
-#Fixes the skinlf search paths in the skinlf.jar (1 of 2)
-Patch3: flexdock-skinlfTitlebarui-path.patch
-#Fixes the skinlf search paths in the skinlf.jar (2 of 2)
-Patch4: flexdock-skinlfPainter-path.patch
+Patch3: 0003-flexdock-build.patch
+#Fixes the skinlf search paths in the skinlf.jar
+Patch4: 0004-flexdock-skinlf.patch
-BuildRequires: ant
-BuildRequires: ant-apache-regexp
-BuildRequires: ant-commons-logging
BuildRequires: java-devel
-BuildRequires: jgoodies-looks
+BuildRequires: ant
BuildRequires: jpackage-utils
-BuildRequires: libX11-devel
+BuildRequires: jgoodies-looks
BuildRequires: skinlf
-Requires: ant-commons-logging
-Requires: java
-Requires: jgoodies-looks
+Requires: java
Requires: jpackage-utils
+Requires: jgoodies-looks
Requires: skinlf
+BuildArch: noarch
+
%description
FlexDock is a Java docking framework for use in cross-platform
Swing applications.
@@ -50,30 +46,22 @@ Swing applications.
%setup -q
#Modify the jni dir that is hardcoded in the patch
-cp %{PATCH0} ./tmpJniPatch
+cp %{PATCH1} ./tmpJniPatch
sed -i 's!%%{_jnidir}!%{_jnidir}!' tmpJniPatch
#Apply patches
#Apply patch0
-patch -p0 --fuzz=0 < tmpJniPatch
-%patch1
-%patch2
-%patch3
-%patch4
+patch -p1 --fuzz=0 < tmpJniPatch
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
#Override the build file's default hard-coded paths
echo "sdk.home=%{java_home}" > workingcopy.properties
#JAR "dependency" handling
find ./ -name \*.jar -exec rm {} \;
-build-jar-repository -s -p lib commons-logging skinlf jgoodies-looks
-
-## Cleanup
-
-#remove *dll
-find ./ -name \*.dll -exec rm {} \;
-#remove .so files
-find ./ -name \*.so -exec rm {} \;
+build-jar-repository -s -p lib skinlf jgoodies-looks
#Remove the jmf-using demo files
rm src/java/demo/org/flexdock/demos/raw/jmf/MediaPanel.java
@@ -86,25 +74,21 @@ do
done
%build
-export CLASSPATH=$(build-classpath jgoodies-looks skinlf commons-logging)
-ant -v -Dbuild.sysclasspath=first compile.unix.lib jar
+ant jar
%install
-#flexdock has funny arch flags, such as "libRubberBand-linux-x86.so" on i386
-SOFILE=`find ./ -name libRubberBand*so`
-
-mkdir -p %{buildroot}%{_jnidir}
-install -pm755 $SOFILE %{buildroot}%{_jnidir}/libRubberBand-0.so
-
mkdir -p %{buildroot}%{_javadir}
install -pm644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%files
%doc LICENSE.txt README README-RELEASE release-notes.txt
-%{_jnidir}/*
%{_javadir}/*
%changelog
+* Tue Jan 17 2012 Clément David <davidcl at fedoraproject.org> 1.1.1-1
+- Update version
+- Rebase patches (thanks to git format-patch)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index b82e6e8..fafbde2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a507a5acccfa65a2cb77ac5aca96fe6f flexdock-1.0.tar.gz
+82c73b240f279fe53cfe0a6077dddc7b flexdock-1.1.1.tar.gz
More information about the scm-commits
mailing list