packages: SweetHome3D/SweetHome3D.spec - upgraded to 3.2, switched to build...

[gotar]

Author: gotar                        Date: Wed Jun 29 18:53:35 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 3.2, switched to build bytecode and resource jars from sources,
- fixed javaws.jar path for the program to work, some lib issues still to resolve

---- Files affected:
packages/SweetHome3D:
   SweetHome3D.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/SweetHome3D/SweetHome3D.spec
diff -u packages/SweetHome3D/SweetHome3D.spec:1.2 packages/SweetHome3D/SweetHome3D.spec:1.3
--- packages/SweetHome3D/SweetHome3D.spec:1.2	Mon Feb  7 00:17:58 2011
+++ packages/SweetHome3D/SweetHome3D.spec	Wed Jun 29 20:53:30 2011
@@ -1,57 +1,55 @@
 # $Revision$, $Date$
-# TODO
-#$ SweetHome3D 
-# Exception in thread "main" java.lang.NoClassDefFoundError: javax/jnlp/UnavailableServiceException
-# Caused by: java.lang.ClassNotFoundException: javax.jnlp.UnavailableServiceException
-# 	at java.net.URLClassLoader$1.run(URLClassLoader.java:202)
-# 	at java.security.AccessController.doPrivileged(Native Method)
-# 	at java.net.URLClassLoader.findClass(URLClassLoader.java:190)
-# 	at java.lang.ClassLoader.loadClass(ClassLoader.java:307)
-# 	at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:301)
-# 	at java.lang.ClassLoader.loadClass(ClassLoader.java:248)
-# Could not find the main class: com.eteks.sweethome3d.SweetHome3D.  Program will exit.
+#
+# TODO:	- use system java3d (it's GPL now), maybe other libs too
+#	- build and package applet
+#	- libCG*.so isn't required, package shouldn't provide libj3dcore-ogl*.so
+#
 Summary:	An interior design application
 Name:		SweetHome3D
-Version:	3.0
-Release:	0.1
-License:	GPL
-Group:		Applications
-Source0:	http://downloads.sourceforge.net/sweethome3d/%{name}-%{version}-linux-x86.tgz
-# Source0-md5:	75d12e5972053ace7583a33c03afccc3
-Source1:	http://downloads.sourceforge.net/sweethome3d/%{name}-%{version}-linux-x64.tgz
-# Source1-md5:	21fbfcd53c71b2f730f4bba5f5082092
+Version:	3.2
+Release:	1
+License:	GPL v2
+Group:		X11/Applications
+Source0:	http://downloads.sourceforge.net/sweethome3d/%{name}-%{version}-src.zip
+# Source0-md5:	73ae64a8d5cfd418df79619d4b792ea9
 URL:		http://www.sweethome3d.com/
+BuildRequires:	ant
+BuildRequires:	java-sun
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 An interior design application.
 
 %prep
-%ifarch %{ix86}
-%setup -q -T -b0
-%endif
-%ifarch %{x8664}
-%setup -q -T -b1
-%endif
-
-%{__sed} -i 's#exec "$PROGRAM_DIR"/jre1.6.0_22/bin/java#env java#g; 3,8 c\PROGRAM_DIR=%{_javadir}/SweetHome3D' SweetHome3D
+%setup -q -n %{name}-%{version}-src
+%{__sed} -e 's#exec "$PROGRAM_DIR"/jre1.6.0_23/bin/java#env java#g; 3,8 c\PROGRAM_DIR=%{_javadir}/SweetHome3D' \
+	-e 's#:"$PROGRAM_DIR"/jre1.6.0_23/lib/javaws.jar#:%{_jvmlibdir}/java/jre/lib/javaws.jar#' -i install/linux/SweetHome3D
+#	-e 's/$1/"$1"/' \
 
 %build
+%ant application furniture textures help
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_bindir}
-install %{name} $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_javadir}/%{name}/lib}
 
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
-install lib/* $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
+install install/linux/%{name} $RPM_BUILD_ROOT%{_bindir}
+install -p build/*.jar lib/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
+%ifarch %{ix86}
+install -p lib/linux/i386/libj3dcore-ogl*.so $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
+%endif
+%ifarch %{x8664}
+install -p lib/linux/x64/libj3dcore-ogl.so $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc LICENSE.TXT THIRDPARTY-LICENSE-*.TXT
 %attr(755,root,root) %{_bindir}/%{name}
 %{_javadir}/%{name}
 
@@ -61,6 +59,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/06/29 18:53:30  gotar
+- upgraded to 3.2, switched to build bytecode and resource jars from sources,
+- fixed javaws.jar path for the program to work, some lib issues still to resolve
+
 Revision 1.2  2011/02/06 23:17:58  sparky
 - unified preamble in %changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SweetHome3D/SweetHome3D.spec?r1=1.2&r2=1.3&f=u