update to 1.2.4 [release 1.2.4-1mamba;Sun Apr 11 2021]
This commit is contained in:
parent
b42d01db57
commit
8e8034d7f3
@ -1,10 +0,0 @@
|
||||
--- src/java/demo/org/flexdock/demos/AllDemos.java 2007-01-11 21:52:00.000000000 +0100
|
||||
+++ src/java/demo/org/flexdock/demos/AllDemos.java-gil 2011-02-04 12:20:09.000000000 +0100
|
||||
@@ -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",
|
||||
@ -1,11 +0,0 @@
|
||||
--- src/java/core/org/flexdock/util/ResourceManager.java 2007-01-02 16:15:46.000000000 +0100
|
||||
+++ src/java/core/org/flexdock/util/ResourceManager.java-gil 2011-02-04 12:17:36.000000000 +0100
|
||||
@@ -313,7 +313,7 @@
|
||||
}
|
||||
|
||||
// determine a file from which we can load our library.
|
||||
- File file = new File(System.getProperty("user.home") + "/flexdock");
|
||||
+ File file = new File("/usr/lib/java");
|
||||
file.mkdirs();
|
||||
file = new File(file.getAbsolutePath() + "/" + library
|
||||
+ LIBRARY_EXTENSION);
|
||||
@ -1,163 +0,0 @@
|
||||
--- build.xml 2010-08-18 17:44:16.000000000 +0200
|
||||
+++ build.xml-gil 2011-02-04 12:14:33.000000000 +0100
|
||||
@@ -40,6 +40,7 @@
|
||||
<property name="version" value="0.5.2" />
|
||||
<property name="dist.jar.basename" value="${ant.project.name}-${version}" />
|
||||
<property name="dist.demo.jar.basename" value="${ant.project.name}-demo-${version}" />
|
||||
+ <property name="j2se.api" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
|
||||
|
||||
<!-- sourcepaths -->
|
||||
<path id="sourcepath">
|
||||
@@ -118,7 +119,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>
|
||||
@@ -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" includeAntRuntime="no">
|
||||
<src path="${java.src.core}" />
|
||||
<!-- the next 3 are interdependent -->
|
||||
@@ -145,12 +146,10 @@
|
||||
<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" includeAntRuntime="no"/>
|
||||
- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4" includeAntRuntime="no"/>
|
||||
</target>
|
||||
|
||||
|
||||
- <target name="compile.native" depends="compile.dll,compile.unix.lib"
|
||||
+ <target name="compile.native" depends="compile.unix.lib"
|
||||
description="Compile the native code for the current platform"/>
|
||||
|
||||
<target name="native.init" depends="init">
|
||||
@@ -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>
|
||||
@@ -333,8 +335,7 @@
|
||||
See: http://forum.java.sun.com/thread.jspa?forumID=22&threadID=568620,
|
||||
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/commons-logging-1.1.jar lib/jmf/lib/jmf.jar lib/looks-2.1.1.jar"/>
|
||||
+ <!-- matches core jar name -->
|
||||
<attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
@@ -361,7 +362,7 @@
|
||||
<packageset dir="${java.src.drag}" />
|
||||
<packageset dir="${java.src.perspective}" />
|
||||
<packageset dir="${java.src.view}" />
|
||||
- <link href="http://java.sun.com/j2se/1.4.2/docs/api/" />
|
||||
+ <link href="${j2se.api}" />
|
||||
<!-- add links to the j2se 1.4 docs -->
|
||||
</javadoc>
|
||||
</target>
|
||||
@@ -414,60 +415,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 +502,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 +512,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
|
||||
@ -1,38 +1,18 @@
|
||||
%define javahome /usr/lib/jvm/java
|
||||
Name: java-flexdock
|
||||
Version: 0.5.2
|
||||
Version: 1.2.4
|
||||
Release: 1mamba
|
||||
Summary: A Java docking framework for use in cross-platform Swing applications
|
||||
Group: System/Libraries/Java
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: https://flexdock.dev.java.net
|
||||
Source: https://flexdock.dev.java.net/files/documents/2037/152436/flexdock-%{version}-src.zip
|
||||
# remove window stuff, compile native, crosslink for javadoc, set X11 include dir, remove classpath from flexdock demo jar
|
||||
Patch0: java-flexdock-0.5.2-build_xml.patch
|
||||
Patch1: java-flexdock-0.5.2-ResourceManager.patch
|
||||
Patch2: java-flexdock-0.5.2-AllDemos.patch
|
||||
URL: http://forge.scilab.org/index.php/p/flexdock/
|
||||
Source: http://forge.scilab.org/index.php/p/flexdock/downloads/get/flexdock-%{version}.jar
|
||||
License: MIT
|
||||
BuildRequires: apache-ant
|
||||
BuildRequires: apache-ant-regexp
|
||||
BuildRequires: jakarta-commons-logging == 1.1.1
|
||||
BuildRequires: java-openjdk-javadoc
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: apache-ant-commons-logging
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: java-openjdk
|
||||
BuildRequires: java-skinlf
|
||||
BuildRequires: jgoodies-looks
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: libX11-devel
|
||||
## AUTOBUILDREQ-END
|
||||
Requires: apache-ant-commons-logging
|
||||
Requires: java-openjdk
|
||||
Requires: java-skinlf
|
||||
Requires: jgoodies-looks
|
||||
Requires: jpackage-utils
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
BuildRequires: javapackages
|
||||
|
||||
%description
|
||||
A Java docking framework for use in cross-platform Swing applications. It offers features you'd expect in any desktop docking framework such as:
|
||||
@ -48,93 +28,30 @@ Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
A Java docking framework for use in cross-platform Swing applications.
|
||||
|
||||
This package contains documentation for %{name}.
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q -c %{name}-%{version}
|
||||
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
|
||||
for j in $(find . -name "*.jar"); do
|
||||
rm -rf $j
|
||||
done
|
||||
|
||||
for o in $(find . -name "*.so"); do
|
||||
rm -rf $o
|
||||
done
|
||||
|
||||
for d in $(find . -name "*.dll"); do
|
||||
rm -rf $d
|
||||
done
|
||||
|
||||
# rm -rf ./lib/looks-2.1.1.jar
|
||||
ln -sf $(build-classpath jgoodies-looks) lib/looks-2.1.1.jar
|
||||
# rm -rf ./lib/commons-logging-1.1.jar
|
||||
ln -sf $(build-classpath commons-logging) lib/commons-logging-1.1.jar
|
||||
|
||||
# only for flexdock-demo jar
|
||||
# rm -rf ./lib/jmf/lib/customizer.jar
|
||||
# rm -rf ./lib/jmf/lib/multiplayer.jar
|
||||
# rm -rf ./lib/jmf/lib/jmf.jar
|
||||
# rm -rf ./lib/jmf/lib/mediaplayer.jar
|
||||
rm -rf src/java/demo/org/flexdock/demos/raw/jmf
|
||||
|
||||
# rm -rf ./lib/skinlf.jar
|
||||
ln -sf $(build-classpath skinlf) lib/skinlf.jar
|
||||
|
||||
echo "sdk.home=%javahome" > workingcopy.properties
|
||||
|
||||
for i in README-RELEASE LICENSE.txt README release-notes.txt ; do
|
||||
sed -i 's/\r//' $i
|
||||
done
|
||||
%setup -q -c -D -T
|
||||
|
||||
%build
|
||||
|
||||
export CLASSPATH=$(build-classpath jgoodies-looks ant/ant-apache-regexp ant/ant-commons-logging skinlf commons-logging)
|
||||
ant -v -Dbuild.sysclasspath=first build.with.native jar
|
||||
ant -v -Dbuild.sysclasspath=first compile.native
|
||||
ant -Dj2se.api=%{_javadocdir}/java javadoc
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
|
||||
mkdir -p %{buildroot}%{_jnidir}
|
||||
|
||||
install -pm 644 build/flexdock-%{version}.jar \
|
||||
%{buildroot}%{_jnidir}/
|
||||
|
||||
SOFILE=$(find . -name "libRubberBand*so")
|
||||
install -pm755 $SOFILE %{buildroot}%{_jnidir}/libRubberBand-0.so
|
||||
|
||||
(
|
||||
cd %{buildroot}%{_jnidir}
|
||||
for jar in *-%{version}*; do
|
||||
ln -sf ${jar} ${jar/-%{version}/}
|
||||
done
|
||||
)
|
||||
|
||||
mkdir -p %{buildroot}%{_javadocdir}/flexdock
|
||||
cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/flexdock
|
||||
install -D -m0644 %{SOURCE0} %{buildroot}%{_javadir}/flexdock-%{version}.jar
|
||||
ln -sf flexdock-%{version}.jar %{buildroot}%{_javadir}/flexdock.jar
|
||||
|
||||
%clean
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_jnidir}/flexdock-%{version}.jar
|
||||
%{_jnidir}/flexdock.jar
|
||||
%{_jnidir}/libRubberBand-0.so
|
||||
%doc README README-BUILD README-RELEASE
|
||||
|
||||
%files javadoc
|
||||
%defattr(-,root,root)
|
||||
%{_javadocdir}/flexdock
|
||||
%{_javadir}/flexdock-%{version}.jar
|
||||
%{_javadir}/flexdock.jar
|
||||
|
||||
%changelog
|
||||
* Sun Apr 11 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.4-1mamba
|
||||
- update to 1.2.4
|
||||
|
||||
* Fri Feb 04 2011 gil <puntogil@libero.it> 0.5.2-1mamba
|
||||
- update to 0.5.2
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user