Author: glen Date: Wed Jan 18 08:08:32 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- do not package nspr/nss symlinks; no longer needed
---- Files affected:
packages/google-chrome:
google-chrome.spec (1.39 -> 1.40)
---- Diffs:
================================================================
Index: packages/google-chrome/google-chrome.spec
diff -u packages/google-chrome/google-chrome.spec:1.39
packages/google-chrome/google-chrome.spec:1.40
--- packages/google-chrome/google-chrome.spec:1.39 Sun Jan 15 23:33:26 2012
+++ packages/google-chrome/google-chrome.spec Wed Jan 18 09:08:26 2012
@@ -23,8 +23,6 @@
BuildRequires: rpmbuild(macros) >= 1.453
BuildRequires: sed >= 4.0
Requires: browser-plugins >= 2.0
-Requires: nspr
-Requires: nss
Requires: xdg-utils >= 1.0.2-4
Provides: wwwbrowser
ExclusiveArch: %{ix86} %{x8664}
@@ -35,15 +33,13 @@
%define _enable_debug_packages 0
%define no_install_post_strip 1
-%define nss_caps libfreebl3.so libnss3.so libnssckbi.so
libsmime3.so ibsoftokn3.so libssl3.so libnssutil3.so
-%define nspr_caps libnspr4.so libplc4.so libplds4.so
%define ffmpeg_caps libffmpegsumo.so
%define jpeg_caps libpng12.so.0(PNG12_0)
%define flash_caps libflashplayer.so
%define chrome_caps libpdf.so libppGoogleNaClPluginChrome.so
# list of script capabilities (regexps) not to be used in Provides
-%define _noautoprov %{nss_caps} %{nspr_caps}
%{ffmpeg_caps} %{jpeg_caps} %{flash_caps} %{chrome_caps}
+%define _noautoprov %{ffmpeg_caps} %{jpeg_caps}
%{flash_caps} %{chrome_caps}
# do not require them either
%define _noautoreq %{_noautoprov}
@@ -107,7 +103,7 @@
install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
%{__sed} -i -e 's,@libdir@,%{_libdir}/%{name},'
$RPM_BUILD_ROOT%{_bindir}/%{name}
cp -a chrome/* $RPM_BUILD_ROOT%{_libdir}/%{name}
-cp -a google-chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p google-chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1
# for google-chrome --help
echo ".so google-chrome.1" > $RPM_BUILD_ROOT%{_mandir}/man1/chrome.1
cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
@@ -115,15 +111,6 @@
%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
-# nspr symlinks
-for a in libnspr4.so libplc4.so libplds4.so; do
- ln -s %{_libdir}/$a $RPM_BUILD_ROOT%{_libdir}/%{name}/$a.0d
-done
-# nss symlinks
-for a in libnss3.so libnssutil3.so libsmime3.so libssl3.so; do
- ln -s %{_libdir}/$a $RPM_BUILD_ROOT%{_libdir}/%{name}/$a.1d
-done
-
# find locales
%find_lang %{name}.lang
@@ -178,21 +165,15 @@
# ffmpeg libs
%attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so
-# nspr/nss symlinks
-%attr(755,root,root) %{_libdir}/%{name}/libnspr4.so.0d
-%attr(755,root,root) %{_libdir}/%{name}/libplc4.so.0d
-%attr(755,root,root) %{_libdir}/%{name}/libplds4.so.0d
-%attr(755,root,root) %{_libdir}/%{name}/libnss3.so.1d
-%attr(755,root,root) %{_libdir}/%{name}/libnssutil3.so.1d
-%attr(755,root,root) %{_libdir}/%{name}/libsmime3.so.1d
-%attr(755,root,root) %{_libdir}/%{name}/libssl3.so.1d
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2012/01/18 08:08:26 glen
+- do not package nspr/nss symlinks; no longer needed
+
Revision 1.39 2012/01/15 22:33:26 glen
- up to 16.0.912.75 r116452
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-chrome/google-chrome.spec?r1=1.39&r2=1.40&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
