SPECS: xulrunner.spec - AC-branch merge

glen glen at pld-linux.org
Thu Jan 4 00:46:58 CET 2007 

Author: glen                         Date: Wed Jan  3 23:46:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   xulrunner.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.8 SPECS/xulrunner.spec:1.9
--- SPECS/xulrunner.spec:1.8	Tue Jan  2 18:39:31 2007
+++ SPECS/xulrunner.spec	Thu Jan  4 00:46:53 2007
@@ -3,20 +3,20 @@
 %bcond_with	tests	# enable tests (whatever they check)
 %bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
 #
+%define		_snap	20070102
+%define		_rel	2
+#
 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}.%{_rel}
 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}
@@ -38,11 +38,8 @@
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
-BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXft-devel >= 2.1
-BuildRequires:	xorg-lib-libXinerama-devel
-BuildRequires:	xorg-lib-libXp-devel
-BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xcursor-devel
+BuildRequires:	xft-devel >= 2.1-2
 BuildRequires:	zip
 BuildRequires:	zlib-devel >= 1.2.3
 Requires(post):	mktemp >= 1.5-18
@@ -106,9 +103,6 @@
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 cd mozilla
@@ -143,6 +137,7 @@
 	--with-pthreads \
 	--with-system-jpeg \
 	--with-system-nspr \
+	--with-system-nss \
 	--with-system-png \
 	--with-system-zlib \
 	--with-x
@@ -153,9 +148,8 @@
 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} \
 	PKG_SKIP_STRIP=1
 
@@ -167,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
@@ -185,30 +179,37 @@
 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 \
 		> $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f)
 done
 
-sed -e 's,lib/xulrunner-%{version},lib,g;s/xulrunner-%{version}/xulrunner/g' build/unix/xulrunner-gtkmozembed.pc \
+sed -e 's,%{_lib}/xulrunner-%{version},%{_lib},g;s/xulrunner-%{version}/xulrunner/g' build/unix/xulrunner-gtkmozembed.pc \
 		> $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-gtkmozembed.pc
 
 # add includir/dom to Cflags, for openvrml.spec, perhaps others
 sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-plugin.pc
 
-rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nspr.pc
+rm $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/xulrunner-nspr.pc
 
+# rename to without -bin extension for killall xulrunner to work
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner{-bin,}
 cat << 'EOF' > $RPM_BUILD_ROOT%{_bindir}/xulrunner
 #!/bin/sh
+export LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
-LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
+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}
 
-MOZILLA_FIVE_HOME=%{_libdir}/%{name} \
-%{_libdir}/%{name}/xulrunner-bin "$@"
+exec %{_libdir}/%{name}/xpcshell "$@"
 EOF
 
 cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
@@ -248,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-bin
-%attr(755,root,root) %{_libdir}/%{name}/xpidl
+%attr(755,root,root) %{_libdir}/%{name}/xulrunner
+%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
@@ -305,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
@@ -312,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
@@ -335,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
@@ -349,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
@@ -359,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
@@ -373,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
 
@@ -381,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
@@ -411,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
@@ -429,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}/*
 
@@ -439,6 +452,23 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2007/01/03 23:46:53  glen
+- AC-branch merge
+
+Revision 1.7.2.11  2007/01/03 23:44:44  glen
+- fix *.pc files for amd64
+- cleanups
+
+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
+
 Revision 1.8  2007/01/02 17:39:31  glen
 - update from AC-branch
 
@@ -493,4 +523,3 @@
   mozilla guru (is all required stuff packaged? is some unecessary stuff
   packaged? does it need some other patches? does it need some other
   configure/build options?)
-
================================================================

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

More information about the pld-cvs-commit mailing list