packages: google-earth/decimal_separator.patch, google-earth/google-earth.d...

glen glen at pld-linux.org
Wed Dec 29 00:30:46 CET 2010 

Author: glen                         Date: Tue Dec 28 23:30:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 6.0.1.2032, renamed to google-earth

---- Files affected:
packages/google-earth:
   decimal_separator.patch (1.1 -> 1.2) , google-earth.desktop (1.4 -> 1.5) , google-earth.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: packages/google-earth/decimal_separator.patch
diff -u packages/google-earth/decimal_separator.patch:1.1 packages/google-earth/decimal_separator.patch:1.2
--- packages/google-earth/decimal_separator.patch:1.1	Wed Sep 30 04:21:46 2009
+++ packages/google-earth/decimal_separator.patch	Wed Dec 29 00:30:41 2010
@@ -1,17 +1,16 @@
-diff -ur GoogleEarth-5.vanilla/bin/googleearth GoogleEarth-5/bin/googleearth
---- GoogleEarth-5.vanilla/bin/googleearth	2009-09-18 00:28:01.000000000 +0200
-+++ GoogleEarth-5/bin/googleearth	2009-09-30 04:59:17.982224024 +0200
-@@ -46,6 +46,13 @@
- if [ -x "${GOOGLEEARTH_DATA_PATH}/googleearth-bin" ]
- then
- 	cd "${GOOGLEEARTH_DATA_PATH}/"
-+	# WARNING!
-+	#
-+	# This is a workaround for GoogleEarth bug. With some locales GE uses comma as
-+	# decimal separator while parsing KML files. It renders virtually all data
-+	# unusable. Ensure the LC_NUMERIC is set to US standard (dot-separated).
-+	#
-+	LC_NUMERIC="en_US"
- 	exec "./googleearth-bin" "$@"
- fi
- echo "Couldn't run Google Earth (googleearth-bin). Is GOOGLEEARTH_DATA_PATH set?"
+--- google-earth-6.0.1.2032/lib/googleearth~	2010-12-29 01:10:51.000000000 +0200
++++ google-earth-6.0.1.2032/lib/googleearth	2010-12-29 01:12:24.927165032 +0200
+@@ -40,4 +40,12 @@
+ 
+ cd $script_path;
+ 
+-LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH ./googleearth-bin "$@"
++# WARNING!
++#
++# This is a workaround for GoogleEarth bug. With some locales GE uses comma as
++# decimal separator while parsing KML files. It renders virtually all data
++# unusable. Ensure the LC_NUMERIC is set to US standard (dot-separated).
++#
++LC_NUMERIC="en_US"
++
++LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH exec ./googleearth-bin "$@"

================================================================
Index: packages/google-earth/google-earth.desktop
diff -u packages/google-earth/google-earth.desktop:1.4 packages/google-earth/google-earth.desktop:1.5
--- packages/google-earth/google-earth.desktop:1.4	Wed Dec 26 15:26:24 2007
+++ packages/google-earth/google-earth.desktop	Wed Dec 29 00:30:41 2010
@@ -4,11 +4,10 @@
 GenericName[pl]=Przeglądarka planety w 3D
 Comment=Explore, search and discover the planet
 Comment[pl]=Eksploracja, przeszukiwanie i odkrywanie planety
-Exec=googleearth %f
+Exec=google-earth %f
 Terminal=false
 MultipleArgs=false
+Icon=google-earth
 Type=Application
-Icon=googleearth-icon
 Categories=Network;
 MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole;
-# vi:encoding=utf-8

================================================================
Index: packages/google-earth/google-earth.spec
diff -u packages/google-earth/google-earth.spec:1.32 packages/google-earth/google-earth.spec:1.33
--- packages/google-earth/google-earth.spec:1.32	Wed Aug 18 13:27:00 2010
+++ packages/google-earth/google-earth.spec	Wed Dec 29 00:30:41 2010
@@ -2,25 +2,30 @@
 # TODO:
 # - move configs to /etc
 # - mark national resources as lang
-
-%define		buildid	1.1547
-%define		rel		0.3
 Summary:	Google Earth - 3D planet viewer
 Summary(pl.UTF-8):	Google Earth - globus
-Name:		GoogleEarth
-Version:	5.2
-Release:	%{buildid}.%{rel}
-License:	non distributable - EULA?
+Name:		google-earth
+Version:	6.0.1.2032
+Release:	0.1
+License:	Multiple, see http://www.google.com/earth
 Group:		Applications/Graphics
-Source0:	http://dl.google.com/earth/client/current/%{name}Linux.bin
-# NoSource0-md5:	3d6cc89e17daa361f6087ea495d06a84
+Obsoletes:	GoogleEarth
+Source0:	http://dl.google.com/linux/earth/rpm/stable/i386/%{name}-stable-%{version}-0.i386.rpm
+# NoSource0-md5:	8a2e05df9bce98cc32f50e7c2da9dd60
 NoSource:	0
-Source1:	%{name}.desktop
-Patch0:		%{name}-decimal_separator.patch
-URL:		http://earth.google.com/
-Suggests:	fonts-TTF-bitstream-vera
-ExclusiveArch:	%{ix86}
+Source1:	http://dl.google.com/linux/earth/rpm/stable/x86_64/%{name}-stable-%{version}-0.x86_64.rpm
+# NoSource1-md5:	10169b3877d1fa815892d5ef96296d25
+NoSource:	1
+Source2:	%{name}.desktop
+Patch0:		decimal_separator.patch
+URL:		http://www.google.com/earth
+BuildRequires:	rpm-utils
+BuildRequires:	rpmbuild(macros) >= 1.596
+BuildRequires:	sed >= 4.0
 Requires:	cpuinfo(sse2)
