SPECS (AC-branch): mozilla-firefox.spec - drop -libs, no apps shou...

glen glen at pld-linux.org
Tue Oct 23 16:51:46 CEST 2007


Author: glen                         Date: Tue Oct 23 14:51:46 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- drop -libs, no apps should be built against firefox (use xulrunner); rel 2

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.160.2.34 -> 1.160.2.35) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.160.2.34 SPECS/mozilla-firefox.spec:1.160.2.35
--- SPECS/mozilla-firefox.spec:1.160.2.34	Sat Oct 20 18:18:18 2007
+++ SPECS/mozilla-firefox.spec	Tue Oct 23 16:51:41 2007
@@ -23,7 +23,7 @@
 Summary(pl):	Firefox Community Edition - przegl±darka WWW
 Name:		mozilla-firefox
 Version:	%{firefox_ver}
-Release:	1
+Release:	2
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -66,12 +66,12 @@
 BuildRequires:	zlib-devel >= 1.2.3
 Requires(post):	mktemp >= 1.5-18
 Requires:	%{name}-lang-resources = %{version}
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	browser-plugins >= 2.0
 Requires:	nspr >= 1:4.6.3
 Requires:	nss >= 1:3.11.3
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
+Obsoletes:	mozilla-firefox-libs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # firefox/thunderbird/seamonkey provide their own versions
@@ -93,18 +93,6 @@
 stworzon± z my¶l± o zgodno¶ci ze standardami, wydajno¶ci± i
 przeno¶no¶ci±.
 
-%package libs
-Summary:	Firefox Community Edition shared libraries
-Summary(pl):	Biblioteki wspó³dzielone przegl±darki Firefox Community Edition
-Group:		Libraries
-Conflicts:	mozilla-firefox < 2.0-1.4
-
-%description libs
-Firefox Community Edition shared libraries.
-
-%description libs -l pl
-Biblioteki wspó³dzielone przegl±darki Firefox Community Edition.
-
 %package addon-tidy
 Summary:	HTML Validator for Firefox
 Summary(pl):	Narzêdzie do sprawdzania poprawno¶ci HTML-a dla Firefoksa
@@ -340,6 +328,9 @@
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
 
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/*.so
+
 %dir %{_libdir}/%{name}/components
 %attr(755,root,root) %{_libdir}/%{name}/components/libaccessibility.so
 %attr(755,root,root) %{_libdir}/%{name}/components/libappcomps.so
@@ -619,11 +610,6 @@
 %ghost %{_libdir}/%{name}/components/compreg.dat
 %ghost %{_libdir}/%{name}/components/xpti.dat
 
-%files libs
-%defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*.so
-
 %files lang-en
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/chrome/en-US.jar
@@ -642,6 +628,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160.2.35  2007/10/23 14:51:41  glen
+- drop -libs, no apps should be built against firefox (use xulrunner); rel 2
+
 Revision 1.160.2.34  2007/10/20 16:18:18  hawk
 - updated to 2.0.0.8, removed obsolete nopangoxft patch, renumbered patches
 - fixes CVE-2007-4841, CVE-2007-5338, CVE-2007-5337, CVE-2007-5334,
================================================================

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



More information about the pld-cvs-commit mailing list