Author: qboosh Date: Tue Dec 26 20:28:30 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added seamonkey patch and bcond
- pass -D_STLP_NO_CONTAINERS_EXTENSION to be able to build with STLport 5.1.0
---- Files affected:
SPECS:
openoffice.org.spec (1.629 -> 1.630)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.629 SPECS/openoffice.org.spec:1.630
--- SPECS/openoffice.org.spec:1.629 Sat Dec 23 20:05:48 2006
+++ SPECS/openoffice.org.spec Tue Dec 26 21:28:25 2006
@@ -41,6 +41,7 @@
%bcond_without kde # KDE L&F packages
%bcond_with mono # enable compilation of mono bindings
%bcond_without mozilla # without mozilla
+%bcond_with seamonkey # use seamonkey instead of firefox
%bcond_without system_db # with internal berkeley db
%bcond_without system_mdbtools
@@ -111,6 +112,7 @@
Patch102: %{name}-build-pld-splash.diff
Patch104: %{name}-portaudio_v19.diff
Patch105: %{name}-firefox.diff
+Patch106: %{name}-seamonkey.diff
URL: http://www.openoffice.org/
BuildRequires: ImageMagick
BuildRequires: STLport-devel >= 2:5.0.0
@@ -161,7 +163,6 @@
BuildRequires: mono-csharp >= 1.1.8
BuildRequires: mono-devel >= 1.1.8
%endif
-BuildRequires: mozilla-firefox-devel
BuildRequires: nas-devel >= 1.7-1
BuildRequires: neon-devel
BuildRequires: openclipart-png >= 0:0.16
@@ -197,6 +198,11 @@
%else
BuildRequires: libxslt-progs
%endif
+%if %{with seamonkey}
+BuildRequires: seamonkey-devel
+%else
+BuildRequires: mozilla-firefox-devel
+%endif
BuildConflicts: STLport4
BuildConflicts: java-sun = 1.4.2
Requires(post,postun): fontpostinst
@@ -2068,7 +2074,7 @@
echo "[ PLDOnly ]" >> patches/src680/apply
# patches applied by ooo (extension .diff is required)
-for P in %{PATCH102} %{PATCH104} %{PATCH105} ; do
+for P in %{PATCH102} %{PATCH104} %{PATCH105} %{PATCH106} ; do
PATCHNAME=`basename $P | sed "s/%{name}-//; s/.patch$/.diff/"`
install $P patches/src680/$PATCHNAME
echo $PATCHNAME >> patches/src680/apply
@@ -2093,7 +2099,8 @@
export CC="%{__cc}"
export CXX="%{__cxx}"
export ENVCFLAGS="%{rpmcflags}"
-export ENVCFLAGSCXX="%{rpmcflags} -fpermissive"
+# disable STLport 5.1 containers extension, doesn't work with map indexed by
enum
+export ENVCFLAGSCXX="%{rpmcflags} -fpermissive -D_STLP_NO_CONTAINERS_EXTENSION"
export DESTDIR=$RPM_BUILD_ROOT
export IGNORE_MANIFEST_CHANGES=1
export QTINC="%{_includedir}/qt"
@@ -2163,7 +2170,11 @@
--with-system-xmlsec \
%if %{with mozilla}
--with-system-mozilla \
+%if %{with seamonkey}
+ --with-seamonkey \
+%else
--with-firefox \
+%endif
%else
--disable-mozilla \
%endif
@@ -2646,6 +2657,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.630 2006/12/26 20:28:25 qboosh
+- added seamonkey patch and bcond
+- pass -D_STLP_NO_CONTAINERS_EXTENSION to be able to build with STLport 5.1.0
+
Revision 1.629 2006/12/23 19:05:48 qboosh
- removed obsolete i66982 patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.629&r2=1.630&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
