SPECS (DEVEL): xulrunner.spec - xulrunner 1.9, using FIREFOX_3_0b3...
glen
glen at pld-linux.org
Thu Mar 6 23:15:17 CET 2008
Author: glen Date: Thu Mar 6 22:15:17 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- xulrunner 1.9, using FIREFOX_3_0b3_RELEASE tag
---- Files affected:
SPECS:
xulrunner.spec (1.43 -> 1.43.2.1)
---- Diffs:
================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.43 SPECS/xulrunner.spec:1.43.2.1
--- SPECS/xulrunner.spec:1.43 Tue Feb 26 22:57:04 2008
+++ SPECS/xulrunner.spec Thu Mar 6 23:15:11 2008
@@ -1,27 +1,31 @@
# $Revision$, $Date$
+# TODO
+# - build with mozldap, however it includes headers nowhere to be found
#
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
%bcond_without gnome # disable all GNOME components (gnomevfs, gnome, gnomeui)
+%bcond_without kerberos # disable krb5 support
#
-%define _snap 20080208
-%define _rel 3
+%define subver 20080306
+%define rel 0.1
#
Summary: XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
Name: xulrunner
-Version: 1.8.1.12
-Release: 1.%{_snap}.%{_rel}
+Version: 1.9
+Release: %{subver}.%{rel}
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications
-Source0: %{name}-%{version}-%{_snap}-source.tar.bz2
-# Source0-md5: 337045388251dedf19f55ba1d8b64c92
+Source0: %{name}-%{version}-%{subver}-source.tar.bz2
+# Source0-md5: 98c24238adf8e6e86292abd9702d3bb1
Patch0: %{name}-ldap-with-nss.patch
Patch1: %{name}-install.patch
Patch2: %{name}-pc.patch
Patch3: %{name}-rpath.patch
+Patch4: %{name}-mozldap.patch
+Patch5: %{name}-configures.patch
URL: http://developer.mozilla.org/en/docs/XULRunner
-BuildRequires: /bin/csh
%{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: automake
BuildRequires: bzip2-devel
@@ -29,13 +33,14 @@
BuildRequires: freetype-devel >= 1:2.1.8
%{?with_gnome:BuildRequires: gnome-vfs2-devel >= 2.0}
BuildRequires: gtk+2-devel >= 1:2.0.0
-BuildRequires: krb5-devel
+%{?with_kerberos:BuildRequires: krb5-devel}
BuildRequires: libIDL-devel >= 0.8.0
%{?with_gnome:BuildRequires: libgnome-devel >= 2.0}
%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0}
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libpng-devel >= 1.2.7
BuildRequires: libstdc++-devel
+BuildRequires: mozldap-devel >= 6.0
BuildRequires: nspr-devel >= 1:4.6.4
BuildRequires: nss-devel >= 1:3.11.3-3
BuildRequires: pango-devel >= 1:1.6.0
@@ -110,20 +115,18 @@
%prep
%setup -qc
cd mozilla
+rm -r nsprpub
-rm -rf mozilla/modules/libbz2
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
cd mozilla
-
cp -f %{_datadir}/automake/config.* build/autoconf
-cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
-cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
cat << 'EOF' > .mozconfig
. $topsrcdir/xulrunner/config/mozconfig
@@ -172,11 +175,11 @@
ac_add_options --disable-javaxpcom
ac_add_options --disable-updater
ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-lcms
ac_add_options --enable-xft
ac_add_options --with-distribution-id=org.pld-linux
-ac_add_options --with-system-bz2
ac_add_options --with-system-jpeg
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
@@ -187,7 +190,7 @@
ac_add_options --disable-pedantic
ac_add_options --disable-xterm-updates
ac_add_options --enable-extensions="default,cookie,permissions,spellcheck"
-ac_add_options --enable-ldap
+#ac_add_options --enable-ldap
ac_add_options --enable-xprint
ac_add_options --with-pthreads
ac_add_options --with-x
@@ -202,7 +205,7 @@
rm -rf $RPM_BUILD_ROOT
cd mozilla
-%{__make} -C xpinstall/packager make-package \
+%{__make} -C xulrunner/installer stage-package \
DESTDIR=$RPM_BUILD_ROOT \
MOZ_PKG_APPDIR=%{_libdir}/%{name} \
PKG_SKIP_STRIP=1
@@ -216,11 +219,17 @@
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
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
# files created by regxpcom
touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
@@ -229,7 +238,7 @@
# header/development files
cp -rfLp dist/include $RPM_BUILD_ROOT%{_includedir}/%{name}
cp -rfLp dist/idl/* $RPM_BUILD_ROOT%{_datadir}/idl/xulrunner
-cp -rfLp dist/public/ldap{,-private} $RPM_BUILD_ROOT%{_includedir}/%{name}
+#cp -rfLp dist/public/ldap{,-private} $RPM_BUILD_ROOT%{_includedir}/%{name}
install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl $RPM_BUILD_ROOT%{_bindir}/xpidl
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_dump $RPM_BUILD_ROOT%{_bindir}/xpt_dump
@@ -240,9 +249,6 @@
%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
-# we use system pkgs
-rm $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-{nspr,nss}.pc
-
# rpath is used, can move to bindir
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/xulrunner-bin,%{_bindir}/xulrunner}
@@ -267,7 +273,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
+%post
%{_sbindir}/%{name}-chrome+xpcom-generate
%update_browser_plugins
@@ -287,39 +293,63 @@
%attr(755,root,root) %{_bindir}/xulrunner
%attr(744,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
-%dir %{_libdir}/%{name}/chrome
-%dir %{_libdir}/%{name}/components
-%dir %{_libdir}/%{name}/defaults
-%dir %{_libdir}/%{name}/greprefs
-%dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/res
-%dir %{_datadir}/%{name}
+# symlinks
+%{_libdir}/%{name}/chrome
+%{_libdir}/%{name}/defaults
+%{_libdir}/%{name}/dictionaries
+%{_libdir}/%{name}/greprefs
+%{_libdir}/%{name}/icons
+%{_libdir}/%{name}/modules
+%{_libdir}/%{name}/res
-%attr(755,root,root) %{_libdir}/%{name}/regxpcom
+#%attr(755,root,root) %{_libdir}/%{name}/regxpcom
%{_browserpluginsconfdir}/browsers.d/%{name}.*
%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
+%dir %{_libdir}/%{name}/plugins
+%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
+
+%{_libdir}/%{name}/dependentlibs.list
-%attr(755,root,root) %{_libdir}/%{name}/components/libauth.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libautoconfig.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libcookie.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libfileview.so
+# TODO system nss!
+%{_libdir}/%{name}/libfreebl3.chk
+%{_libdir}/%{name}/libsoftokn3.chk
+%attr(755,root,root) %{_libdir}/%{name}/libfreebl3.so
+%attr(755,root,root) %{_libdir}/%{name}/libnss3.so
+%attr(755,root,root) %{_libdir}/%{name}/libnssckbi.so
+%attr(755,root,root) %{_libdir}/%{name}/libnssdbm3.so
+%attr(755,root,root) %{_libdir}/%{name}/libnssutil3.so
+%attr(755,root,root) %{_libdir}/%{name}/libsmime3.so
+%attr(755,root,root) %{_libdir}/%{name}/libsoftokn3.so
+%attr(755,root,root) %{_libdir}/%{name}/libsqlite3.so
+%attr(755,root,root) %{_libdir}/%{name}/libssl3.so
+
+%{_libdir}/%{name}/platform.ini
+%attr(755,root,root) %{_libdir}/%{name}/*.sh
+%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
+
+
+%dir %{_libdir}/%{name}/components
+#%attr(755,root,root) %{_libdir}/%{name}/components/libauth.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libautoconfig.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libcookie.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libfileview.so
%{?with_gnome:%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so}
%{?with_gnome:%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so}
%{?with_gnome:%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so}
-%attr(755,root,root) %{_libdir}/%{name}/components/libmozldap.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libmyspell.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libpermissions.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libpipboot.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libpipnss.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libpippki.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libspellchecker.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libsystem-pref.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libtransformiix.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libuniversalchardet.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libwebsrvcs.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libxmlextras.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libxulutil.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libmozldap.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libmyspell.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libpermissions.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libpipboot.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libpipnss.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libpippki.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libspellchecker.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libsystem-pref.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libtransformiix.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libuniversalchardet.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libwebsrvcs.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libxmlextras.so
+#%attr(755,root,root) %{_libdir}/%{name}/components/libxulutil.so
%{_libdir}/%{name}/components/accessibility*.xpt
%{_libdir}/%{name}/components/alerts.xpt
@@ -348,7 +378,7 @@
%{_libdir}/%{name}/components/filepicker.xpt
%{_libdir}/%{name}/components/find.xpt
%{_libdir}/%{name}/components/gfx*.xpt
-%{_libdir}/%{name}/components/history.xpt
+#%{_libdir}/%{name}/components/history.xpt
%{_libdir}/%{name}/components/htmlparser.xpt
%{?with_gnome:%{_libdir}/%{name}/components/imgicon.xpt}
%{_libdir}/%{name}/components/imglib2.xpt
@@ -363,7 +393,7 @@
%{_libdir}/%{name}/components/moz*.xpt
%{_libdir}/%{name}/components/necko*.xpt
%{_libdir}/%{name}/components/oji.xpt
-%{_libdir}/%{name}/components/passwordmgr.xpt
+#%{_libdir}/%{name}/components/passwordmgr.xpt
%{_libdir}/%{name}/components/pipboot.xpt
%{_libdir}/%{name}/components/pipnss.xpt
%{_libdir}/%{name}/components/pippki.xpt
@@ -371,7 +401,7 @@
%{_libdir}/%{name}/components/pref.xpt
%{_libdir}/%{name}/components/prefetch.xpt
%{_libdir}/%{name}/components/profile.xpt
-%{_libdir}/%{name}/components/progressDlg.xpt
+#%{_libdir}/%{name}/components/progressDlg.xpt
%{_libdir}/%{name}/components/proxyObjInst.xpt
%{_libdir}/%{name}/components/rdf.xpt
%{_libdir}/%{name}/components/satchel.xpt
@@ -391,7 +421,7 @@
%{_libdir}/%{name}/components/webBrowser_core.xpt
%{_libdir}/%{name}/components/webbrowserpersist.xpt
%{_libdir}/%{name}/components/webshell_idls.xpt
-%{_libdir}/%{name}/components/websrvcs.xpt
+#%{_libdir}/%{name}/components/websrvcs.xpt
%{_libdir}/%{name}/components/widget.xpt
%{_libdir}/%{name}/components/windowds.xpt
%{_libdir}/%{name}/components/windowwatcher.xpt
@@ -399,14 +429,14 @@
%{_libdir}/%{name}/components/FeedProcessor.js
%{_libdir}/%{name}/components/jsconsole-clhandler.js
-%{_libdir}/%{name}/components/nsCloseAllWindows.js
+#%{_libdir}/%{name}/components/nsCloseAllWindows.js
%{_libdir}/%{name}/components/nsDefaultCLH.js
%{_libdir}/%{name}/components/nsDictionary.js
%{_libdir}/%{name}/components/nsExtensionManager.js
%{_libdir}/%{name}/components/nsFilePicker.js
%{_libdir}/%{name}/components/nsHelperAppDlg.js
-%{_libdir}/%{name}/components/nsInterfaceInfoToIDL.js
-%{_libdir}/%{name}/components/nsKillAll.js
+#%{_libdir}/%{name}/components/nsInterfaceInfoToIDL.js
+#%{_libdir}/%{name}/components/nsKillAll.js
%{_libdir}/%{name}/components/nsProgressDialog.js
%{_libdir}/%{name}/components/nsProxyAutoConfig.js
%{_libdir}/%{name}/components/nsResetPref.js
@@ -415,38 +445,52 @@
%{_libdir}/%{name}/components/nsXmlRpcClient.js
%{_libdir}/%{name}/components/nsXULAppInstall.js
+%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
+%{_libdir}/%{name}/components/contentprefs.xpt
+%{_libdir}/%{name}/components/loginmgr.xpt
+%{_libdir}/%{name}/components/nsAddonRepository.js
+%{_libdir}/%{name}/components/nsBlocklistService.js
+%{_libdir}/%{name}/components/nsContentDispatchChooser.js
+%{_libdir}/%{name}/components/nsContentPrefService.js
+%{_libdir}/%{name}/components/nsDownloadManagerUI.js
+%{_libdir}/%{name}/components/nsHandlerService.js
+%{_libdir}/%{name}/components/nsLivemarkService.js
+%{_libdir}/%{name}/components/nsLoginInfo.js
+%{_libdir}/%{name}/components/nsLoginManager.js
+%{_libdir}/%{name}/components/nsLoginManagerPrompter.js
+%{_libdir}/%{name}/components/nsTaggingService.js
+%{_libdir}/%{name}/components/nsTryToClose.js
+%{_libdir}/%{name}/components/nsWebHandlerApp.js
+%{_libdir}/%{name}/components/places.xpt
+%{_libdir}/%{name}/components/pluginGlue.js
+%{_libdir}/%{name}/components/storage-Legacy.js
+%{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
+%{_libdir}/%{name}/components/zipwriter.xpt
+
# do not use *.dat here, so check-files can catch any new files
# (and they won't be just silently placed empty in rpm)
%ghost %{_libdir}/%{name}/components/compreg.dat
%ghost %{_libdir}/%{name}/components/xpti.dat
-%dir %{_datadir}/%{name}/chrome
-%{_datadir}/%{name}/chrome/classic.jar
-%{_datadir}/%{name}/chrome/classic.manifest
-%{_datadir}/%{name}/chrome/comm.jar
-%{_datadir}/%{name}/chrome/comm.manifest
-%{_datadir}/%{name}/chrome/en-US.jar
-%{_datadir}/%{name}/chrome/en-US.manifest
-%{_datadir}/%{name}/chrome/pippki.jar
-%{_datadir}/%{name}/chrome/pippki.manifest
-%{_datadir}/%{name}/chrome/toolkit.jar
-%{_datadir}/%{name}/chrome/toolkit.manifest
-
-%{_datadir}/%{name}/chrome/chromelist.txt
-#%ghost %{_datadir}/%{name}/chrome/installed-chrome.txt
+%{_libdir}/%{name}/LICENSE
+%{_libdir}/%{name}/README.txt
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/chrome
%{_datadir}/%{name}/defaults
%{_datadir}/%{name}/greprefs
+%{_datadir}/%{name}/icons
+%{_datadir}/%{name}/modules
%{_datadir}/%{name}/res
%files libs
%defattr(644,root,root,755)
%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/libgtkembedmoz.so
-%attr(755,root,root) %{_libdir}/%{name}/libldap50.so
+#%attr(755,root,root) %{_libdir}/%{name}/libgtkembedmoz.so
+#%attr(755,root,root) %{_libdir}/%{name}/libldap50.so
%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
-%attr(755,root,root) %{_libdir}/%{name}/libprldap50.so
-%attr(755,root,root) %{_libdir}/%{name}/libssldap50.so
+#%attr(755,root,root) %{_libdir}/%{name}/libprldap50.so
+#%attr(755,root,root) %{_libdir}/%{name}/libssldap50.so
%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
%attr(755,root,root) %{_libdir}/%{name}/libxul.so
@@ -457,11 +501,11 @@
%attr(755,root,root) %{_bindir}/xpidl
%attr(755,root,root) %{_bindir}/xpt_dump
%attr(755,root,root) %{_bindir}/xpt_link
-%attr(755,root,root) %{_bindir}/xulrunner-config
+#%attr(755,root,root) %{_bindir}/xulrunner-config
%attr(755,root,root) %{_libdir}/%{name}/xulrunner-stub
%{_includedir}/%{name}
%{_datadir}/idl/%{name}
-%{_pkgconfigdir}/*
+#%{_pkgconfigdir}/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -469,6 +513,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.43.2.1 2008-03-06 22:15:11 glen
+- xulrunner 1.9, using FIREFOX_3_0b3_RELEASE tag
+
Revision 1.43 2008-02-26 21:57:04 arekm
- rel .3; move idl files to correct location
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xulrunner.spec?r1=1.43&r2=1.43.2.1&f=u
More information about the pld-cvs-commit
mailing list