Author: glen Date: Wed Jan 3 09:22:21 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- amd64 build fixes
- mozilla bcond renamed to firefox
---- Files affected:
SPECS:
openoffice.org.spec (1.605.2.4 -> 1.605.2.5)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.605.2.4 SPECS/openoffice.org.spec:1.605.2.5
--- SPECS/openoffice.org.spec:1.605.2.4 Tue Jan 2 23:22:01 2007
+++ SPECS/openoffice.org.spec Wed Jan 3 10:22:16 2007
@@ -17,7 +17,7 @@
# - add %{_libdir}/%{name}/share/autocorr/acor_(ll)-(LL).dat files to
package (marked with %lang)
# - can't be just i18n-{be,gu,hi,kn,pa,ta} instead of *-{be_BY,*_IN}?
# - add option to build with {not} all lanquages
-# - REMOVE USE of Xvfb from build-galleries script
(ooo-build-2.0.1.2/bin/build-galleries line 84)
+# - REMOVE USE of Xvfb from build-galleries script
(ooo-build-2.0.1.2/bin/build-galleries line 84)
# - ooqstart (disappeared from 2.0.3?)
# - check:
# Installed (but unpackaged) file(s) found:
@@ -32,11 +32,9 @@
%bcond_with vfs # Enable GNOME VFS and Evolution 2 support
%bcond_with mono # enable compilation of mono bindings
%bcond_without java # without Java support (disables help support)
-%bcond_without mozilla # without mozilla-firefox
+%bcond_without firefox # without mozilla-firefox
-%define ver 2.0
-%define rel 3
-%define fullver %{ver}.%{rel}
+%define fullver 2.0.3
%define subver 680
%define snap m180
%define ooobver src680-%{snap}
@@ -44,12 +42,13 @@
%define ssnap src680-%{snap}
%define specflags -fno-strict-aliasing
+%define _rel 0.0.4
Summary: OpenOffice.org - powerful office suite
Summary(pl): OpenOffice.org - potężny pakiet biurowy
Name: openoffice.org
Version: %{fullver}
-Release: 0.0.3.%{snap}%{?with_vfs:vfs}
+Release: %{_rel}%{snap}%{?with_vfs:vfs}
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
@@ -82,13 +81,14 @@
Source51: openintro_pld.bmp
Patch0: %{name}-PLD.patch
Patch1: %{name}-vendorname.patch
+Patch2: %{name}-stl-amd64.patch
Patch101: %{name}-build-pld-splash.diff
Patch102: %{name}-sfx2.badscript.diff
Patch103: %{name}-i66982.diff
URL: http://www.openoffice.org/
BuildRequires: ImageMagick
BuildRequires: STLport-devel >= 4.5.3-6
-%if %{with mozilla}
+%if %{with firefox}
BuildRequires: mozilla-firefox-devel
%endif
BuildRequires: XFree86-devel
@@ -1770,6 +1770,11 @@
# teach configure.in about PLD
%patch1 -p1
+# fix stlport detection
+%ifarch %{x8664}
+%patch2 -p1
+%endif
+
# fix patches/src680/pld-splash.diff
install %{PATCH101} patches/src680/pld-splash.diff
@@ -1849,8 +1854,8 @@
--with-system-sablot \
--with-system-boost \
--without-system-neon \
-%if %{with mozilla}
- --with-system-mozilla \
+%if %{with firefox}
+ --with-system-mozilla --with-firefox \
%else
--disable-mozilla \
%endif
@@ -1912,6 +1917,7 @@
:> distro-configs/Common.conf
:> distro-configs/Common.conf.in
echo "$CONFOPTS" > distro-configs/PLD.conf.in
+echo "$CONFOPTS" > distro-configs/PLD64.conf.in
# for cvs snaps
[ -x ./autogen.sh ] && ./autogen.sh $CONFOPTS
@@ -2223,7 +2229,7 @@
#%attr(755,root,root) %{_libdir}/%{name}/program/sweb
%attr(755,root,root) %{_libdir}/%{name}/program/swriter
%attr(755,root,root) %{_libdir}/%{name}/program/open-url
-%if %{with mozilla}
+%if %{with firefox}
%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
%endif
%attr(755,root,root) %{_libdir}/%{name}/program/gengal
@@ -2320,6 +2326,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.605.2.5 2007/01/03 09:22:16 glen
+- amd64 build fixes
+- mozilla bcond renamed to firefox
+
Revision 1.605.2.4 2007/01/02 22:22:01 glen
- amd64 fix from HEAD
- use mozilla-firefox-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.605.2.4&r2=1.605.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
