SPECS: xulrunner.spec - BR sqlite3-devel, build with system sqlite3 - fixed...

[hawk]

Author: hawk                         Date: Thu Jun 19 18:36:48 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR sqlite3-devel, build with system sqlite3
- fixed path in rm of unecessary file

---- Files affected:
SPECS:
   xulrunner.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.59 SPECS/xulrunner.spec:1.60
--- SPECS/xulrunner.spec:1.59	Thu Jun 19 19:38:40 2008
+++ SPECS/xulrunner.spec	Thu Jun 19 20:36:41 2008
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 #
 # TODO:
-#   - 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
 #
@@ -12,7 +11,7 @@
 %bcond_with	mozldap		# build with system mozldap
 #
 
-%define		rel    0.5
+%define		rel    0.6
 %define		subver    20080618
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
@@ -59,6 +58,7 @@
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sed >= 4.0
+BuildRequires:	sqlite3-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.1
 BuildRequires:	xorg-lib-libXinerama-devel
@@ -191,6 +191,7 @@
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-sqlite
 #ac_add_options --enable-system-lcms
 ac_add_options --enable-xft
 ac_add_options --with-distribution-id=org.pld-linux
@@ -263,7 +264,7 @@
 # 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
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/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
@@ -498,6 +499,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2008/06/19 18:36:41  hawk
+- BR sqlite3-devel, build with system sqlite3
+- fixed path in rm of unecessary file
+
 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xulrunner.spec?r1=1.59&r2=1.60&f=u