packages: mozilla-firefox-bin/mozilla-firefox-bin.spec - cleanups, do not p...

[glen]

Author: glen                         Date: Wed Aug 18 06:54:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanups, do not package nss/nspr .chk files

---- Files affected:
packages/mozilla-firefox-bin:
   mozilla-firefox-bin.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: packages/mozilla-firefox-bin/mozilla-firefox-bin.spec
diff -u packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.59 packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.60
--- packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.59	Sat Jul 24 13:28:12 2010
+++ packages/mozilla-firefox-bin/mozilla-firefox-bin.spec	Wed Aug 18 08:54:47 2010
@@ -22,7 +22,7 @@
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
 Version:	3.6.8
-Release:	1
+Release:	0.1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2
@@ -70,27 +70,37 @@
 %if "%{pld_release}" == "th"
 %patch0 -p0
 %endif
-
 %if "%{pld_release}" == "ti"
 %patch1 -p0
 %endif
 
-
-%build
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d \
-	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
-	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_libdir}/%{name}} \
+	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/%{name}} \
+	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
 
 cp -a . $RPM_BUILD_ROOT%{_libdir}/%{name}
-sed 's, at LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox-bin
-ln -s mozilla-firefox-bin $RPM_BUILD_ROOT%{_bindir}/firefox-bin
+sed 's, at LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/%{name}
+ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/firefox-bin
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 cp -a icons/mozicon128.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox-bin.png
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
+# never package these
+# nss
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
+# nspr
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
+# mozldap
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
+
+# remove unecessary stuff
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,7 +114,7 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mozilla-firefox-bin
+%attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/firefox-bin
 
 # browser plugins v2
@@ -129,14 +139,12 @@
 %{_libdir}/%{name}/searchplugins
 %{_libdir}/%{name}/dictionaries
 %{_libdir}/%{name}/browserconfig.properties
-%{_libdir}/%{name}/libfreebl3.chk
-%{_libdir}/%{name}/libsoftokn3.chk
 %attr(755,root,root) %{_libdir}/%{name}/*.so
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
 %attr(755,root,root) %{_libdir}/%{name}/m*
 %attr(755,root,root) %{_libdir}/%{name}/f*
-%{_pixmapsdir}/mozilla-firefox-bin.png
-%{_desktopdir}/*.desktop
+%{_pixmapsdir}/%{name}.png
+%{_desktopdir}/%{name}.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -144,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2010/08/18 06:54:47  glen
+- cleanups, do not package nss/nspr .chk files
+
 Revision 1.59  2010/07/24 11:28:12  shadzik
 - 3.6.8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox-bin/mozilla-firefox-bin.spec?r1=1.59&r2=1.60&f=u