[flexdock] Bump version to 1.0

Clément David davidcl at fedoraproject.org
Fri Dec 9 13:39:50 UTC 2011


commit 6a14520c955331011baaa3d41621898a8a52e5bb
Author: Clément DAVID <c.david86 at gmail.com>
Date:   Fri Dec 9 14:35:36 2011 +0100

    Bump version to 1.0

 .gitignore           |    3 +++
 flexdock-jni.patch   |    4 ++--
 flexdock-nojmf.patch |   14 +++++++-------
 flexdock.spec        |   45 ++++++++++++++++++++++++---------------------
 sources              |    2 +-
 5 files changed, 37 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 940d4cd..485991b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +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
+clog
+*~
diff --git a/flexdock-jni.patch b/flexdock-jni.patch
index 2ff6eb8..8f51325 100644
--- a/flexdock-jni.patch
+++ b/flexdock-jni.patch
@@ -1,6 +1,6 @@
 --- ./src/java/core/org/flexdock/util/ResourceManager.java	2007-01-02 10:15:46.000000000 +1100
 +++ ./src/java/core/org/flexdock/util/ResourceManager.java	2008-10-26 19:41:32.207448092 +1100
-@@ -313,7 +313,8 @@
+@@ -313,7 +313,8 @@ public class ResourceManager {
          }
  
          // determine a file from which we can load our library.
@@ -9,4 +9,4 @@
 +        File file = new File("%{_libdir}/%{name}");
          file.mkdirs();
          file = new File(file.getAbsolutePath() + "/" + library
-                 + LIBRARY_EXTENSION);
+                         + LIBRARY_EXTENSION);
diff --git a/flexdock-nojmf.patch b/flexdock-nojmf.patch
index 7def2f9..6ee4642 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	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.spec b/flexdock.spec
index 771b5c7..b219ee2 100644
--- a/flexdock.spec
+++ b/flexdock.spec
@@ -1,34 +1,34 @@
-Name:		flexdock
-Version:	0.5.4
-Release:	1%{?dist}
-Summary:	Docking framework for Java Swing GUI apps
+Name:		    flexdock
+Version:	    1.0
+Release:	    1%{?dist}
+Summary:	    Docking framework for Java Swing GUI apps
 
-Group:		Development/Libraries
+Group:		    Development/Libraries
 
 #Licence is MIT on their website
-License:	MIT 
-URL:		https://flexdock.dev.java.net/
+License:	    MIT 
+URL:		    https://flexdock.dev.java.net/
 
-Source0:	%{name}-%{version}.tar.gz
+Source0:	    %{name}-%{version}.tar.gz
 
 # 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
+Source1:	    %{name}-generate-tarball.sh
 
 # This patch is fedora specific -- System.loadLibrary fix to help locate JNI components
-Patch0:		flexdock-jni.patch
+Patch0:		    flexdock-jni.patch
 #Removes the java media framework from the demos to satisfy reqs
-Patch1:		flexdock-nojmf.patch
+Patch1:		    flexdock-nojmf.patch
 #Modifies the build process  -- fedora specific
-Patch2:		flexdock-build.patch
+Patch2:		    flexdock-build.patch
 #Fixes the skinlf search paths in the skinlf.jar (1 of 2)
-Patch3:		flexdock-skinlfTitlebarui-path.patch
+Patch3:		    flexdock-skinlfTitlebarui-path.patch
 #Fixes the skinlf search paths in the skinlf.jar (2 of 2)
-Patch4:		flexdock-skinlfPainter-path.patch
+Patch4:		    flexdock-skinlfPainter-path.patch
 
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 BuildRequires:	ant
@@ -40,11 +40,11 @@ BuildRequires:	jpackage-utils
 BuildRequires:	libX11-devel
 BuildRequires:	skinlf
 
-Requires:	ant-commons-logging
-Requires:	java
-Requires:	jgoodies-looks
-Requires:	jpackage-utils
-Requires:	skinlf
+Requires:	    ant-commons-logging
+Requires:	    java
+Requires:	    jgoodies-looks
+Requires:	    jpackage-utils
+Requires:	    skinlf
 
 %description
 FlexDock is a Java docking framework for use in cross-platform
@@ -59,7 +59,7 @@ sed -i 's!%%{_libdir}/%%{name}!%{_libdir}/%{name}!' tmpJniPatch
 
 #Apply patches
 #Apply patch0
-patch -p 1 --fuzz=0 < tmpJniPatch
+patch -p0 --fuzz=0 < tmpJniPatch
 %patch1
 %patch2
 %patch3
@@ -143,6 +143,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec  9 2011 Clément <davidcl> David  <c.david86 at gmail.com> 1.0-1
+- Bump version
+
 * Thu Oct 13 2011 Clément David <c.david86 at gmail.com> 0.5.4-1
 - Bump version
 
diff --git a/sources b/sources
index b626591..b82e6e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfefe92b088e2a3c6661ee1d43893131  flexdock-0.5.4.tar.gz
+a507a5acccfa65a2cb77ac5aca96fe6f  flexdock-1.0.tar.gz


More information about the scm-commits mailing list