+Requires:	hicolor-icon-theme
+Suggests:	fonts-TTF-bitstream-vera
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_appdir		%{_libdir}/%{name}
@@ -43,6 +48,8 @@
 %define		_noautoprov		%{mesa_caps} %{qt4_caps} %{curl_caps} %{icu_caps} %{mdns_caps} %{proj_caps}
 %define		_noautoreq		%{_noautoprov}
 
+%define		skip_post_check_so	libGLU.so.1
+
 %description
 Google Earth puts a planet's worth of imagery and other geographic
 information right on your desktop. View exotic locales like Maui and
@@ -56,50 +63,69 @@
 
 %prep
 %setup -qcT
-head -n 376 %{SOURCE0} > %{name}-%{version}.sh
-tail -n +377 %{SOURCE0} > %{name}-%{version}.tar.bz2
+%ifarch %{ix86}
+SOURCE=%{S:0}
+%endif
+%ifarch %{x8664}
+SOURCE=%{S:1}
+%endif
 
-tar jxvf %{name}-%{version}.tar.bz2
-tar xvf googleearth-linux-x86.tar
-tar xvf googleearth-data.tar
-
-%patch0 -p1
-
-%build
-ver=$(awk '/Google Earth version/{print $NF}' README.linux)
-if [ "$ver" != %{version}.%{buildid}-1 ]; then
+V=$(rpm -qp --nodigest --nosignature --qf '%{V}' $SOURCE)
+if [ "$V" != "%{version}" ]; then
 	exit 1
 fi
+rpm2cpio $SOURCE | cpio -i -d
 
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_appdir}} \
-	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-
-sed '/FindPath()/aGOOGLEEARTH_DATA_PATH="%{_appdir}"
-5,40d' bin/googleearth > $RPM_BUILD_ROOT%{_bindir}/googleearth
+mv opt/google/earth/free lib
+# doc stuff
+mv lib/gpl.txt .
+
+# bin dir stuff
+rm lib/google-earth
+
+# isolate desktop stuff, we install them differently
+install -d desktop
+mv lib/product_logo_* desktop
+mv lib/google-earth.desktop desktop
+mv lib/xdg-* desktop
 
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-cp -a googleearth-icon.png $RPM_BUILD_ROOT%{_pixmapsdir}
+%patch0 -p1
 
-install -p googleearth-bin $RPM_BUILD_ROOT%{_appdir}
-# It should be located in /etc and marked as config
-cp -a *.ini $RPM_BUILD_ROOT%{_appdir}
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_appdir}}
 
-install -p lib* $RPM_BUILD_ROOT%{_appdir}
+cp -a lib/* $RPM_BUILD_ROOT%{_appdir}
+ln -s %{_appdir}/googleearth $RPM_BUILD_ROOT%{_bindir}/%{name}
 
-cp -a lang plugins resources shaders $RPM_BUILD_ROOT%{_appdir}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+for icon in desktop/product_logo_*.png; do
+	size=${icon##*/product_logo_} size=${size%.png}
+	dir=$RPM_BUILD_ROOT%{_iconsdir}/hicolor/${size}x${size}
+	install -d $dir
+	cp -a $icon $dir/%{name}.png
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
 %files
 %defattr(644,root,root,755)
-%doc README.linux
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/google-earth
 %dir %{_appdir}
 %{_appdir}/*.ini
+%{_appdir}/qt.conf
+%{_appdir}/kh20
 %attr(755,root,root) %{_appdir}/googleearth-bin
+%attr(755,root,root) %{_appdir}/googleearth
+%attr(755,root,root) %{_appdir}/gpsbabel
 %attr(755,root,root) %{_appdir}/*.so*
 %dir %{_appdir}/plugins
 %dir %{_appdir}/plugins/imageformats
@@ -158,9 +184,6 @@
 %{_appdir}/resources/*.rcc
 %{_appdir}/resources/doppler.txt
 %{_appdir}/resources/flightsim
-%{_appdir}/resources/paddle
-%{_appdir}/resources/pushpin
-%{_appdir}/resources/shapes
 %lang(ar) %{_appdir}/resources/ar.locale
 %lang(bg) %{_appdir}/resources/bg.locale
 %lang(ca) %{_appdir}/resources/ca.locale
@@ -201,8 +224,8 @@
 %lang(vi) %{_appdir}/resources/vi.locale
 %lang(zh) %{_appdir}/resources/zh-Hans.locale
 %lang(zh_TW) %{_appdir}/resources/zh-Hant.locale
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.png
+%{_desktopdir}/google-earth.desktop
+%{_iconsdir}/hicolor/*/google-earth.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -210,6 +233,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2010/12/28 23:30:41  glen
+- up to 6.0.1.2032, renamed to google-earth
+
 Revision 1.32  2010/08/18 11:27:00  glen
 - also has bundled nss_mdns and proj libraries
 - skip deps from qt4 imageformat plugins
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-earth/decimal_separator.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-earth/google-earth.desktop?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-earth/google-earth.spec?r1=1.32&r2=1.33&f=u

More information about the pld-cvs-commit mailing list