[flexdock] Update version
Clément David
davidcl at fedoraproject.org
Thu Jan 3 09:17:03 UTC 2013
commit cefaecc466a139d0fd0b7e0c5487051c6e063529
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date: Thu Jan 3 10:16:42 2013 +0100
Update version
.gitignore | 4 +-
...exdock-nojmf.patch => flexdock-0001-nojmf.patch | 21 +------------------
...build.patch => flexdock-0002-fedora-build.patch | 18 +---------------
flexdock.spec | 15 ++++++++-----
sources | 2 +-
5 files changed, 16 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af5ce6d..1bdb943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
/flexdock-*.tar.gz
+flexdock-*/
clog
*~
*.rpm
results_flexdock/
-
-/flexdock-1.2.0-src.zip
+.build*.log
diff --git a/0001-flexdock-nojmf.patch b/flexdock-0001-nojmf.patch
similarity index 75%
rename from 0001-flexdock-nojmf.patch
rename to flexdock-0001-nojmf.patch
index 64aa477..8a49e1d 100644
--- a/0001-flexdock-nojmf.patch
+++ b/flexdock-0001-nojmf.patch
@@ -1,15 +1,3 @@
-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 @@
@@ -39,7 +27,7 @@ index ccb4644..7ae6c41 100644
<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:
+@@ -424,7 +418,6 @@ The signing.properties file must specify
<filter token="VERSION" value="${version}"/>
<filter token="DEMO_JAR_NAME" value="${dist.demo.jar.name}"/>
<filter token="FRAMEWORK_JAR_NAME" value="${dist.jar.name}"/>
@@ -47,7 +35,7 @@ index ccb4644..7ae6c41 100644
<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:
+@@ -435,9 +428,6 @@ The signing.properties file must specify
<mysignjar
jarname="${build.dir}/${dist.demo.jar.name}"
sjarname="${bin.dir.webstart}/${dist.demo.jar.name}"/>
@@ -57,8 +45,6 @@ index ccb4644..7ae6c41 100644
<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 {
@@ -69,6 +55,3 @@ index 82d586d..be17b31 100644
"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/flexdock-0002-fedora-build.patch
similarity index 73%
rename from 0002-flexdock-build.patch
rename to flexdock-0002-fedora-build.patch
index fd50b30..9776a0e 100644
--- a/0002-flexdock-build.patch
+++ b/flexdock-0002-fedora-build.patch
@@ -1,14 +1,3 @@
-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,8 @@
@@ -21,7 +10,7 @@ index 7ae6c41..847a4dc 100644
</path>
<path id="javac.classpath.test">
<path refid="javac.classpath" />
-@@ -104,7 +104,7 @@
+@@ -104,7 +105,7 @@
<condition property="os.unixWithXlib">
<and>
<os family="unix"/>
@@ -30,7 +19,7 @@ index 7ae6c41..847a4dc 100644
</and>
</condition>
</target>
-@@ -199,7 +199,6 @@
+@@ -199,7 +200,6 @@
I believe this BUG is the cause: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4490798 -->
<manifest>
<!-- matches core jar name -->
@@ -38,6 +27,3 @@ index 7ae6c41..847a4dc 100644
<attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
</manifest>
</jar>
---
-1.7.7.6
-
diff --git a/flexdock.spec b/flexdock.spec
index dac2777..b38c8b5 100644
--- a/flexdock.spec
+++ b/flexdock.spec
@@ -1,6 +1,6 @@
Name: flexdock
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: Docking framework for Java Swing GUI apps
Group: Development/Libraries
@@ -9,12 +9,12 @@ Group: Development/Libraries
License: MIT
URL: http://forge.scilab.org/index.php/p/flexdock/
-Source0: http://forge.scilab.org/index.php/p/flexdock/downloads/get/%{name}-%{version}-src.zip
+Source0: http://forge.scilab.org/index.php/p/flexdock/downloads/get/%{name}-%{version}.tar.gz
#Removes the java media framework from the demos to satisfy reqs
-Patch1: 0001-flexdock-nojmf.patch
+Patch1: flexdock-0001-nojmf.patch
#Modifies the build process -- fedora specific
-Patch2: 0002-flexdock-build.patch
+Patch2: flexdock-0002-fedora-build.patch
BuildRequires: java-devel
BuildRequires: ant
@@ -36,7 +36,7 @@ FlexDock is a Java docking framework for use in cross-platform
Swing applications.
%prep
-%setup -cq
+%setup -q
%patch1 -p1
%patch2 -p1
@@ -70,6 +70,9 @@ install -pm644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%{_javadir}/*
%changelog
+* Thu Jan 03 2013 Clément David <c.david86 at gmail.com> - 1.2.1-1
+- Update version
+
* Fri Jul 27 2012 Clément David <c.david86 at gmail.com> - 1.2.0-2
- Add the jcommons-logging dependency
diff --git a/sources b/sources
index 802e0b1..1b33df7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d61f4e2d5630cf31cbea749be60e7ffa flexdock-1.2.0-src.zip
+c1bd65e03a4049357f2b5904ac7b718d flexdock-1.2.1.tar.gz
More information about the scm-commits
mailing list