SPECS (AC-branch): xulrunner.spec - updated to 1.8.1.1, snapshot c...

hawk hawk at pld-linux.org
Wed Jan 3 22:06:27 CET 2007


Author: hawk                         Date: Wed Jan  3 21:06:27 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 1.8.1.1, snapshot checked out from Mozilla CVS from
  FIREFOX_2_0_0_1_RELEASE branch, dropped nsIPermission.patch and
  nsISidebar.patch - already in sources, dropped nss patch - no longer
  needed, updated install.patch, builds and seems to work (tested
  with Galeon and Epiphany)

---- Files affected:
SPECS:
   xulrunner.spec (1.7.2.9 -> 1.7.2.10) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.7.2.9 SPECS/xulrunner.spec:1.7.2.10
--- SPECS/xulrunner.spec:1.7.2.9	Tue Jan  2 19:09:01 2007
+++ SPECS/xulrunner.spec	Wed Jan  3 22:06:22 2007
@@ -3,20 +3,19 @@
 %bcond_with	tests	# enable tests (whatever they check)
 %bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
 #
+%define		_snap	20070102
+#
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
-Version:	1.8.0.4
-Release:	3
+Version:	1.8.1.1
+Release:	1.%{_snap}.1
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
-Source0:	http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/%{version}/source/%{name}-%{version}-source.tar.bz2
-# Source0-md5:	4dc09831aa4e94fda5182a4897ed08e9
-Patch0:		%{name}-nss.patch
-Patch1:		%{name}-ldap-with-nss.patch
-Patch2:		%{name}-nsIPermission.patch
-Patch3:		%{name}-nsISidebar.patch
-Patch4:		%{name}-install.patch
+Source0:	%{name}-%{version}-%{_snap}-source.tar.bz2
+# Source0-md5:	92b4936a5b8bd24edac8feaa26d13567
+Patch0:		%{name}-ldap-with-nss.patch
+Patch1:		%{name}-install.patch
 URL:		http://developer.mozilla.org/en/docs/XULRunner
 BuildRequires:	/bin/csh
 %{?with_gnome:BuildRequires:	GConf2-devel >= 1.2.1}
@@ -103,9 +102,6 @@
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 cd mozilla
@@ -140,6 +136,7 @@
 	--with-pthreads \
 	--with-system-jpeg \
 	--with-system-nspr \
+	--with-system-nss \
 	--with-system-png \
 	--with-system-zlib \
 	--with-x
@@ -150,7 +147,7 @@
 rm -rf $RPM_BUILD_ROOT
 cd mozilla
 
-%{__make} -C xpinstall/packager %{name} \
+%{__make} -C xpinstall/packager make-package \
 	DESTDIR=$RPM_BUILD_ROOT \
 	PACKAGE=%{name} \
 	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
@@ -164,14 +161,14 @@
 # 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}/dictionaries $RPM_BUILD_ROOT%{_datadir}/%{name}/dictionaries
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/components/myspell $RPM_BUILD_ROOT%{_datadir}/%{name}/components
 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}/dictionaries $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
 ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
-ln -s ../../../share/%{name}/components/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/components/myspell
 
 # files created by regxpcom
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
@@ -182,8 +179,9 @@
 cp -rfLp dist/idl	$RPM_BUILD_ROOT%{_includedir}/%{name}
 cp -rfLp dist/public/ldap{,-private} $RPM_BUILD_ROOT%{_includedir}/%{name}
 install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/xpidl $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl
