Author: glen Date: Wed Jan 23 08:17:58 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- partial update to 2.3.1.1 (old change)
---- Files affected:
SPECS:
openoffice.org.spec (1.775.2.23 -> 1.775.2.24)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.775.2.23
SPECS/openoffice.org.spec:1.775.2.24
--- SPECS/openoffice.org.spec:1.775.2.23 Mon Dec 17 09:38:25 2007
+++ SPECS/openoffice.org.spec Wed Jan 23 09:17:52 2008
@@ -81,56 +81,56 @@
%define tag %(echo %{mws} | tr A-Z
a-z)-%{milestone}
%define milestone m9
%define _tag %(echo %{tag} | tr - _)
-%define _rel 0.0.4
+%define _rel 0.1
Summary: OpenOffice.org - powerful office suite
Summary(pl.UTF-8): OpenOffice.org - potÄĹźny pakiet biurowy
Name: openoffice.org
-Version: 2.3.0
+Version: 2.3.1.1
Release: %{_tag}.%{_rel}
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
-# svn export http://svn.gnome.org/svn/ooo-build/trunk ooo-build-2-3
-Source0: ooo-build-r11109.tar.bz2
-# Source0-md5: 636d761ca8e51bef774f963dd9f662b0
-Source1: http://go-oo.org/packages/%{mws}/%{tag}-core.tar.bz2
-# Source1-md5: 551c451f43654d928f524f2f809939a9
-Source2: http://go-oo.org/packages/%{mws}/%{tag}-system.tar.bz2
-# Source2-md5: 1124d841e475015b5fde8e54d2f721f7
-Source3: http://go-oo.org/packages/%{mws}/%{tag}-binfilter.tar.bz2
-# Source3-md5: c26ba92425087f71531d171cf74ff687
-Source4: http://go-oo.org/packages/%{mws}/%{tag}-lang.tar.bz2
-# Source4-md5: 2f9a7335a8cefb74060e7ba0d0cea11a
-Source10: http://go-oo.org/packages/SRC680/ooo_custom_images-13.tar.bz2
+Source0: http://download.go-oo.org/%{mws}/ooo-build-%{version}.tar.gz
+# Source0-md5: 5174381a947eb50cc50d038a5e00761e
+Source1: http://download.go-oo.org/%{mws}/%{tag}-core.tar.bz2
+# Source1-md5: 9555a2d5fae9a25c788cc732921ef57a
+Source2: http://download.go-oo.org/%{mws}/%{tag}-system.tar.bz2
+# Source2-md5: 1e20befe2fdb65c00be11f1f5d9ebdca
+Source3: http://download.go-oo.org/%{mws}/%{tag}-binfilter.tar.bz2
+# Source3-md5: a56cf6ed9bd9759faec5760bacb848cd
+Source4: http://download.go-oo.org/%{mws}/%{tag}-lang.tar.bz2
+# Source4-md5: 3bb80a2c96e3363186377f7aae9f7c13
+Source10: http://download.go-oo.org/SRC680/ooo_custom_images-13.tar.bz2
# Source10-md5: 2480af7f890c8175c7f9e183a1b39ed2
-Source11: http://go-oo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2
+Source11: http://download.go-oo.org/SRC680/ooo_crystal_images-6.tar.bz2
# Source11-md5: 586d0f26b3f79d89bbb5b25b874e3df6
-Source12: http://go-oo.org/packages/SRC680/extras-2.tar.bz2
+Source12: http://download.go-oo.org/SRC680/extras-2.tar.bz2
# Source12-md5: 733051ebeffae5232a2eb760162da020
-Source15: http://go-oo.org/packages/xt/xt-20051206-src-only.zip
+Source15: http://download.go-oo.org/xt/xt-20051206-src-only.zip
# Source15-md5: 0395e6e7da27c1cea7e1852286f6ccf9
-Source16: http://go-oo.org/packages/SRC680/lp_solve_5.5.0.10_source.tar.gz
+Source16: http://download.go-oo.org/SRC680/lp_solve_5.5.0.10_source.tar.gz
# Source16-md5: 26b3e95ddf3d9c077c480ea45874b3b8
-Source17: http://go-oo.org/packages/SRC680/biblio.tar.bz2
+Source17: http://download.go-oo.org/SRC680/biblio.tar.bz2
# Source17-md5: 1948e39a68f12bfa0b7eb309c14d940c
-Source18: http://go-oo.org/packages/%{mws}/cli_types.dll
+Source18: http://download.go-oo.org/%{mws}/cli_types.dll
# Source18-md5: 3cdaf368e99caa3331130a5edf148490
-Source19: http://go-oo.org/packages/%{mws}/cli_types_bridgetest.dll
+Source19: http://download.go-oo.org/%{mws}/cli_types_bridgetest.dll
# Source19-md5: cadc605a6b0265b8167001b4788ff113
-Source20: http://go-oo.org/packages/SRC680/libwps-0.1.0~svn20070129.tar.gz
-# Source20-md5: 2e442485100f7e00685737513f853546
-Source21: http://go-oo.org/packages/SRC680/libwpg-0.1.2.tar.gz
-# Source21-md5: 317cee27f380c394c6e4eec02d45cab8
-Source22: http://download.go-oo.org/SRC680/oox.2007-12-10.tar.bz2
+Source22: http://download.go-oo.org/SRC680/oox.2007-12-10.tar.bz2
# Source22-md5: fe094a579d6a57cc02f0c7abe50f9e8c
-Source23:
http://download.go-oo.org//SRC680/writerfilter.2007-12-10.tar.bz2
+Source201:
ftp://ftp.linux.ee/pub/openoffice/stable/2.3.1/OOo_2.3.1_src_core.tar.bz2
+Source202:
ftp://ftp.linux.ee/pub/openoffice/stable/2.3.1/OOo_2.3.1_src_system.tar.bz2
+Source203:
ftp://ftp.linux.ee/pub/openoffice/stable/2.3.1/OOo_2.3.1_src_binfilter.tar.bz2
+Source204:
ftp://ftp.linux.ee/pub/openoffice/stable/2.3.1/OOo_2.3.1_src_l10n.tar.bz2
+Source23: http://download.go-oo.org/SRC680/writerfilter.2007-12-10.tar.bz2
# Source23-md5: 09f02b622134b2d3d45ec576522ba6e8
Source50: openabout_pld.png
# Source50-md5: 64a945a07b64ebc0a12adfde4c99da8a
# patches applied in prep section
Patch0: %{name}-PLD.patch
Patch1: %{name}-java16.patch
+#Patch2: %{name}-oox-stlportism-fix.patch
# patch50/51 need review
Patch50: %{name}-mdbtools_fix.diff
Patch51: %{name}-nodictinst.patch
@@ -190,6 +190,7 @@
BuildRequires: libstdc++-devel >= 5:3.2.1
BuildRequires: libsvg-devel >= 0.1.4
BuildRequires: libwpd-devel >= 0.8.6
+BuildRequires: libwpg-devel >= 0.1.0
BuildRequires: libwps-devel
BuildRequires: libxml2-devel >= 2.0
%{?with_access:%{?with_system_mdbtools:BuildRequires: mdbtools-devel >= 0.6}}
@@ -2081,7 +2082,7 @@
bashowe uzupeĹnianie nazw dla Openoffice.org.
%prep
-%setup -q -n ooo-build-2-3
+%setup -q -n ooo-build-%{version}
install -d src
# sources, icons, KDE_icons. You can verify that all needed sources
@@ -2090,8 +2091,12 @@
%{SOURCE10} %{SOURCE11} %{SOURCE12} \
%{SOURCE15} %{SOURCE16} %{SOURCE17} \
%{SOURCE18} %{SOURCE19} \
- %{SOURCE20} %{SOURCE21} %{SOURCE22} \
+ %{SOURCE22} \
%{SOURCE23} \
+ %{SOURCE201} \
+ %{SOURCE202} \
+ %{SOURCE203} \
+ %{SOURCE204} \
src
cp %{SOURCE50} src
@@ -2099,7 +2104,7 @@
# fixes for the patch subsystem
%patch0 -p1
%patch1 -p1
-#
+
# mdbtools_fix.diff needs review
#%patch50 -p1
#
@@ -2108,6 +2113,7 @@
#%patch51 -p1
#%endif
+# TODO: use patches/hotfixes dir from now on
echo "[ PLDOnly ]" >> patches/src680/apply
# patches applied by ooo (extension .diff is required)
for P in \
@@ -2117,7 +2123,7 @@
%{PATCH101} %{PATCH102} %{PATCH103}; do
PATCHNAME=PLD-${P##*/%{name}-}
PATCHNAME=${PATCHNAME%.patch}.diff
- install $P patches/src680/$PATCHNAME
+ ln -s $P patches/src680/$PATCHNAME
echo $PATCHNAME >> patches/src680/apply
done
@@ -2208,6 +2214,7 @@
--with-system-jpeg \
--with-system-libsvg \
--with-system-libwpd \
+ --with-system-libwpg \
--with-system-libwps \
--with-system-libxml \
--with-system-nas \
@@ -4097,6 +4104,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.775.2.24 2008-01-23 08:17:52 glen
+- partial update to 2.3.1.1 (old change)
+
Revision 1.775.2.23 2007-12-17 08:38:25 arekm
- up to r11109 (needs more fixes)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.775.2.23&r2=1.775.2.24&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
