rpms/flexdock/F-10 flexdock-build.patch, NONE, 1.1 flexdock-generate-tarball.sh, NONE, 1.1 flexdock-jni.patch, NONE, 1.1 flexdock-nojmf.patch, NONE, 1.1 flexdock-skinlfPainter-path.patch, NONE, 1.1 flexdock-skinlfTitlebarui-path.patch, NONE, 1.1 flexdock.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Daniel Haley]

Author: mycae

Update of /cvs/pkgs/rpms/flexdock/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26905/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	flexdock-build.patch flexdock-generate-tarball.sh 
	flexdock-jni.patch flexdock-nojmf.patch 
	flexdock-skinlfPainter-path.patch 
	flexdock-skinlfTitlebarui-path.patch flexdock.spec import.log 
Log Message:


flexdock-build.patch:

--- NEW FILE flexdock-build.patch ---
--- build.xml	2008-12-10 20:54:53.000000000 +1100
+++ build.xml.new	2008-12-10 20:55:13.000000000 +1100
@@ -118,7 +118,8 @@
       <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>
@@ -135,7 +136,7 @@
    </target>
 
    <target name="compile" depends="init, resources"
-           description="Compile java sources for the framework, demos, and tests">
+           description="Compile java sources for the framework, and tests">
       <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" source="1.4">
          <src path="${java.src.core}" />
          <!-- the next 3 are interdependent -->
@@ -145,8 +146,6 @@
          <src path="${java.src.drag}"/>
          <src path="${java.src.perspective}"/>
       </javac>
-      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4"/>
-      <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
    </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 @@
       <java fork="yes" dir="${bin.dir.demo}" classpathref="rt.classpath.demo" />
    </presetdef>
 
-   <!-- Targets to run demos -->
-
-   <target name="demo" depends="resources,compile" description="Run org.flexdock.demos.AllDemos">
-      <java.demo classname="org.flexdock.demos.AllDemos" />
-   </target>
-
-   <target name="demo.maximizing" depends="resources,compile" description="Run org.flexdock.demos.maximizing.MaximizationDemo">
-      <java.demo classname="org.flexdock.demos.perspective.MaximizationDemo" />
-   </target>
-
-   <target name="demo.perspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.PerspectivesDemo">
-      <java.demo classname="org.flexdock.demos.perspective.PerspectivesDemo" />
-   </target>
-
-   <target name="demo.xmlperspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.XMLPerspectivesDemo">
-      <java.demo classname="org.flexdock.demos.perspective.XMLPerspectivesDemo" />
-   </target>
-
-   <target name="demo.adapter" depends="resources,compile" description="Run org.flexdock.demos.raw.adapter.AdapterDemo">
-      <java.demo classname="org.flexdock.demos.raw.adapter.AdapterDemo" />
-   </target>
-
-   <target name="demo.border" depends="resources,compile" description="Run org.flexdock.demos.raw.border.BorderDemo">
-      <java.demo classname="org.flexdock.demos.raw.border.BorderDemo" />
-   </target>
-
-   <target name="demo.compound" depends="resources,compile" description="Run org.flexdock.demos.raw.CompoundDemo">
-      <java.demo classname="org.flexdock.demos.raw.CompoundDemo" />
-   </target>
-
-   <target name="demo.elegant" depends="resources,compile" description="Run org.flexdock.demos.raw.elegant.ElegantDemo">
-      <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>
-
-   <target name="demo.splitpane" depends="resources,compile" description="Run org.flexdock.demos.raw.SplitPaneDemo">
-      <java.demo classname="org.flexdock.demos.raw.SplitPaneDemo" />
-   </target>
-
-   <target name="demo.tabbedpane" depends="resources,compile" description="Run org.flexdock.demos.raw.TabbedPaneDemo">
-      <java.demo classname="org.flexdock.demos.raw.TabbedPaneDemo" />
-   </target>
-
-   <target name="demo.view" depends="resources,compile" description="Run org.flexdock.demos.view.ViewDemo">
-      <java.demo classname="org.flexdock.demos.view.ViewDemo" />
-   </target>
-
 
    <!-- 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 @@
          <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="SKIN_LF" value="skinlf.jar"/>
