From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sat, 27 Oct 2007 23:50:20 +0000 (+0000)
Subject: - update so caps rel 1
X-Git-Tag: auto/th/mozilla-firefox-bin-2_0_0_9-1~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fmozilla-firefox-bin.git;a=commitdiff_plain;h=ac3e1eda7eb99094938574773cedb8aac193af70

- update so caps rel 1

Changed files:
    mozilla-firefox-bin.spec -> 1.26
---

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 7f3a5fe..3be59c8 100644
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -3,7 +3,7 @@ Summary:	Mozilla Firefox web browser
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
 Version:	2.0.0.8
-Release:	0.1
+Release:	1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.gz
@@ -22,13 +22,15 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		nss_caps	libfreebl3.so libnss3.so libnssckbi.so libsmime3.so ibsoftokn3.so libssl3.so
 %define		nspr_caps	libnspr4.so libplc4.so libplds4.so
+%define		moz_caps	libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libnullplugin.so libxpcom_compat.so libxpcom_core.so libxpcom.so libxpistub.so libxul.so
+
 # mozilla and firefox provide their own versions
 # list of capabilities (SONAME, perl(module), php(module) regexps) which don't generate dependencies on package NAMES
-%define		_noautoreqdep		libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so libxpcom_core.so %{nspr_caps} %{nss_caps}
+%define		_noautoreqdep		%{moz_caps} %{nspr_caps} %{nss_caps}
 # list of files (regexps) which don't generate Provides
 %define		_noautoprovfiles	%{_libdir}/%{name}/components
 # list of script capabilities (regexps) not to be used in Provides
-%define		_noautoprov			libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so libnullplugin.so libxpcom_compat.so libxpcom_core.so libxpistub.so %{nss_caps} %{nspr_caps}
+%define		_noautoprov			%{moz_caps} %{nss_caps} %{nspr_caps}
 %define		_noautoreq			%{_noautoprov}
 
 %description
@@ -50,7 +52,8 @@ install -d \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_libdir}/%{name}} \
 
 cp -a * $RPM_BUILD_ROOT%{_libdir}/%{name}
-sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/firefox
+sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
+ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %clean
@@ -58,6 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mozilla-firefox
 %attr(755,root,root) %{_bindir}/firefox
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/res