packages: xulrunner/xulrunner.spec - started update to 2.0 - use gio instea...
megabajt
megabajt at pld-linux.org
Wed Mar 23 18:20:27 CET 2011
Author: megabajt Date: Wed Mar 23 17:20:27 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- started update to 2.0
- use gio instead of gnome-vfs
- -gcc3.patch, -prefs.patch and -ssl_oldapi.patch needs update
- removed obsolete configure options
- release 0.1
---- Files affected:
packages/xulrunner:
xulrunner.spec (1.171 -> 1.172)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.171 packages/xulrunner/xulrunner.spec:1.172
--- packages/xulrunner/xulrunner.spec:1.171 Fri Mar 4 12:00:14 2011
+++ packages/xulrunner/xulrunner.spec Wed Mar 23 18:20:21 2011
@@ -5,7 +5,6 @@
%bcond_without gnomeui # disable gnomeui support
%bcond_without gnomevfs # disable GNOME comp. (gconf+libgnome+gnomevfs) and gnomevfs ext.
%bcond_without gnome # disable all GNOME components (gnome+gnomeui+gnomevfs)
-%bcond_with mozldap # build with system mozldap
%bcond_with qt # build with qt toolkit
%if %{without gnome}
@@ -16,10 +15,10 @@
# On updating version, grab CVE links from:
# https://www.mozilla.org/security/known-vulnerabilities/firefox36.html#firefox3.6.14
-# convert firefox release number to platform version: 3.6 -> 1.9.2, 3.6.x -> 1.9.2.x
-%define xulrunner_main 1.9.2
-%define firefox_ver 3.6.15
-%define xulrunner_ver %(v=%{firefox_ver}; echo %{xulrunner_main}${v#3.6})
+# convert firefox release number to platform version: 4.0.x -> 2.0.x
+%define xulrunner_main 2.0
+%define firefox_ver 4.0
+%define xulrunner_ver %(v=%{firefox_ver}; echo %{xulrunner_main}${v#4.0})
# The actual sqlite version (see RHBZ#480989):
%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
@@ -28,17 +27,16 @@
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
Name: xulrunner
Version: %{xulrunner_ver}
-Release: 1
+Release: 0.1
Epoch: 2
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications
# Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
# instead of waiting for mozilla to copy file on ftp.
Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{firefox_ver}/source/firefox-%{firefox_ver}.source.tar.bz2
-# Source0-md5: fcf8042948d91f1f3d9c33599b79cf35
+# Source0-md5: 3468a2c463b4fc2788ba621e4b511c30
Patch0: %{name}-install.patch
Patch1: %{name}-rpath.patch
-Patch2: %{name}-mozldap.patch
Patch3: %{name}-gcc3.patch
Patch4: %{name}-nss_cflags.patch
Patch5: %{name}-paths.patch
@@ -46,23 +44,19 @@
Patch7: %{name}-prefs.patch
Patch8: %{name}-ssl_oldapi.patch
Patch9: %{name}-ppc.patch
-Patch10: %{name}-libpng.patch
-# http://bugzilla.mozilla.org/show_bug.cgi?id=597174
-Patch11: fix-animated-gifs.patch
URL: http://developer.mozilla.org/en/docs/XULRunner
%{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: alsa-lib-devel
BuildRequires: automake
BuildRequires: bzip2-devel
-BuildRequires: cairo-devel >= 1.8.8
+BuildRequires: cairo-devel >= 1.10.2-5
BuildRequires: dbus-glib-devel >= 0.60
BuildRequires: freetype-devel >= 1:2.1.8
-%{?with_gnomevfs:BuildRequires: gnome-vfs2-devel >= 2.0}
+BuildRequires: glib2-devel >= 1:2.16.0
%{!?with_qt:BuildRequires: gtk+2-devel >= 2:2.10.0}
BuildRequires: hunspell-devel >= 1.2.3
BuildRequires: libIDL-devel >= 0.8.0
BuildRequires: libdnet-devel
-%{?with_gnomevfs:BuildRequires: libgnome-devel >= 2.0}
%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
BuildRequires: libiw-devel
BuildRequires: libjpeg-devel >= 6b
@@ -70,21 +64,22 @@
BuildRequires: libpng(APNG)-devel >= 0.10
BuildRequires: libpng-devel >= 1.2.17
BuildRequires: libstdc++-devel
-%{?with_mozldap:BuildRequires: mozldap-devel >= 6.0}
-BuildRequires: nspr-devel >= 1:4.8.6
-BuildRequires: nss-devel >= 1:3.12.8
+BuildRequires: libvpx-devel
+BuildRequires: nspr-devel >= 1:4.8.7
+BuildRequires: nss-devel >= 1:3.12.9
BuildRequires: pango-devel >= 1:1.14.0
BuildRequires: pkgconfig
-BuildRequires: python >= 1:2.4
+BuildRequires: python >= 1:2.5
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.453
BuildRequires: sed >= 4.0
-BuildRequires: sqlite3-devel >= 3.7.2
+BuildRequires: sqlite3-devel >= 3.7.5-2
BuildRequires: startup-notification-devel >= 0.8
%if "%{pld_release}" == "ac"
BuildRequires: xcursor-devel
BuildRequires: xft-devel >= 2.1-2
%else
+BuildRequires: xorg-lib-libXScrnSaver-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXt-devel
@@ -95,8 +90,8 @@
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: browser-plugins >= 2.0
Requires: myspell-common
-Requires: nspr >= 1:4.8.6
-Requires: nss >= 1:3.12.8
+Requires: nspr >= 1:4.8.7
+Requires: nss >= 1:3.12.9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+
@@ -128,7 +123,7 @@
Summary: XULRunner shared libraries
Summary(pl.UTF-8): Biblioteki współdzielone XULRunnera
Group: X11/Libraries
-Requires: cairo >= 1.8.8
+Requires: cairo >= 1.10.2-5
Requires: dbus-glib >= 0.60
%{!?with_qt:Requires: gtk+2 >= 2:2.10.0}
Requires: libpng >= 1.2.17
@@ -148,8 +143,8 @@
Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia programów używających XULRunnera
Group: X11/Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: nspr-devel >= 1:4.8.6
-Requires: nss-devel >= 1:3.12.8
+Requires: nspr-devel >= 1:4.8.7
+Requires: nss-devel >= 1:3.12.9
Obsoletes: mozilla-devel
Obsoletes: mozilla-firefox-devel
Obsoletes: seamonkey-devel
@@ -184,18 +179,16 @@
%patch0 -p1
%patch1 -p1
-%{?with_mozldap:%patch2 -p1}
%if "%{cc_version}" < "3.4"
-%patch3 -p2
+#%%patch3 -p2
%endif
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+# needs update
+#%%patch7 -p1
+#%%patch8 -p1
%patch9 -p1
-%patch10 -p0
-%patch11 -p1
%build
@@ -254,11 +247,7 @@
%else
ac_add_options --disable-gnomeui
%endif
-%if %{with gnomevfs}
-ac_add_options --enable-gnomevfs
-%else
ac_add_options --disable-gnomevfs
-%endif
ac_add_options --disable-crashreporter
ac_add_options --disable-installer
ac_add_options --disable-javaxpcom
@@ -268,18 +257,14 @@
%else
ac_add_options --enable-default-toolkit=cairo-gtk2
%endif
-ac_add_options --disable-xprint
-ac_add_options --enable-canvas
+ac_add_options --enable-gio
ac_add_options --enable-libxul
ac_add_options --enable-pango
+ac_add_options --enable-shared-js
ac_add_options --enable-startup-notification
-ac_add_options --enable-svg
ac_add_options --enable-system-cairo
ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-lcms
ac_add_options --enable-system-sqlite
-#ac_add_options --enable-xft
-ac_add_options --enable-xinerama
ac_add_options --with-distribution-id=org.pld-linux
ac_add_options --with-pthreads
ac_add_options --with-system-bz2
@@ -287,9 +272,9 @@
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-png
+ac_add_options --with-system-libvpx
ac_add_options --with-system-zlib
ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
-
ac_add_options --disable-pedantic
ac_add_options --disable-xterm-updates
ac_add_options --enable-extensions="default,cookie,permissions,spellcheck"
@@ -318,13 +303,11 @@
# move arch independant ones to datadir
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
-ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
@@ -348,7 +331,6 @@
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list
%clean
rm -rf $RPM_BUILD_ROOT
@@ -376,7 +358,6 @@
%{_libdir}/%{name}/chrome
%{_libdir}/%{name}/defaults
%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/greprefs
%{_libdir}/%{name}/icons
%{_libdir}/%{name}/modules
%{_libdir}/%{name}/res
@@ -387,7 +368,8 @@
%dir %{_libdir}/%{name}/plugins
%dir %{_libdir}/%{name}/components
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
+%{_libdir}/%{name}/chrome.manifest
+%{_libdir}/%{name}/greprefs.js
%attr(755,root,root) %{_libdir}/%{name}/*.sh
%attr(755,root,root) %{_libdir}/%{name}/js
@@ -396,7 +378,6 @@
%attr(755,root,root) %{_libdir}/%{name}/plugin-container
%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so
%{_libdir}/%{name}/components/accessibility*.xpt
%{_libdir}/%{name}/components/alerts.xpt
@@ -411,7 +392,6 @@
%{_libdir}/%{name}/components/commandlines.xpt
%{_libdir}/%{name}/components/composer.xpt
%{_libdir}/%{name}/components/content_*.xpt
-%{_libdir}/%{name}/components/contentprefs.xpt
%{_libdir}/%{name}/components/cookie.xpt
%{_libdir}/%{name}/components/directory.xpt
%{_libdir}/%{name}/components/docshell.xpt
@@ -433,6 +413,7 @@
%{_libdir}/%{name}/components/inspector.xpt
%{_libdir}/%{name}/components/intl.xpt
%{_libdir}/%{name}/components/jar.xpt
+%{_libdir}/%{name}/components/jetpack.xpt
%{_libdir}/%{name}/components/js*.xpt
%{_libdir}/%{name}/components/layout*.xpt
%{_libdir}/%{name}/components/locale.xpt
@@ -450,24 +431,27 @@
%{_libdir}/%{name}/components/pref.xpt
%{_libdir}/%{name}/components/prefetch.xpt
%{_libdir}/%{name}/components/profile.xpt
-%{_libdir}/%{name}/components/proxyObjInst.xpt
+%{_libdir}/%{name}/components/proxyObject.xpt
%{_libdir}/%{name}/components/rdf.xpt
%{_libdir}/%{name}/components/satchel.xpt
%{_libdir}/%{name}/components/saxparser.xpt
+%{_libdir}/%{name}/components/services-crypto-component.xpt
%{_libdir}/%{name}/components/shistory.xpt
%{_libdir}/%{name}/components/spellchecker.xpt
+%{_libdir}/%{name}/components/startupcache.xpt
%{_libdir}/%{name}/components/storage.xpt
%{_libdir}/%{name}/components/toolkitprofile.xpt
%{_libdir}/%{name}/components/toolkitremote.xpt
-%{_libdir}/%{name}/components/toolkitsearch.xpt
%{_libdir}/%{name}/components/txmgr.xpt
%{_libdir}/%{name}/components/txtsvc.xpt
%{_libdir}/%{name}/components/uconv.xpt
%{_libdir}/%{name}/components/unicharutil.xpt
%{_libdir}/%{name}/components/update.xpt
%{_libdir}/%{name}/components/uriloader.xpt
+%{_libdir}/%{name}/components/url-classifier.xpt
%{_libdir}/%{name}/components/urlformatter.xpt
%{_libdir}/%{name}/components/webBrowser_core.xpt
+%{_libdir}/%{name}/components/webapps.xpt
%{_libdir}/%{name}/components/webbrowserpersist.xpt
%{_libdir}/%{name}/components/webshell_idls.xpt
%{_libdir}/%{name}/components/widget.xpt
@@ -476,43 +460,89 @@
%{_libdir}/%{name}/components/x*.xpt
%{_libdir}/%{name}/components/zipwriter.xpt
+%{_libdir}/%{name}/components/ConsoleAPI.js
+%{_libdir}/%{name}/components/ConsoleAPI.manifest
%{_libdir}/%{name}/components/FeedProcessor.js
+%{_libdir}/%{name}/components/FeedProcessor.manifest
%{_libdir}/%{name}/components/GPSDGeolocationProvider.js
-%{_libdir}/%{name}/components/jsconsole-clhandler.js
+%{_libdir}/%{name}/components/GPSDGeolocationProvider.manifest
%{_libdir}/%{name}/components/NetworkGeolocationProvider.js
-%{_libdir}/%{name}/components/nsAddonRepository.js
+%{_libdir}/%{name}/components/NetworkGeolocationProvider.manifest
+%{_libdir}/%{name}/components/PlacesCategoriesStarter.js
+%{_libdir}/%{name}/components/addonManager.js
+%{_libdir}/%{name}/components/amContentHandler.js
+%{_libdir}/%{name}/components/amWebInstallListener.js
+%{_libdir}/%{name}/components/components.manifest
+%{_libdir}/%{name}/components/contentAreaDropListener.js
+%{_libdir}/%{name}/components/contentAreaDropListener.manifest
+%{_libdir}/%{name}/components/contentSecurityPolicy.js
+%{_libdir}/%{name}/components/contentSecurityPolicy.manifest
+%{_libdir}/%{name}/components/crypto-SDR.js
+%{_libdir}/%{name}/components/extensions.manifest
+%{_libdir}/%{name}/components/interfaces.manifest
+%{_libdir}/%{name}/components/jsconsole-clhandler.js
+%{_libdir}/%{name}/components/jsconsole-clhandler.manifest
+%{_libdir}/%{name}/components/messageWakeupService.js
+%{_libdir}/%{name}/components/messageWakeupService.manifest
%{_libdir}/%{name}/components/nsBadCertHandler.js
+%{_libdir}/%{name}/components/nsBadCertHandler.manifest
%{_libdir}/%{name}/components/nsBlocklistService.js
%{_libdir}/%{name}/components/nsContentDispatchChooser.js
+%{_libdir}/%{name}/components/nsContentDispatchChooser.manifest
%{_libdir}/%{name}/components/nsContentPrefService.js
+%{_libdir}/%{name}/components/nsContentPrefService.manifest
%{_libdir}/%{name}/components/nsDefaultCLH.js
+%{_libdir}/%{name}/components/nsDefaultCLH.manifest
%{_libdir}/%{name}/components/nsDownloadManagerUI.js
-%{_libdir}/%{name}/components/nsExtensionManager.js
+%{_libdir}/%{name}/components/nsDownloadManagerUI.manifest
%{_libdir}/%{name}/components/nsFilePicker.js
+%{_libdir}/%{name}/components/nsFilePicker.manifest
%{_libdir}/%{name}/components/nsFormAutoComplete.js
+%{_libdir}/%{name}/components/nsFormHistory.js
%{_libdir}/%{name}/components/nsHandlerService.js
+%{_libdir}/%{name}/components/nsHandlerService.manifest
%{_libdir}/%{name}/components/nsHelperAppDlg.js
+%{_libdir}/%{name}/components/nsHelperAppDlg.manifest
%{_libdir}/%{name}/components/nsINIProcessor.js
+%{_libdir}/%{name}/components/nsINIProcessor.manifest
+%{_libdir}/%{name}/components/nsInputListAutoComplete.js
%{_libdir}/%{name}/components/nsLivemarkService.js
%{_libdir}/%{name}/components/nsLoginInfo.js
%{_libdir}/%{name}/components/nsLoginManager.js
%{_libdir}/%{name}/components/nsLoginManagerPrompter.js
+%{_libdir}/%{name}/components/nsMicrosummaryService.js
%{_libdir}/%{name}/components/nsPlacesAutoComplete.js
-%{_libdir}/%{name}/components/nsPlacesDBFlush.js
-%{_libdir}/%{name}/components/nsProgressDialog.js
+%{_libdir}/%{name}/components/nsPlacesAutoComplete.manifest
+%{_libdir}/%{name}/components/nsPlacesExpiration.js
+%{_libdir}/%{name}/components/nsPrompter.js
+%{_libdir}/%{name}/components/nsPrompter.manifest
%{_libdir}/%{name}/components/nsProxyAutoConfig.js
+%{_libdir}/%{name}/components/nsProxyAutoConfig.manifest
%{_libdir}/%{name}/components/nsSearchService.js
%{_libdir}/%{name}/components/nsSearchSuggestions.js
%{_libdir}/%{name}/components/nsTaggingService.js
%{_libdir}/%{name}/components/nsTryToClose.js
+%{_libdir}/%{name}/components/nsTryToClose.manifest
%{_libdir}/%{name}/components/nsUpdateTimerManager.js
+%{_libdir}/%{name}/components/nsUpdateTimerManager.manifest
+%{_libdir}/%{name}/components/nsURLClassifier.manifest
%{_libdir}/%{name}/components/nsURLFormatter.js
+%{_libdir}/%{name}/components/nsURLFormatter.manifest
+%{_libdir}/%{name}/components/nsUrlClassifierLib.js
+%{_libdir}/%{name}/components/nsUrlClassifierListManager.js
%{_libdir}/%{name}/components/nsWebHandlerApp.js
+%{_libdir}/%{name}/components/nsWebHandlerApp.manifest
%{_libdir}/%{name}/components/nsXULAppInstall.js
-%{_libdir}/%{name}/components/pluginGlue.js
+%{_libdir}/%{name}/components/nsXULAppInstall.manifest
+%{_libdir}/%{name}/components/passwordmgr.manifest
+%{_libdir}/%{name}/components/pluginGlue.manifest
+%{_libdir}/%{name}/components/satchel.manifest
%{_libdir}/%{name}/components/storage-Legacy.js
%{_libdir}/%{name}/components/storage-mozStorage.js
+%{_libdir}/%{name}/components/toolkitplaces.manifest
+%{_libdir}/%{name}/components/toolkitsearch.manifest
%{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
+%{_libdir}/%{name}/components/txEXSLTRegExFunctions.manifest
# do not use *.dat here, so check-files can catch any new files
# (and they won't be just silently placed empty in rpm)
@@ -522,7 +552,6 @@
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/chrome
%{_datadir}/%{name}/defaults
-%{_datadir}/%{name}/greprefs
%{_datadir}/%{name}/icons
%{_datadir}/%{name}/modules
%{_datadir}/%{name}/res
@@ -531,17 +560,16 @@
%defattr(644,root,root,755)
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/platform.ini
+%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
%attr(755,root,root) %{_libdir}/%{name}/libxul.so
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/regxpcom
%attr(755,root,root) %{_bindir}/xpidl
%attr(755,root,root) %{_bindir}/xpt_dump
%attr(755,root,root) %{_bindir}/xpt_link
-%attr(755,root,root) %{_libdir}/%{name}/regxpcom
%attr(755,root,root) %{_libdir}/%{name}/xpcshell
%attr(755,root,root) %{_libdir}/%{name}/xpidl
%attr(755,root,root) %{_libdir}/%{name}/xpt_dump
@@ -563,7 +591,6 @@
%if %{with gnomeui}
%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
%endif
-%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -572,6 +599,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.172 2011/03/23 17:20:21 megabajt
+- started update to 2.0
+- use gio instead of gnome-vfs
+- -gcc3.patch, -prefs.patch and -ssl_oldapi.patch needs update
+- removed obsolete configure options
+- release 0.1
+
Revision 1.171 2011/03/04 11:00:14 lisu
- up to 1.9.2.15 (firefox 3.6.15)
- use __rm macro
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.171&r2=1.172&f=u
More information about the pld-cvs-commit
mailing list