SPECS: GoogleEarth.spec - use proper path in script, fixed head/ta...

qboosh qboosh at pld-linux.org
Thu Jun 22 18:13:17 CEST 2006


Author: qboosh                       Date: Thu Jun 22 16:13:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use proper path in script, fixed head/tail syntax, use lang()

---- Files affected:
SPECS:
   GoogleEarth.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/GoogleEarth.spec
diff -u SPECS/GoogleEarth.spec:1.3 SPECS/GoogleEarth.spec:1.4
--- SPECS/GoogleEarth.spec:1.3	Thu Jun 15 03:05:33 2006
+++ SPECS/GoogleEarth.spec	Thu Jun 22 18:13:08 2006
@@ -16,8 +16,6 @@
 NoSource:	0
 Source1:	%{name}.desktop
 URL:		http://earth.google.com/
-#BuildRequires:	rpm-build >= 4.3-0.20040107.21
-#BuildRequires:	rpmbuild(macros) >= 1.236
 Requires:	curl-libs
 Requires:	openssl
 ExclusiveArch:	i586 i686 pentium3 pentium4 athlon
@@ -32,14 +30,14 @@
 hospitals, schools, and more.
 
 %description -l pl
-Google Earth pokazuje obrazy Ziemii oraz informacje geograficzne. Można
+Google Earth pokazuje obrazy Ziemi oraz informacje geograficzne. Można
 obejrzeć tak egzotyczne lokalizacje jak Maui czy Paryż, jak również
 miejsca typu restauracje, szpitale, szkoły i inne.
 
 %prep
 %setup -q -T -c
-head -376 %{SOURCE0} > %{name}-%{version}.sh
-tail +377 %{SOURCE0} > %{name}-%{version}.tar.bz2
+head -n 376 %{SOURCE0} > %{name}-%{version}.sh
+tail -n +377 %{SOURCE0} > %{name}-%{version}.tar.bz2
 
 tar -jxvf %{name}-%{version}.tar.bz2
 tar -xvf googleearth-linux-x86.tar
@@ -49,10 +47,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_google_data_path}} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-#install -d $RPM_BUILD_ROOT{%{jredir},%{_javadir},%{_includedir}} \
-#	$RPM_BUILD_ROOT{%{_mandir}/{,ja/}man1,%{_prefix}/src/%{name}-sources} \
 
-sed '/FindPath()/aGOOGLEEARTH_DATA_PATH="/usr/lib/GoogleEarth"
+sed '/FindPath()/aGOOGLEEARTH_DATA_PATH="%{_google_data_path}"
 5,40d' bin/googleearth > $RPM_BUILD_ROOT%{_bindir}/googleearth
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
@@ -94,24 +90,15 @@
 %dir %{_google_data_path}/resources
 %{_google_data_path}/resources/*.png
 %{_google_data_path}/resources/*.jpg
-%dir %{_google_data_path}/resources/de_DE.locale
-%{_google_data_path}/resources/de_DE.locale/*
-%dir %{_google_data_path}/resources/en_AU.locale
-%{_google_data_path}/resources/en_AU.locale/*
-%dir %{_google_data_path}/resources/en_CA.locale
-%{_google_data_path}/resources/en_CA.locale/*
-%dir %{_google_data_path}/resources/en_NZ.locale
-%{_google_data_path}/resources/en_NZ.locale/*
-%dir %{_google_data_path}/resources/en_UK.locale
-%{_google_data_path}/resources/en_UK.locale/*
-%dir %{_google_data_path}/resources/en_US.locale
-%{_google_data_path}/resources/en_US.locale/*
-%dir %{_google_data_path}/resources/es_ES.locale
-%{_google_data_path}/resources/es_ES.locale/*
-%dir %{_google_data_path}/resources/fr_FR.locale
-%{_google_data_path}/resources/fr_FR.locale/*
-%dir %{_google_data_path}/resources/it_IT.locale
-%{_google_data_path}/resources/it_IT.locale/*
+%lang(de) %{_google_data_path}/resources/de_DE.locale
+%lang(en_AU) %{_google_data_path}/resources/en_AU.locale
+%lang(en_CA) %{_google_data_path}/resources/en_CA.locale
+%lang(en_NZ) %{_google_data_path}/resources/en_NZ.locale
+%lang(en_GB) %{_google_data_path}/resources/en_UK.locale
+%lang(en_US) %{_google_data_path}/resources/en_US.locale
+%lang(es) %{_google_data_path}/resources/es_ES.locale
+%lang(fr) %{_google_data_path}/resources/fr_FR.locale
+%lang(it) %{_google_data_path}/resources/it_IT.locale
 %dir %{_google_data_path}/xml
 %{_google_data_path}/xml/*.xml
 %{_desktopdir}/*.desktop
@@ -123,6 +110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/06/22 16:13:08  qboosh
+- use proper path in script, fixed head/tail syntax, use lang()
+
 Revision 1.3  2006/06/15 01:05:33  gotar
 - pl desc, hardcode GOOGLEEARTH_DATA_PATH into start script, install all
   the libraries (without them it sig11s)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/GoogleEarth.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list