packages: geogebra/geogebra.spec - 3.2.45.0 - simplify the install phase (t...

[uzsolt]

Author: uzsolt                       Date: Fri Dec  3 00:17:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 3.2.45.0
- simplify the install phase (taken from ArchLinux)

---- Files affected:
packages/geogebra:
   geogebra.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/geogebra/geogebra.spec
diff -u packages/geogebra/geogebra.spec:1.4 packages/geogebra/geogebra.spec:1.5
--- packages/geogebra/geogebra.spec:1.4	Fri Oct 15 00:34:02 2010
+++ packages/geogebra/geogebra.spec	Fri Dec  3 01:17:40 2010
@@ -1,22 +1,13 @@
 # $Revision$, $Date$
 Summary:	GeoGebra is dynamic mathematics software
 Name:		geogebra
-Version:	3.2.41
+Version:	3.2.45.0
+%define		geoversion	 %(echo %{version} | tr '.' '-')
 Release:	0.1
 License:	GPL
 Group:		X11/Applications/Science
-Source0:	http://www.geogebra.org/webstart/unpacked/%{version}/unpacked/%{name}.jar
-# Source0-md5:	61c356e37c7cd24b0f6006f87be2bf05
-Source1:	http://www.geogebra.org/webstart/unpacked/%{version}/unpacked/%{name}_cas.jar
-# Source1-md5:	2c97a55ede7dce6dfefe96b0a21670f8
-Source2:	http://www.geogebra.org/webstart/unpacked/%{version}/unpacked/%{name}_export.jar
-# Source2-md5:	62297ff3166887d31d451c0f66488265
-Source3:	http://www.geogebra.org/webstart/unpacked/%{version}/unpacked/%{name}_gui.jar
-# Source3-md5:	b0fe16473d1c2c44ffd8a6660c89e383
-Source4:	http://www.geogebra.org/webstart/unpacked/%{version}/unpacked/%{name}_main.jar
-# Source4-md5:	2919a81fe3dec6fde1dc7e343327c0fd
-Source5:	http://www.geogebra.org/webstart/unpacked/%{version}/unpacked/%{name}_properties.jar
-# Source5-md5:	831d4e2377df2ea34938bdb933e2a480
+Source0:	http://geogebra.googlecode.com/files/GeoGebra-MacOS-Installer-%{geoversion}.zip
+# Source0-md5:	5d39c2c225e0085a88001f7eac5ff324
 Source10:	%{name}
 # source11 taken from archlinux
 Source11:	%{name}.desktop
@@ -34,15 +25,18 @@
 spreadsheet views that are all dynamically linked.
 
 %prep
+%setup -q -n GeoGebra.app
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_javadir}/geogebra
+install -d $RPM_BUILD_ROOT%{_javadir}/geogebra/unsigned
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-install %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT%{_javadir}/geogebra
+install Contents/Resources/Java/*.jar $RPM_BUILD_ROOT%{_javadir}/geogebra
+install Contents/Resources/Java/unsigned/*.jar $RPM_BUILD_ROOT%{_javadir}/geogebra
+
 install %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}
 install %{SOURCE11} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE12} $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -64,6 +58,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/12/03 00:17:40  uzsolt
+- 3.2.45.0
+- simplify the install phase (taken from ArchLinux)
+
 Revision 1.4  2010/10/14 22:34:02  uzsolt
 - 3.2.41
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geogebra/geogebra.spec?r1=1.4&r2=1.5&f=u