[flexdock: 1/2] Update version
Clément David
davidcl at fedoraproject.org
Wed Jul 25 16:23:34 UTC 2012
commit f7bb345966aece93e1c246b17b7846ffc2b32540
Author: Clément DAVID <c.david86 at gmail.com>
Date: Wed Jul 25 18:19:02 2012 +0200
Update version
- Change website url
- Remove the generate tarball script
.gitignore | 1 +
0001-flexdock-jni.patch | 26 --------
0001-flexdock-nojmf.patch | 74 +++++++++++++++++++++++
0002-flexdock-build.patch | 42 +++++++++++++
0002-flexdock-nojmf.patch | 24 --------
0003-flexdock-build.patch | 133 ------------------------------------------
0004-flexdock-skinlf.patch | 39 ------------
flexdock-generate-tarball.sh | 37 ------------
flexdock.spec | 42 +++++---------
sources | 2 +-
10 files changed, 133 insertions(+), 287 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bdcca3e..af5ce6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
*.rpm
results_flexdock/
+/flexdock-1.2.0-src.zip
diff --git a/0001-flexdock-nojmf.patch b/0001-flexdock-nojmf.patch
new file mode 100644
index 0000000..64aa477
--- /dev/null
+++ b/0001-flexdock-nojmf.patch
@@ -0,0 +1,74 @@
+From 98103fbba413ed9f7cc424adac4f87e1e6b13b0f Mon Sep 17 00:00:00 2001
+From: Clement David <davidcl at fedoraproject.org>
+Date: Wed, 25 Jul 2012 18:02:45 +0200
+Subject: [PATCH 1/2] flexdock-nojmf
+
+---
+ build.xml | 10 ----------
+ src/java/demo/org/flexdock/demos/AllDemos.java | 1 -
+ 2 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index ccb4644..7ae6c41 100644
+--- a/build.xml
++++ b/build.xml
+@@ -49,7 +49,6 @@
+ </path>
+ <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" />
+ </path>
+ <path id="javac.classpath.test">
+@@ -62,7 +61,6 @@
+ </path>
+ <path id="rt.classpath.demo">
+ <pathelement location="${bin.dir.demo}"/>
+- <pathelement location="${lib.dir}/jmf.jar"/><!-- needed only for JMF demo -->
+ <pathelement location="${bin.dir}"/>
+ </path>
+ <path id="rt.classpath.test">
+@@ -315,10 +313,6 @@
+ <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>
+@@ -424,7 +418,6 @@ The signing.properties file must specify all of the following properties:
+ <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="LOOKS" value="looks-2.1.1.jar"/>
+ <filter token="SKIN_LF" value="skinlf.jar"/>
+ </filterset>
+@@ -435,9 +428,6 @@ The signing.properties file must specify all of the following properties:
+ <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/looks-2.1.1.jar"
+ sjarname="${bin.dir.webstart}/looks-2.1.1.jar"/>
+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.6
+
diff --git a/0002-flexdock-build.patch b/0002-flexdock-build.patch
new file mode 100644
index 0000000..0611d8f
--- /dev/null
+++ b/0002-flexdock-build.patch
@@ -0,0 +1,42 @@
+From 878b5f7c1c1092e892a6d0f51bbe5104dd2cff18 Mon Sep 17 00:00:00 2001
+From: Clement David <davidcl at fedoraproject.org>
+Date: Wed, 25 Jul 2012 18:05:19 +0200
+Subject: [PATCH 2/2] flexdock-build
+
+---
+ build.xml | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 7ae6c41..847a4dc 100644
+--- a/build.xml
++++ b/build.xml
+@@ -49,7 +49,7 @@
+ </path>
+ <path id="javac.classpath.demo">
+ <path refid="javac.classpath" />
+- <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" />
+@@ -104,7 +104,7 @@
+ <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>
+@@ -199,7 +199,6 @@
+ 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="Main-Class" value="org.flexdock.demos.AllDemos"/>
+ </manifest>
+ </jar>
+--
+1.7.7.6
+
diff --git a/flexdock.spec b/flexdock.spec
index eccdb26..eb3ab7a 100644
--- a/flexdock.spec
+++ b/flexdock.spec
@@ -1,5 +1,5 @@
Name: flexdock
-Version: 1.1.1
+Version: 1.2.0
Release: 1%{?dist}
Summary: Docking framework for Java Swing GUI apps
@@ -7,23 +7,14 @@ Group: Development/Libraries
#Licence is MIT on their website
License: MIT
-URL: https://flexdock.dev.java.net/
+URL: http://forge.scilab.org/index.php/p/flexdock/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://forge.scilab.org/index.php/p/flexdock/downloads/get/%{name}-%{version}-src.zip
-# 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
-Patch1: 0001-flexdock-jni.patch
#Removes the java media framework from the demos to satisfy reqs
-Patch2: 0002-flexdock-nojmf.patch
-#Modifies the build process -- fedora specific
-Patch3: 0003-flexdock-build.patch
-#Fixes the skinlf search paths in the skinlf.jar
-Patch4: 0004-flexdock-skinlf.patch
+Patch1: 0001-flexdock-nojmf.patch
+#fix some build path
+Patch2: 0002-flexdock-build.patch
BuildRequires: java-devel
BuildRequires: ant
@@ -43,18 +34,10 @@ FlexDock is a Java docking framework for use in cross-platform
Swing applications.
%prep
-%setup -q
-
-#Modify the jni dir that is hardcoded in the patch
-cp %{PATCH1} ./tmpJniPatch
-sed -i 's!%%{_jnidir}!%{_jnidir}!' tmpJniPatch
+%setup -cq
-#Apply patches
-#Apply patch0
-patch -p1 --fuzz=0 < tmpJniPatch
+%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
#Override the build file's default hard-coded paths
echo "sdk.home=%{java_home}" > workingcopy.properties
@@ -68,7 +51,7 @@ rm src/java/demo/org/flexdock/demos/raw/jmf/MediaPanel.java
rm src/java/demo/org/flexdock/demos/raw/jmf/JMFDemo.java
#Endline convert Doc files
-for i in "README-RELEASE LICENSE.txt README release-notes.txt" ;
+for i in "LICENSE.txt README release-notes.txt" ;
do
%{__sed} -i 's/\r//' $i
done
@@ -81,10 +64,15 @@ mkdir -p %{buildroot}%{_javadir}
install -pm644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%files
-%doc LICENSE.txt README README-RELEASE release-notes.txt
+%doc LICENSE.txt README release-notes.txt
%{_javadir}/*
%changelog
+* Wed Jul 25 2012 Clément David <c.david86 at gmail.com> - 1.2.0-1
+- Update version
+- Change website url
+- Remove the generate tarball script
+
* Tue Jan 17 2012 Clément David <davidcl at fedoraproject.org> 1.1.1-1
- Update version
- Rebase patches (thanks to git format-patch)
diff --git a/sources b/sources
index fafbde2..802e0b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82c73b240f279fe53cfe0a6077dddc7b flexdock-1.1.1.tar.gz
+d61f4e2d5630cf31cbea749be60e7ffa flexdock-1.2.0-src.zip
More information about the scm-commits
mailing list