Author: hawk Date: Thu Jun 19 17:38:45 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- removed system_nss bcond, xulrunner properly links with system nss if
its >= 3.12.0, R/BR nss release with fixed nss-config and mozilla.pc
- moved binaries back to %{_libdir}/xulrunner, created symlinks in
%{_bindir}, now it works properly (xulrunner looks for its data in
directory where binaries exists)
- builds and works, but TODO isn't empty yet
---- Files affected:
SPECS:
xulrunner.spec (1.58 -> 1.59)
---- Diffs:
================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.58 SPECS/xulrunner.spec:1.59
--- SPECS/xulrunner.spec:1.58 Thu Jun 19 08:17:02 2008
+++ SPECS/xulrunner.spec Thu Jun 19 19:38:40 2008
@@ -1,23 +1,18 @@
# $Revision$, $Date$
#
# TODO:
-# - running 'xulrunner application.ini' fails, strace says:
-# "/usr/bin/platform.ini: no such file or directory", make xulrunner
-# to look for that file in /usr/%{_lib}/xulrunner (it is available there)
-# - even if platform.ini is found and parsed test application doesn't work
-# eihter some files are missing or again xulrunner looks for theme in
-# wrong paths, check & debug & fix it somehow
-# - use system nss
+# - fix "libsqlite3.so is needed by xulrunner-libs-1.9-20080618.0.5.i686"
+# - fix "/usr/sbin/xulrunner-chrome+xpcom-generate[11]:
/usr/lib/xulrunner/regxpcom: not found"
+# during install
#
# 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
%bcond_with mozldap # build with system mozldap
-%bcond_with system_nss # use system nss
#
-%define rel 0.4
+%define rel 0.5
%define subver 20080618
Summary: XULRunner - Mozilla Runtime Environment for XUL+XPCOM
applications
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla
aplikacji XUL+XPCOM
@@ -30,13 +25,12 @@
Group: X11/Applications
Source0:
http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.0.0/source/%{name}-%{version}-source.tar.bz2
# Source0-md5: 4210ae0801df2eb498408533010d97c1
-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
-Patch6: %{name}-gcc3.patch
+Patch0: %{name}-install.patch
+Patch1: %{name}-rpath.patch
+Patch2: %{name}-mozldap.patch
+Patch3: %{name}-configures.patch
+Patch4: %{name}-gcc3.patch
+Patch5: %{name}-nss_cflags.patch
URL: http://developer.mozilla.org/en/docs/XULRunner
%{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: automake
@@ -58,7 +52,7 @@
BuildRequires: libstdc++-devel
%{?with_mozldap:BuildRequires: mozldap-devel >= 6.0}
BuildRequires: nspr-devel >= 1:4.6.4
-%{?with_system_nss:BuildRequires: nss-devel >= 1:3.12.0}
+BuildRequires: nss-devel >= 1:3.12-2
BuildRequires: pango-devel >= 1:1.6.0
BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
@@ -76,21 +70,15 @@
Requires: %{name}-libs = %{version}-%{release}
Requires: browser-plugins >= 2.0
Requires: nspr >= 1:4.6.4
-%{?with_system_nss:Requires: nss >= 1:3.12.0}
+Requires: nss >= 1:3.12-2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define specflags -fno-strict-aliasing
-%if %{without system_nss}
-%define nssdeps libfreebl3.so libnss3.so libnssckbi.so
libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libsqlite3.so
libssl3.so
-%else
-%define nssdeps %{nil}
-%endif
-
# we don't want these to satisfy other mozilla.org products -devel
-%define _noautoprov libmozjs.so libxpcom.so %{nssdeps}
+%define _noautoprov libmozjs.so libxpcom.so
# no need to require them (we have strict deps for these)
-%define _noautoreq libgtkembedmoz.so libmozjs.so
libxpcom.so libxul.so %{nssdeps}
+%define _noautoreq libgtkembedmoz.so libmozjs.so
libxpcom.so libxul.so
%description
XULRunner is a Mozilla runtime package that can be used to bootstrap
@@ -125,7 +113,7 @@
Group: X11/Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: nspr-devel >= 1:4.6.4
-%{?with_system_nss:Requires: nss-devel >= 1:3.12.0}
+Requires: nss-devel >= 1:3.12-2
Obsoletes: mozilla-devel
Obsoletes: mozilla-firefox-devel
Obsoletes: seamonkey-devel
@@ -141,15 +129,14 @@
cd mozilla
rm -r nsprpub
-#%patch0 -p1
+%patch0 -p1
%patch1 -p1
-#%patch2 -p1
+%{?with_mozldap:%patch2 -p1}
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%if "%{cc_version}" < "3.4"
-%patch6 -p2
+%patch4 -p2
%endif
+%patch5 -p1
%build
cd mozilla
@@ -266,20 +253,23 @@
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}
-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
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_link
$RPM_BUILD_ROOT%{_bindir}/xpt_link
+install dist/bin/regxpcom $RPM_BUILD_ROOT%{_libdir}/%{name}
%{__make} -C build/unix install \
DESTDIR=$RPM_BUILD_ROOT
%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
-# 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}
-mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/xpcshell,%{_bindir}}
+# rpath is used but xulrunner looks for data files in location of xulrunner
binary
+# so we must keep files in %{_libdir}/xulrunner and use symlinks in %{_bindir}
+# otherwise it won't work at all
+rm -f $RPM_BUILD_ROOT%{_bindir}/xulrunner
+ln -s %{_libdir}/%{name}/xulrunner-bin $RPM_BUILD_ROOT%{_bindir}/xulrunner
+ln -s %{_libdir}/%{name}/regxpcom $RPM_BUILD_ROOT%{_bindir}/regxpcom
+ln -s %{_libdir}/%{name}/xpcshell $RPM_BUILD_ROOT%{_bindir}/xpcshell
+ln -s %{_libdir}/%{name}/xpidl $RPM_BUILD_ROOT%{_bindir}/xpidl
+ln -s %{_libdir}/%{name}/xpt_dump $RPM_BUILD_ROOT%{_bindir}/xpt_dump
+ln -s %{_libdir}/%{name}/xpt_link $RPM_BUILD_ROOT%{_bindir}/xpt_link
cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
#!/bin/sh
@@ -318,6 +308,7 @@
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xulrunner
+%attr(755,root,root) %{_libdir}/%{name}/xulrunner-bin
%attr(744,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
# symlinks
@@ -342,20 +333,6 @@
%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
-%if %{without 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
-%endif
-
%attr(755,root,root) %{_libdir}/%{name}/libjemalloc.so
%attr(755,root,root) %{_libdir}/%{name}/*.sh
@@ -506,6 +483,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) %{_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
+%attr(755,root,root) %{_libdir}/%{name}/xpt_link
%attr(755,root,root) %{_libdir}/%{name}/xulrunner-stub
%{_includedir}/%{name}
%{_datadir}/idl/%{name}
@@ -516,6 +498,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.59 2008/06/19 17:38:40 hawk
+- removed system_nss bcond, xulrunner properly links with system nss if
+ its >= 3.12.0, R/BR nss release with fixed nss-config and mozilla.pc
+- moved binaries back to %{_libdir}/xulrunner, created symlinks in
+ %{_bindir}, now it works properly (xulrunner looks for its data in
+ directory where binaries exists)
+- builds and works, but TODO isn't empty yet
+
Revision 1.58 2008/06/19 06:17:02 glen
- nss ver bumped to 3.12.0 (thx or sth to freetz), no time to check, have to go
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xulrunner.spec?r1=1.58&r2=1.59&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
