SPECS: openoffice.org.spec - updated ooo-build to 2.1.8, lets call...
glen
glen at pld-linux.org
Sat Mar 17 22:06:52 CET 2007
Author: glen Date: Sat Mar 17 21:06:52 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated ooo-build to 2.1.8, lets call package version the same?
---- Files affected:
SPECS:
openoffice.org.spec (1.734 -> 1.735)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.734 SPECS/openoffice.org.spec:1.735
--- SPECS/openoffice.org.spec:1.734 Sat Mar 17 18:12:19 2007
+++ SPECS/openoffice.org.spec Sat Mar 17 22:06:46 2007
@@ -12,6 +12,7 @@
# - fix help files (broken links)
# - LFS support is disabled (no_lfs_hack.patch for xml2cmp crash) because it need LFS-ready STLport
# - bcond with_mono is broken (cli_types.dll not found, and can't be made)
+# cli_*.dll are available from http://go-ooo.org/packages/OOE680/
# - maybe it could be build with gcc-java
# - adapt help-support.diff to PLD
# - configure --without-ppds --without afms
@@ -67,50 +68,51 @@
%undefine with_system_hsqldb
%endif
-%define ver 2.1.0
-%define _rel 7
-%define subver 680
-%define snap OOE680
-%define snap2 SRC680
-%define bver m6
-%define bbver m6
-%define bugfix %{nil}
-%define ooobver ooe680-%{bbver}
-%define ssnap ooe680-%{bver}
-
-%define specflags -fno-strict-aliasing
+%define _rel 0.1
+%define upd 680
+%define mws OOE%{upd}
+%define tag %(echo %{mws} | tr '[A-Z]' '[a-z]')-%{milestone}
+%define milestone m6
Summary: OpenOffice.org - powerful office suite
Summary(pl.UTF-8): OpenOffice.org - potężny pakiet biurowy
Name: openoffice.org
-Version: %{ver}%{bugfix}
-Release: 0.%{bver}%{?without_gnomevfs:.novfs}.%{_rel}
+Version: 2.1.8
+Release: %{_rel}
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
-#Source0: http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz
-Source0: ooo-build-%{ooobver}.tar.gz
-# Source0-md5: 797f04099223b549ed1b4939dfc2a335
-Source1: http://go-ooo.org/packages/%{snap}/%{ssnap}-core.tar.bz2
+Source0: http://go-ooo.org/packages/OOE680/ooo-build-%{version}.tar.gz
+# Source0-md5: ec39e9bb30c5285afba50ae32dbe7af2
+Source1: http://go-ooo.org/packages/%{mws}/%{tag}-core.tar.bz2
# Source1-md5: 7dbf5f7ea4f469bb6c8b1d6037567431
-Source2: http://go-ooo.org/packages/%{snap}/%{ssnap}-system.tar.bz2
+Source2: http://go-ooo.org/packages/%{mws}/%{tag}-system.tar.bz2
# Source2-md5: 7f645231043a776c07a22300c0a10848
-Source3: http://go-ooo.org/packages/%{snap}/%{ssnap}-binfilter.tar.bz2
+Source3: http://go-ooo.org/packages/%{mws}/%{tag}-binfilter.tar.bz2
# Source3-md5: 22acf75656a2186d8a969ee5069ef193
-Source4: http://go-ooo.org/packages/%{snap}/%{ssnap}-lang.tar.bz2
+Source4: http://go-ooo.org/packages/%{mws}/%{tag}-lang.tar.bz2
# Source4-md5: 9b1a1d5dafbde7cbc90da8b903e6b0bf
-Source10: http://go-ooo.org/packages/%{snap2}/ooo_custom_images-13.tar.bz2
+Source10: http://go-ooo.org/packages/SRC680/ooo_custom_images-13.tar.bz2
# Source10-md5: 2480af7f890c8175c7f9e183a1b39ed2
-Source11: http://go-ooo.org/packages/%{snap2}/ooo_crystal_images-6.tar.bz2
+Source11: http://go-ooo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2
# Source11-md5: 586d0f26b3f79d89bbb5b25b874e3df6
-Source12: http://go-ooo.org/packages/%{snap2}/extras-2.tar.bz2
+Source12: http://go-ooo.org/packages/SRC680/extras-2.tar.bz2
# Source12-md5: 733051ebeffae5232a2eb760162da020
Source15: http://go-ooo.org/packages/xt/xt-20051206-src-only.zip
# Source15-md5: 0395e6e7da27c1cea7e1852286f6ccf9
-Source16: http://go-ooo.org/packages/%{snap2}/lp_solve_5.5.tar.gz
+Source16: http://go-ooo.org/packages/SRC680/lp_solve_5.5.tar.gz
# Source16-md5: 2ff7b4c52f9c3937ebe3002798fbc479
-Source17: http://go-ooo.org/packages/%{snap2}/biblio.tar.bz2
+Source17: http://go-ooo.org/packages/SRC680/biblio.tar.bz2
# Source17-md5: 1948e39a68f12bfa0b7eb309c14d940c
+Source18: http://go-ooo.org/packages/%{mws}/cli_types.dll
+# Source18-md5: 3cdaf368e99caa3331130a5edf148490
+Source19: http://go-ooo.org/packages/%{mws}/cli_types_bridgetest.dll
+# Source19-md5: cadc605a6b0265b8167001b4788ff113
+# lib{wpd,wps} need might be a typo in download.in
+Source20: http://go-ooo.org/packages/libwpd/libwpd-0.8.8.tar.gz
+# Source20-md5: cd5997284f4ba1e8dde5d1e5869fc342
+Source21: http://go-ooo.org/packages/SRC680/libwps-0.1.0~svn20070129.tar.gz
+# Source21-md5: 2e442485100f7e00685737513f853546
Source50: openabout_pld.png
Source51: openintro_pld.bmp
# patches applied in prep section
@@ -119,15 +121,14 @@
Patch2: %{name}-stl5_fix.patch
Patch3: %{name}-mdbtools_fix.diff
Patch4: %{name}-nolfs_hack.patch
-Patch5: %{name}-no_fonts_dir_buildfix.patch
Patch6: %{name}-java16.patch
Patch7: %{name}-nodictinst.patch
+Patch8: %{name}-73257.patch
# patches applied by ooo-patching-system
Patch100: %{name}-STL-lib64.diff
Patch101: %{name}-64bit-inline.diff
Patch102: %{name}-build-pld-splash.diff
Patch104: %{name}-portaudio_v19.diff
-Patch106: %{name}-seamonkey.diff
Patch107: %{name}-stl-amd64.patch
Patch108: %{name}-java6.patch
Patch109: %{name}-agg25.patch
@@ -229,6 +230,8 @@
ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define specflags -fno-strict-aliasing
+
# No ELF objects there to strip/chrpath (skips processing 17k files totaling 415M)
%define _noautostrip .*%{_datadir}/%{name}/.*
%define _noautochrpath .*%{_datadir}/%{name}/.*
@@ -2028,15 +2031,17 @@
bashowe uzupełnianie nazw dla Openoffice.org.
%prep
-%setup -q -n ooo-build-%{ooobver}
-
+%setup -q -n ooo-build-%{version}
install -d src
cp %{SOURCE50} %{SOURCE51} src
# sources, icons, KDE_icons
ln -sf %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
%{SOURCE10} %{SOURCE11} %{SOURCE12} \
- %{SOURCE15} %{SOURCE16} %{SOURCE17} src
+ %{SOURCE15} %{SOURCE16} %{SOURCE17} \
+ %{SOURCE18} %{SOURCE19} \
+ %{SOURCE20} %{SOURCE21} \
+ src
# fixes for the patch subsystem
%patch0 -p1
@@ -2047,11 +2052,11 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch6 -p1
%if %{with system_myspell}
%patch7 -p1
%endif
+%patch8 -p1
# 64 bit related patches (not applied now)
install %{PATCH100} patches/64bit
@@ -2070,7 +2075,7 @@
echo "[ PLDOnly ]" >> patches/src680/apply
# patches applied by ooo (extension .diff is required)
-for P in %{PATCH102} %{PATCH104} %{PATCH106} %{PATCH108} %{PATCH109}; do
+for P in %{PATCH102} %{PATCH104} %{PATCH108} %{PATCH109}; do
PATCHNAME=PLD-${P##*/%{name}-}
PATCHNAME=${PATCHNAME%.patch}.diff
install $P patches/src680/$PATCHNAME
@@ -2228,7 +2233,7 @@
--disable-symbols \
%endif
--with-num-cpus=$RPM_BUILD_NR_THREADS \
- --with-tag=%{ssnap}
+ --with-tag=%{tag}
"
# build-ooo script will pickup these
@@ -2282,7 +2287,7 @@
install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
# Add in the regcomp tool since some people need it for 3rd party add-ons
- cp -f build/%{ssnap}/solver/%{subver}/unxlng*.pro/bin/regcomp{,.bin} $RPM_BUILD_ROOT%{_libdir}/%{name}/program/
+ cp -f build/%{tag}/solver/%{upd}/unxlng*.pro/bin/regcomp{,.bin} $RPM_BUILD_ROOT%{_libdir}/%{name}/program/
# fix python
sed -i -e 's|#!/bin/python|#!%{_bindir}/python|g' $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.py
@@ -2317,7 +2322,7 @@
# Copy fixed OpenSymbol to correct location
install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
- install build/%{ssnap}/extras/source/truetype/symbol/opens___.ttf $RPM_BUILD_ROOT%{_fontsdir}/TTF
+ install build/%{tag}/extras/source/truetype/symbol/opens___.ttf $RPM_BUILD_ROOT%{_fontsdir}/TTF
# We don't need spadmin (gtk) or the setup application
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/setup
@@ -3878,6 +3883,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.735 2007/03/17 21:06:46 glen
+- updated ooo-build to 2.1.8, lets call package version the same?
+
Revision 1.734 2007/03/17 17:12:19 glen
- need about logo for 2.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.734&r2=1.735&f=u
More information about the pld-cvs-commit
mailing list