[meego-commits] 9636: Changes to devel:browser/fennec-qt

[sbinner]

Hi,
I have made the following changes to fennec-qt in project devel:browser. Please review and accept ASAP.

Thank You,
sbinner

[This message was auto-generated]

---

Request #9636:

  submit:   home:sbinner:branches:devel:browser/fennec-qt(r8)(cleanup) -> devel:browser/fennec-qt


Message:
    * Mon Nov 22 10:50:00 UTC 2010 Stephan Binner <stephan.binner at basyskom.de> - 4.0b8pre1109.5
- Build against system libnss and libnspr libraries (BMC#10123)

State:   new          2010-11-22T02:52:51 sbinner
Comment: None



changes files:
--------------
--- fennec-qt.changes
+++ fennec-qt.changes
@@ -0,0 +1,3 @@
+* Mon Nov 22 10:50:00 UTC 2010 Stephan Binner <stephan.binner at basyskom.de> - 4.0b8pre1109.5
+- Build against system libnss and libnspr libraries (BMC#10123)
+

spec files:
-----------
--- fennec-qt.spec
+++ fennec-qt.spec
@@ -2,7 +2,7 @@
 
 Name:       fennec-qt
 Summary:    Fennec Mobile Web Browser with Qt/MeeGo Touch
-Version:    4.0b8pre1109.4
+Version:    4.0b8pre1109.5
 Release:    1
 Group:      Applications/Internet
 License:    MPLv1.1 or GPLv2+ or LGPLv2+
@@ -48,6 +48,8 @@
 BuildRequires:  libffi-devel 
 BuildRequires:  pixman-devel 
 BuildRequires:  cairo-devel 
+BuildRequires:  nss-devel
+BuildRequires:  nspr-devel
 BuildRequires:  fdupes
 Conflicts:   fennec
 
@@ -194,9 +196,6 @@
 %{_libdir}/pkgconfig/mozilla-gtkmozembed-embedding.pc
 %{_libdir}/pkgconfig/mozilla-plugin.pc
 %{_libdir}/pkgconfig/mozilla-js.pc
-%{_libdir}/pkgconfig/mozilla-nss.pc
-%{_libdir}/pkgconfig/mozilla-nspr.pc
-%{_libdir}/xulrunner-%{moz_milestone}/nspr-config
 %{_libdir}/xulrunner-%{moz_milestone}/xpt_dump
 %{_libdir}/xulrunner-%{moz_milestone}/xpt_link
 %{_libdir}/xulrunner-%{moz_milestone}/xpidl
@@ -212,7 +211,6 @@
 %{_libdir}/xulrunner-%{moz_milestone}/chrome.manifest
 %{_libdir}/xulrunner-%{moz_milestone}/components
 %{_libdir}/xulrunner-%{moz_milestone}/dependentlibs.list
-%{_libdir}/xulrunner-%{moz_milestone}/libsoftokn3.chk
 %{_libdir}/xulrunner-%{moz_milestone}/platform.ini
 
 %{_datadir}/xulrunner-%{moz_milestone}/chrome
@@ -221,15 +219,12 @@
 %{_datadir}/xulrunner-%{moz_milestone}/modules
 %{_datadir}/xulrunner-%{moz_milestone}/res
 
-%{_libdir}/xulrunner-%{moz_milestone}/libfreebl3.chk
-%{_libdir}/xulrunner-%{moz_milestone}/libnssdbm3.chk
 
 %{_libdir}/xulrunner-%{moz_milestone}/lib*.so
 
 %{_libdir}/xulrunner-%{moz_milestone}/run-mozilla.sh
 %{_libdir}/xulrunner-%{moz_milestone}/xpcshell
 %{_libdir}/xulrunner-%{moz_milestone}/mozilla-xremote-client
-#%{_libdir}/xulrunner-%{moz_milestone}/mozilla-runti*
 %{_libdir}/xulrunner-%{moz_milestone}/plugin-cont*
 %{_libdir}/xulrunner-%{moz_milestone}/xulrunner
 %{_libdir}/xulrunner-%{moz_milestone}/xulrunner-bin

other changes:
--------------

++++++ mozconfig
--- mozconfig
+++ mozconfig
@@ -61,6 +61,9 @@
 #ac_add_options --disable-ogg
 #ac_add_options --disable-webm
 
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+
 #Debugging
 export LDFLAGS="-Wl,--no-keep-memory"
 LDFLAGS="-Wl,--no-keep-memory"