[flexdock/f15] * Fix FTBFS 715626
mycae
mycae at fedoraproject.org
Thu Jun 23 20:43:16 UTC 2011
commit 7dae2217e3dbe92d8373fed6f8e0b1a3040d3c15
Author: mycae <mycae(atime)yahoo.com>
Date: Thu Jun 23 21:42:38 2011 +0100
* Fix FTBFS 715626
flexdock.spec | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 deletions(-)
---
diff --git a/flexdock.spec b/flexdock.spec
index 81b0ad0..69e7e21 100644
--- a/flexdock.spec
+++ b/flexdock.spec
@@ -1,6 +1,6 @@
Name: flexdock
Version: 0.5.1
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Docking framework for Java Swing GUI apps
Group: Development/Libraries
@@ -28,7 +28,6 @@ Patch3: flexdock-skinlfTitlebarui-path.patch
Patch4: flexdock-skinlfPainter-path.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,27 +75,6 @@ find ./ -name \*.so -exec rm {} \;
#JAR "dependency" handling
#==========
-#delete and symlink any jar files we know about
-
-#rm commands commented out, as we delete these
-#at repackage time
-
-# Apache commons Logging component
-# http://commons.apache.org/logging/
-#rm -f lib/commons-logging-1.1.jar
-
-#remove jmf, as it is only used in a demo,
-#which is unused after patching
-#rm -rf lib/jmf
-
-#" Looks" project
-# https://looks.dev.java.net/
-#rm -f lib/looks-2.1.1.jar
-
-#skinlf "Skin look and Feel" project
-# https://skinlf.dev.java.net/
-#rm -f lib/skinlf.jar
-
build-jar-repository -s -p lib commons-logging skinlf jgoodies-looks.jar
@@ -126,7 +104,7 @@ do
done
%build
-export CLASSPATH=$(build-classpath jgoodies-looks skinlf)
+export CLASSPATH=$(build-classpath jgoodies-looks skinlf commons-logging)
ant -v -Dbuild.sysclasspath=first build.with.native jar
ant -v -Dbuild.sysclasspath=first compile.native
@@ -159,39 +137,52 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 23 2011 <mycae(a!t)yahoo.com> 0.5.1-19
+- Fix FTBFS bug 715626 - classpath change
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-17
- tag bump
+
* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-16
- tag bump
+
* Sat Dec 19 2009 <mycae(a!t)yahoo.com> 0.5.1-15
- Fix patch to match sed expression
- Don't modify jni patch in-place
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Sat Mar 28 2009 <mycae(a!t)yahoo.com> 0.5.1-13
- Version bump due to tag mess
+
* Thu Mar 26 2009 <mycae(a!t)yahoo.com> 0.5.1-12
- Added a named symlink to versioned jar
+
* Tue Feb 24 2009 <mycae(a!t)yahoo.com> 0.5.1-11
- Created clean tarball to remove jmf
+
* Thu Feb 19 2009 <mycae(a!t)yahoo.com> 0.5.1-10
- Applied patch from Dominik 'Rathann' Mierzejewski
- Added BuildRequires for apache-regexp (needed for F9)
- Removed overly complex java detection
+
* Thu Jan 21 2009 <mycae(a!t)yahoo.com> 0.5.1-9
- Alter the way I handle stripping of the SOFILE
- Alphabetically sort build and buildrequires
- Add full stop & de-indent description
- Use build-jar-repository
- Change sdk.home from OR to case statment
+
* Tue Jan 20 2009 <mycae(a!t)yahoo.com> 0.5.1-8
- Set defattr
- Fix arch (again)
- Change install dir from %%libdir to %%libdir/%%name
- Update patch0 to match changed so dir + make dynamic
+
* Sat Dec 20 2008 <mycae(a!t)yahoo.com> 0.5.1-7
- Re-enable system skinlf link & jar check.
More information about the scm-commits
mailing list