Author: sls Date: Sat Dec 16 18:20:39 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- version up (2.1.0)
- removed url from Source0 (cvs snapshot once again)
- bcond with_vfs inverted
- added patch no_fonts_dir_buildfix
- removed regcomp_ugly_hack patch
- TODO updates
- added --with-tag configure switch
- removed missing pyunorc-update (does anyone need it?)
- updated location of opens___.ttf
---- Files affected:
SPECS:
openoffice.org.spec (1.621 -> 1.622)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.621 SPECS/openoffice.org.spec:1.622
--- SPECS/openoffice.org.spec:1.621 Mon Nov 13 16:01:54 2006
+++ SPECS/openoffice.org.spec Sat Dec 16 19:20:34 2006
@@ -6,7 +6,6 @@
# SRPMS 0.3 GB
# RPMS 0.8 GB
# TODO:
-# - fix regcomp.bin crash (workarounded by trapping segv signal)
# - fix xml2cmp crash (workarounded by no_lfs_hack)
# - fix help files (xslt hacker needed - maybe it's screwed by
system-sablotron)
# - bcond with_xt is broken (xt in PLD is too old or broken)
@@ -14,6 +13,9 @@
# made)
# - build on 64-bit architectures
# - Help>Support loads www.novell.com
+# - does anyone need missing pyunorc-update64?
+# - does anyone need opens___.ttf?
+# - add new i18n packages (as, ml, mr, or, te, tg, ti, uk, ur)
# MAYBE TODO:
# - drop requirement on nas-devel
# - --with-system-myspell + myspell package as in Debian
@@ -39,7 +41,7 @@
# Conditional build:
%bcond_without java # without Java support (disables help support)
-%bcond_with vfs # Enable GNOME VFS and Evolution 2 support
+%bcond_without vfs # Enable GNOME VFS and Evolution 2 support
%bcond_with mono # enable compilation of mono bindings
%bcond_without mozilla # without mozilla
@@ -49,19 +51,20 @@
%bcond_without system_beanshell
%bcond_without system_libhnj # with internal ALTLinuxhyph
-%define is_snapshot 0
-%define ver 2.0.4
-%define _rel 0.2
+%define is_pre 1
+%define ver 2.1.0
+%define _rel 0.1
%define subver 680
-%define snap OOD680
+%define snap OOE680
%define snap2 SRC680
-%define bver m4
-%define bugfix .1
-%if %{is_snapshot}
-%define ooobver ood680-%{bver}
-%define ssnap ood680-%{bver}
+%define bver m6
+%define bbver m6
+%define bugfix %nil
+%if %{is_pre}
+%define ooobver ooe680-%{bbver}
+%define ssnap ooe680-%{bver}
%else
-%define us_ver 2_0_4
+%define us_ver 2_1_0
%define ooobver %{ver}%{bugfix}
%define ssnap OOO_%{us_ver}
%endif
@@ -72,28 +75,29 @@
Summary(pl): OpenOffice.org - potężny pakiet biurowy
Name: openoffice.org
Version: %{ver}%{bugfix}
-%if %{is_snapshot}
-Release: 0.%{bver}%{?with_vfs:.vfs}.%{_rel}
+%if %{is_pre}
+Release: 0.%{bver}%{?without_vfs:.novfs}.%{_rel}
%else
-Release: %{_rel}%{?with_vfs:.vfs}
+Release: %{_rel}%{?without_vfs:.novfs}
%endif
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
-Source0: http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz
-# Source0-md5: 38a82068e85ca4bc96d088f13e3bedc3
+#Source0: http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz
+Source0: ooo-build-%{ooobver}.tar.gz
+# Source0-md5: 8cbdd14b46d6f9ed90869df38a66bb1c
Source1: http://go-ooo.org/packages/%{snap}/%{ssnap}-core.tar.bz2
-# Source1-md5: 3f18ee3d2e67c8f9daef02ed2dd2fc51
+# Source1-md5: 7dbf5f7ea4f469bb6c8b1d6037567431
Source2: http://go-ooo.org/packages/%{snap}/%{ssnap}-system.tar.bz2
-# Source2-md5: 7d5aa9932eaf739bd63449d16cc6a6d0
+# Source2-md5: 7f645231043a776c07a22300c0a10848
Source3: http://go-ooo.org/packages/%{snap}/%{ssnap}-binfilter.tar.bz2
-# Source3-md5: 81f5c0b4b51b47c968e71d6685e022c5
+# Source3-md5: 22acf75656a2186d8a969ee5069ef193
Source4: http://go-ooo.org/packages/%{snap}/%{ssnap}-lang.tar.bz2
-# Source4-md5: fbe2fb266ecbdca0dcf55ce677d0fe2b
+# Source4-md5: 9b1a1d5dafbde7cbc90da8b903e6b0bf
Source10: http://go-ooo.org/packages/%{snap2}/ooo_custom_images-13.tar.bz2
# Source10-md5: 2480af7f890c8175c7f9e183a1b39ed2
-Source11: http://go-ooo.org/packages/%{snap2}/ooo_crystal_images-1.tar.gz
-# Source11-md5: 9c57c933e793f791f2c8817ccd28911c
+Source11: http://go-ooo.org/packages/%{snap2}/ooo_crystal_images-6.tar.bz2
+# Source11-md5: 586d0f26b3f79d89bbb5b25b874e3df6
Source12: http://go-ooo.org/packages/%{snap2}/extras-2.tar.bz2
# Source12-md5: 733051ebeffae5232a2eb760162da020
Source13: http://go-ooo.org/packages/libwpd/libwpd-0.8.3.tar.gz
@@ -114,6 +118,7 @@
Patch2: %{name}-stl5_fix.patch
Patch3: %{name}-mdbtools_fix.diff
Patch4: %{name}-nolfs_hack.patch
+Patch5: %{name}-no_fonts_dir_buildfix.patch
# patches applied by ooo-patching-system
Patch100: %{name}-STL-lib64.diff
Patch101: %{name}-64bit-inline.diff
@@ -121,7 +126,6 @@
Patch104: %{name}-portaudio_v19.diff
Patch105: %{name}-firefox.diff
Patch106: %{name}-i66982.diff
-Patch107: %{name}-regcomp_ugly_hack.diff
URL: http://www.openoffice.org/
BuildRequires: ImageMagick
BuildRequires: STLport-devel >= 2:5.0.0
@@ -1919,6 +1923,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# 64 bit related patches (not applied now)
install %{PATCH100} patches/64bit
@@ -1926,7 +1931,7 @@
echo "[ PLDOnly ]" >> patches/src680/apply
# patches applied by ooo (extension .diff is required)
-for P in %{PATCH102} %{PATCH104} %{PATCH105} %{PATCH107}; do
+for P in %{PATCH102} %{PATCH104} %{PATCH105} ; do
PATCHNAME=`basename $P | sed "s/%{name}-//; s/.patch$/.diff/"`
install $P patches/src680/$PATCHNAME
echo $PATCHNAME >> patches/src680/apply
@@ -2075,6 +2080,7 @@
--disable-symbols \
%endif
--with-num-cpus=$RPM_BUILD_NR_THREADS
+ --with-tag=%{ssnap}
"
# build-ooo script will pickup these
@@ -2146,7 +2152,7 @@
# Copy fixed OpenSymbol to correct location
install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
-install fonts/opens___.ttf $RPM_BUILD_ROOT%{_fontsdir}/TTF
+install build/%{ssnap}/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
@@ -2406,7 +2412,7 @@
%attr(755,root,root) %{_libdir}/%{name}/program/uri-encode
%attr(755,root,root) %{_libdir}/%{name}/program/viewdoc
%attr(755,root,root) %{_libdir}/%{name}/program/*.py
-%attr(755,root,root) %{_libdir}/%{name}/program/pyunorc-update64
+#%attr(755,root,root) %{_libdir}/%{name}/program/pyunorc-update64
%attr(755,root,root) %{_libdir}/%{name}/program/versionrc
%if %{with java}
@@ -2492,6 +2498,17 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.622 2006/12/16 18:20:34 sls
+- version up (2.1.0)
+- removed url from Source0 (cvs snapshot once again)
+- bcond with_vfs inverted
+- added patch no_fonts_dir_buildfix
+- removed regcomp_ugly_hack patch
+- TODO updates
+- added --with-tag configure switch
+- removed missing pyunorc-update (does anyone need it?)
+- updated location of opens___.ttf
+
Revision 1.621 2006/11/13 15:01:54 sparky
- don't use %{without ...}, it may not work after inverting bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.621&r2=1.622&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
