[packages/google-earth] do not provide deps for system gdal, gdata, sqlite, expat, nss, nspr

glen glen at pld-linux.org
Sat Jan 31 22:44:25 CET 2015


commit 84b24189b43381173eb8f43ee7d4de63063d1280
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jan 31 23:43:59 2015 +0200

    do not provide deps for system gdal, gdata, sqlite, expat, nss, nspr

 google-earth.spec | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/google-earth.spec b/google-earth.spec
index 6aa2594..2c5891c 100644
--- a/google-earth.spec
+++ b/google-earth.spec
@@ -29,10 +29,13 @@ Suggests:	fonts-TTF-bitstream-vera
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		skip_post_check_so	libGLU.so.1
+
 %define		_appdir		%{_libdir}/%{name}
 
 # Qt4 plugins
 %define		_noautoprovfiles	%{_libdir}/%{name}/plugins/imageformats
+
 # Mesa-libGLU
 %define		mesa_caps		libGLU.so
 # QtCore, QtGui, QtNetwork, QtWebKit
@@ -45,12 +48,25 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		mdns_caps		libnss_mdns4_minimal.so.2
 # proj
 %define		proj_caps		libproj.so.0
-
-%define		_noautoprov		%{mesa_caps} %{qt4_caps} %{curl_caps} %{icu_caps} %{mdns_caps} %{proj_caps}
+# expat
+%define		expat_caps		libexpat.so.1
+# nss
+%define		nss_caps		libfreebl3.so libssl3.so libsoftokn3.so libsmime3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so
+# nspr
+%define		nspr_caps		libnspr4.so libplc4.so libplds4.so
+# sqlite3
+%define		sqlite_caps		libsqlite3.so
+# gdal
+%define		gdal_caps		libgdal.so.1
+# gdata
+%define		gdata_caps		libgdata.so
+
+# check with:
+# cd lib; for a in *.so*; do ls -ld /lib*/$a /usr/lib*/$a; done 2>/dev/null
+
+%define		_noautoprov		%{mesa_caps} %{qt4_caps} %{curl_caps} %{icu_caps} %{mdns_caps} %{proj_caps} %{expat_caps} %{nss_caps} %{nspr_caps} %{sqlite_caps} %{gdal_caps} %{gdata_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
@@ -123,6 +139,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/google-earth
+%{_desktopdir}/google-earth.desktop
+%{_iconsdir}/hicolor/*/apps/google-earth.png
 %dir %{_appdir}
 %{_appdir}/*.ini
 %{_appdir}/kh20
@@ -187,5 +205,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/resources/*.rcc
 %{_appdir}/resources/doppler.txt
 %{_appdir}/resources/flightsim
-%{_desktopdir}/google-earth.desktop
-%{_iconsdir}/hicolor/*/apps/google-earth.png
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/google-earth.git/commitdiff/84b24189b43381173eb8f43ee7d4de63063d1280



More information about the pld-cvs-commit mailing list