@@ -567,12 +513,6 @@
           jarname="${build.dir}/${dist.jar.name}"
           sjarname="${bin.dir.webstart}/${dist.jar.name}"/>
       <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


--- NEW FILE flexdock-generate-tarball.sh ---
#!/bin/bash
VERSION=$1

#ensure version
if [ x$VERSION == "x" ] ; then
	echo Please provide version as argument
	exit
fi

#Original source located at:


rm -rf flexdock-$VERSION
pushd .
mkdir flexdock-$VERSION

cd flexdock-$VERSION
unzip ../flexdock-$VERSION-src.zip

#ensure unzip OK
if [ $? != 0 ] ; then
	echo Unzip failed. Aborting.
	exit
fi

#remove unpackagable Java media framework
rm -rf ./lib/jmf
#Remove unneeded jars, seeing as we are repackaging
rm -f ./lib/*.jar
tar -czvf ../flexdock-$VERSION-clean.tar.gz ./
popd 

flexdock-jni.patch:

--- NEW FILE flexdock-jni.patch ---
--- ./src/java/core/org/flexdock/util/ResourceManager.java	2007-01-02 10:15:46.000000000 +1100
+++ -	2008-10-26 19:41:32.207448092 +1100
@@ -313,7 +313,8 @@
         }
 
         // 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("%{_libdir}/%{name}");
         file.mkdirs();
         file = new File(file.getAbsolutePath() + "/" + library
                 + LIBRARY_EXTENSION);

flexdock-nojmf.patch:

--- NEW FILE flexdock-nojmf.patch ---
--- src/java/demo/org/flexdock/demos/AllDemos.java	2007-01-11 15:52:00.000000000 +1100
+++ src/java/demo/org/flexdock/demos/AllDemos.java.new	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",

flexdock-skinlfPainter-path.patch:

--- NEW FILE flexdock-skinlfPainter-path.patch ---
--- src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFPainter.java	2005-04-30 19:43:46.000000000 +1000
+++ src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFPainter.java.new	2008-11-24 02:16:28.000000000 +1100
@@ -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;
 

flexdock-skinlfTitlebarui-path.patch:

--- NEW FILE flexdock-skinlfTitlebarui-path.patch ---
--- src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFTitlebarUI.java	2005-04-30 19:43:46.000000000 +1000
+++ src/java/plaf/org/flexdock/plaf/theme/skinlf/SkinLFTitlebarUI.java.new	2008-11-24 02:17:10.000000000 +1100
@@ -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;


--- NEW FILE flexdock.spec ---
Name:		flexdock
Version:	0.5.1
Release:	11%{?dist}
Summary:	Docking framework for Java Swing GUI apps

Group:		Development/Libraries

#Licence is MIT on their website
License:	MIT 
URL:		https://flexdock.dev.java.net/

Source0: %{name}-%{version}-clean.tar.gz

# Original Source# Contains code that we cannot ship. 
# Download the upstream tarball and invoke this script while in the
# tarball's directory
Source1: %{name}-generate-tarball.sh

# This patch is fedora specific -- System.loadLibrary fix to help locate JNI components
Patch0:		flexdock-jni.patch
#Removes the java media framework from the demos to satisfy reqs
Patch1:		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



BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:	ant
BuildRequires:	ant-apache-regexp
BuildRequires:	ant-commons-logging
BuildRequires:	java-devel
BuildRequires:	jgoodies-looks
BuildRequires:	jpackage-utils
BuildRequires:	libX11-devel
BuildRequires:	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
Swing applications.

%prep
%setup -qc

#Modify the jni dir that is hardcoded in the patch
cp -pf %{PATCH0} %{PATCH0}.tmp
sed -i 's!%%{_libdir}/%%{name}/!%{_libdir}/%{name}/!' %{PATCH0}
#Apply patches
%patch0
%patch1
%patch2
%patch3
%patch4

#restore patch0
mv %{PATCH0}.tmp %{PATCH0}

#Override the build file's default hard-coded paths
echo "sdk.home=%{_jvmdir}/java" > workingcopy.properties

#remove *dll
find ./ -name \*.dll -exec rm  {} \;
#remove .so files
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

pushd lib
ln -s jgoodies-looks.jar looks-2.2.1.jar
ln -s commons-logging.jar commons-logging-1.1.jar
popd


JAR_files=""
for j in $(find -name \*.jar); do
if [ ! -L $j ] ; then
	JAR_files="$JAR_files $j"
	fi
done

if [ ! -z "$JAR_files" ] ; then
	echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files"
	exit 1
fi
#=========

#Endline convert Doc files
for i in "README-RELEASE LICENSE.txt README release-notes.txt" ;
do
	%{__sed} -i 's/\r//' $i
done

%build
export CLASSPATH=$(build-classpath jgoodies-looks skinlf)
ant -v -Dbuild.sysclasspath=first build.with.native jar
ant -v -Dbuild.sysclasspath=first compile.native

%install
rm -rf %{buildroot}

#Create dirs needed.
mkdir -p %{buildroot}/%{_libdir}/%{name}

#flexdock has funny arch flags, such as "libRubberBand-linux-x86.so" on i386
SOFILE=`find ./ -name libRubberBand*so`


install -pm755 $SOFILE %{buildroot}/%{_libdir}/%{name}/libRubberBand-0.so
#install jar file into lib dir as it is a JNI requiring jar
install -pm644 build/%{name}-%{version}.jar %{buildroot}/%{_libdir}/%{name}/%{name}-%{version}.jar

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc LICENSE.txt README README-RELEASE release-notes.txt
%{_libdir}/%{name}


%changelog
* 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.

* Thu Dec 04 2008 <mycae(a!t)yahoo.com> 0.5.1-6
- Use ant to build jar, rather than straight from bash.
- Fix build patch to correct native .so building
- Thanks goes to akurtakov for assitance.
- Fixed dos->unix line ending for doc files
- Added dos2unix buildrequires
- Fix arch flag
- Added libX11 dep for native so
- Added symlink for so

* Sun Nov 23 2008 <mycae(a!t)yahoo.com> 0.5.1-5
- Fix documentation
- Change group
- Fix version numbering
- Link in skinlf to proposed package

* Sun Nov 16 2008 <mycae(a!t)yahoo.com> 0.5.1-4
- Update package revision number
- Fix Top level dir of jar file

* Sat Nov 01 2008 <mycae(a!t)yahoo.com> 0.5.1-3
- Add patch to remove non-free components from flexdock (thanks to Sylvestre Ledru from Scilab)
- Correct deps to include jgoodies & skinlf

* Sun Oct 26 2008 <mycae(a!t)yahoo.com> 0.5.1-2
- Fix % { _libs }  to % { _libdir }
- Added Jar file creation during build
- Add jar file dependency check
- Cleanup filelist to just .so and .jar
- Add JNI path patch

* Tue Sep 30 2008 <mycae(a!t)yahoo.com> 0.5.1-1
- Create spec file



--- NEW FILE import.log ---
flexdock-0_5_1-11_fc10:F-10:flexdock-0.5.1-11.fc10.src.rpm:1235876080


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flexdock/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Feb 2009 00:14:31 -0000	1.1
+++ .cvsignore	1 Mar 2009 02:54:40 -0000	1.2
@@ -0,0 +1 @@
+flexdock-0.5.1-clean.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flexdock/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Feb 2009 00:14:31 -0000	1.1
+++ sources	1 Mar 2009 02:54:40 -0000	1.2
@@ -0,0 +1 @@
+81736faeb864e7d30bb4a4120a86ee45  flexdock-0.5.1-clean.tar.gz