-install dist/bin/xpidl $RPM_BUILD_ROOT%{_bindir}/xpidl
+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
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_link $RPM_BUILD_ROOT%{_bindir}/xpt_link
 
 for f in build/unix/*.pc ; do
 	sed -e 's/xulrunner-%{version}/xulrunner/' $f \
@@ -207,6 +205,13 @@
 exec %{_libdir}/%{name}/xulrunner "$@"
 EOF
 
+cat << 'EOF' > $RPM_BUILD_ROOT%{_bindir}/xpcshell
+#!/bin/sh
+export LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+
+exec %{_libdir}/%{name}/xpcshell "$@"
+EOF
+
 cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 #!/bin/sh
 umask 022
@@ -244,18 +249,22 @@
 %dir %{_libdir}/%{name}/chrome
 %dir %{_libdir}/%{name}/components
 %dir %{_libdir}/%{name}/defaults
+%dir %{_libdir}/%{name}/dictionaries
 %dir %{_libdir}/%{name}/greprefs
 %dir %{_libdir}/%{name}/res
 %dir %{_datadir}/%{name}
 
 %attr(755,root,root) %{_libdir}/%{name}/xulrunner
-%attr(755,root,root) %{_libdir}/%{name}/xpidl
+%attr(755,root,root) %{_libdir}/%{name}/xpcshell
+%attr(755,root,root) %{_libdir}/%{name}/xulrunner-stub
 %attr(755,root,root) %{_libdir}/%{name}/reg*
 
 %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}
 %attr(755,root,root) %{_libdir}/%{name}/components/libmoz*.so
 %attr(755,root,root) %{_libdir}/%{name}/components/libmyspell.so
 %attr(755,root,root) %{_libdir}/%{name}/components/libnkdatetime.so
@@ -301,6 +310,7 @@
 %{_libdir}/%{name}/components/extensions.xpt
 %{_libdir}/%{name}/components/exthandler.xpt
 %{_libdir}/%{name}/components/fastfind.xpt
+%{_libdir}/%{name}/components/feeds.xpt
 %{_libdir}/%{name}/components/find.xpt
 %{_libdir}/%{name}/components/filepicker.xpt
 %{_libdir}/%{name}/components/gfx*.xpt
@@ -308,6 +318,7 @@
 %{_libdir}/%{name}/components/htmlparser.xpt
 %{?with_gnome:%{_libdir}/%{name}/components/imgicon.xpt}
 %{_libdir}/%{name}/components/imglib2.xpt
+%{_libdir}/%{name}/components/inspector.xpt
 %{_libdir}/%{name}/components/intl.xpt
 %{_libdir}/%{name}/components/jar.xpt
 %{_libdir}/%{name}/components/js*.xpt
@@ -331,11 +342,13 @@
 %{_libdir}/%{name}/components/proxyObjInst.xpt
 %{_libdir}/%{name}/components/rdf.xpt
 %{_libdir}/%{name}/components/satchel.xpt
+%{_libdir}/%{name}/components/saxparser.xpt
 %{_libdir}/%{name}/components/schemavalidation.xpt
 %{_libdir}/%{name}/components/shistory.xpt
 %{_libdir}/%{name}/components/signonviewer.xpt
 %{_libdir}/%{name}/components/spellchecker.xpt
 %{_libdir}/%{name}/components/sql.xpt
+%{_libdir}/%{name}/components/storage.xpt
 %{_libdir}/%{name}/components/toolkitprofile.xpt
 %{_libdir}/%{name}/components/toolkitremote.xpt
 %{_libdir}/%{name}/components/txmgr.xpt
@@ -345,6 +358,7 @@
 %{_libdir}/%{name}/components/unicharutil.xpt
 %{_libdir}/%{name}/components/update.xpt
 %{_libdir}/%{name}/components/uriloader.xpt
+%{_libdir}/%{name}/components/urlformatter.xpt
 %{_libdir}/%{name}/components/wallet*.xpt
 %{_libdir}/%{name}/components/webBrowser_core.xpt
 %{_libdir}/%{name}/components/webbrowserpersist.xpt
@@ -355,6 +369,7 @@
 %{_libdir}/%{name}/components/windowwatcher.xpt
 %{_libdir}/%{name}/components/x*.xpt
 
+%{_libdir}/%{name}/components/FeedProcessor.js
 %{_libdir}/%{name}/components/jsconsole-clhandler.js
 %{_libdir}/%{name}/components/nsCloseAllWindows.js
 %{_libdir}/%{name}/components/nsDefaultCLH.js
@@ -369,6 +384,7 @@
 %{_libdir}/%{name}/components/nsResetPref.js
 %{_libdir}/%{name}/components/nsSchemaValidatorRegexp.js
 %{_libdir}/%{name}/components/nsUpdateService.js
+%{_libdir}/%{name}/components/nsURLFormatter.js
 %{_libdir}/%{name}/components/nsXmlRpcClient.js
 %{_libdir}/%{name}/components/nsXULAppInstall.js
 
@@ -377,8 +393,6 @@
 %ghost %{_libdir}/%{name}/components/compreg.dat
 %ghost %{_libdir}/%{name}/components/xpti.dat
 
-%{_libdir}/%{name}/components/myspell
-
 %dir %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/chrome/US.jar
 %{_datadir}/%{name}/chrome/classic.jar
@@ -407,8 +421,8 @@
 %ghost %{_datadir}/%{name}/chrome/installed-chrome.txt
 
 %{_datadir}/%{name}/defaults
+%{_datadir}/%{name}/dictionaries
 %{_datadir}/%{name}/greprefs
-%{_datadir}/%{name}/components/myspell
 %{_datadir}/%{name}/res
 
 %files libs
@@ -425,7 +439,10 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/reg*
+%attr(755,root,root) %{_bindir}/xpcshell
 %attr(755,root,root) %{_bindir}/xpidl
+%attr(755,root,root) %{_bindir}/xpt_dump
+%attr(755,root,root) %{_bindir}/xpt_link
 %{_includedir}/%{name}
 %{_pkgconfigdir}/*
 
@@ -435,6 +452,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.10  2007/01/03 21:06:22  hawk
+- updated to 1.8.1.1, snapshot checked out from Mozilla CVS from
+  FIREFOX_2_0_0_1_RELEASE branch, dropped nsIPermission.patch and
+  nsISidebar.patch - already in sources, dropped nss patch - no longer
+  needed, updated install.patch, builds and seems to work (tested
+  with Galeon and Epiphany)
+
 Revision 1.7.2.9  2007/01/02 18:09:01  glen
 - better xulrunner wrapper
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xulrunner.spec?r1=1.7.2.9&r2=1.7.2.10&f=u



More information about the pld-cvs-commit mailing list