SPECS: openoffice.org.spec - started 2.2
glen
glen at pld-linux.org
Tue Mar 27 15:07:29 CEST 2007
Author: glen Date: Tue Mar 27 13:07:29 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- started 2.2
---- Files affected:
SPECS:
openoffice.org.spec (1.746 -> 1.747)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.746 SPECS/openoffice.org.spec:1.747
--- SPECS/openoffice.org.spec:1.746 Tue Mar 20 18:10:28 2007
+++ SPECS/openoffice.org.spec Tue Mar 27 15:07:24 2007
@@ -6,7 +6,6 @@
# SRPMS 0.3 GB
# RPMS 0.9 GB
# TODO:
-# - --with-system-libwps Use system libwps* library
# - pld about logo says 2.0
# - without system_db will not work (w/ java) as it will use db4.2 which is too old (see r1.650)
# - problems with gcc-4.2.0: oowriter is useless (invisble text till refresh)
@@ -67,31 +66,34 @@
%undefine with_system_hsqldb
%endif
-%define _rel 0.5
%define upd 680
-%define mws OOE%{upd}
+%define mws OOF%{upd}
%define tag %(echo %{mws} | tr A-Z a-z)-%{milestone}
+%define milestone m14
%define _tag %(echo %{tag} | tr - _)
-%define milestone m6
+%define _rc rc4
+%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.1.0
-Release: 0.%{_tag}.%{_rel}
+Version: 2.2.0
+Release: %{_tag}.%{_rc}.%{_rel}
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
-Source0: http://go-ooo.org/packages/OOE680/ooo-build-2.1.8.tar.gz
-# Source0-md5: ec39e9bb30c5285afba50ae32dbe7af2
+#Source0: http://go-ooo.org/packages/OOE680/ooo-build-2.1.8.tar.gz
+# svn export http://svn.gnome.org/svn/ooo-build/tags/DEBIAN-2_2_0_RC4-1 ooo-build-2.2.0
+Source0: ooo-build-%{version}.tar.bz2
+# Source0-md5: 4ada0593297e807fe07363af3de7c7e3
Source1: http://go-ooo.org/packages/%{mws}/%{tag}-core.tar.bz2
-# Source1-md5: 7dbf5f7ea4f469bb6c8b1d6037567431
+# Source1-md5: 42ec421d4550572c4718b2f4d31a1aef
Source2: http://go-ooo.org/packages/%{mws}/%{tag}-system.tar.bz2
-# Source2-md5: 7f645231043a776c07a22300c0a10848
+# Source2-md5: a82acbe556fad97128cea8dc7017da5a
Source3: http://go-ooo.org/packages/%{mws}/%{tag}-binfilter.tar.bz2
-# Source3-md5: 22acf75656a2186d8a969ee5069ef193
+# Source3-md5: b22033d24d92a9e65860d594da9e81a0
Source4: http://go-ooo.org/packages/%{mws}/%{tag}-lang.tar.bz2
-# Source4-md5: 9b1a1d5dafbde7cbc90da8b903e6b0bf
+# Source4-md5: c98e40510a858cd6afdd25149f48300c
Source10: http://go-ooo.org/packages/SRC680/ooo_custom_images-13.tar.bz2
# Source10-md5: 2480af7f890c8175c7f9e183a1b39ed2
Source11: http://go-ooo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2
@@ -108,11 +110,8 @@
# 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
+Source20: http://go-ooo.org/packages/SRC680/libwps-0.1.0~svn20070129.tar.gz
+# Source20-md5: 2e442485100f7e00685737513f853546
Source50: openabout_pld.png
Source51: openintro_pld.bmp
# patches applied in prep section
@@ -124,6 +123,7 @@
Patch6: %{name}-java16.patch
Patch7: %{name}-nodictinst.patch
Patch8: %{name}-73257.patch
+Patch9: %{name}-apply.patch
# patches applied by ooo-patching-system
Patch100: %{name}-STL-lib64.diff
Patch101: %{name}-64bit-inline.diff
@@ -169,10 +169,11 @@
BuildRequires: libsndfile-devel
BuildRequires: libstdc++-devel >= 5:3.2.1
BuildRequires: libwpd-devel >= 0.8.6
+BuildRequires: libwps-devel
BuildRequires: libxml2-devel >= 2.0
%{?with_system_mdbtools:BuildRequires: mdbtools-devel >= 0.6}
-%{?with_mono:BuildRequires: mono-csharp >= 1.1.8}
-%{?with_mono:BuildRequires: mono-devel >= 1.1.8}
+%{?with_mono:BuildRequires: mono-csharp >= 1.2.3}
+%{?with_mono:BuildRequires: mono-devel >= 1.2.3}
%{?with_system_myspell:BuildRequires: myspell-devel}
BuildRequires: nas-devel >= 1.7-1
BuildRequires: neon-devel
@@ -2036,7 +2037,7 @@
bashowe uzupełnianie nazw dla Openoffice.org.
%prep
-%setup -q -n %(basename %{SOURCE0} .tar.gz)
+%setup -q -n %(basename %{SOURCE0} .tar.bz2)
install -d src
cp %{SOURCE50} %{SOURCE51} src
@@ -2045,7 +2046,7 @@
%{SOURCE10} %{SOURCE11} %{SOURCE12} \
%{SOURCE15} %{SOURCE16} %{SOURCE17} \
%{SOURCE18} %{SOURCE19} \
- %{SOURCE20} %{SOURCE21} \
+ %{SOURCE20} \
src
# fixes for the patch subsystem
@@ -2054,14 +2055,15 @@
# teach configure.in about PLD
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch6 -p1
%if %{with system_myspell}
%patch7 -p1
%endif
-%patch8 -p1
+#%patch8 -p1
+%patch9 -p1
# 64 bit related patches (not applied now)
install %{PATCH100} patches/64bit
@@ -2170,6 +2172,7 @@
--with-system-icu \
--with-system-jpeg \
--with-system-libwpd \
+ --with-system-libwps \
--with-system-libxml \
--with-system-nas \
--with-system-neon \
@@ -2334,7 +2337,7 @@
%endif
%if %{with mono}
- rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/mono-ooo-2.1.pc
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/mono-ooo-2.1.pc
%endif
# Remove dictionaries (in separate pkg)
@@ -3935,862 +3938,6 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.746 2007/03/20 17:10:28 glen
-- mono build success
+Revision 1.747 2007/03/27 13:07:24 glen
+- started 2.2
-Revision 1.745 2007/03/20 01:39:29 glen
-- disable strip (we do it in rpm), typo in with mono bcond
-
-Revision 1.744 2007/03/20 00:57:46 glen
-- AC-branch merge
-
-Revision 1.743 2007/03/18 15:24:17 glen
-- update from AC-branch
-
-Revision 1.742 2007/03/18 15:18:28 glen
-- package icons
-
-Revision 1.741 2007/03/18 04:33:29 sparky
-- fixed (echo | tr )
-
-Revision 1.740 2007/03/17 22:39:58 glen
-- remove unwanted chunks
-
-Revision 1.739 2007/03/17 22:39:08 glen
-- fix install re-entrancy
-
-Revision 1.738 2007/03/17 21:42:18 glen
-- nevermind now
-
-Revision 1.737 2007/03/17 21:34:01 glen
-- about says 2.1, so that should be the version
-
-Revision 1.736 2007/03/17 21:25:44 glen
-- sofficerc as %config
-
-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
-
-Revision 1.733 2007/03/17 13:41:38 glen
-- unixodbc with fixed sqltypes on x86_64
-
-Revision 1.732 2007/03/16 18:00:25 glen
-- AC-branch merge
-
-Revision 1.731 2007/03/16 09:27:12 sparky
-- require javafilter only if java-enabled
-
-Revision 1.730 2007/03/15 17:45:44 qboosh
-- pl for browser-plugin-
-
-Revision 1.729 2007/03/15 08:31:33 arekm
-- tested; revert
-
-Revision 1.728 2007/03/15 08:25:33 arekm
-- fail; testing builders
-
-Revision 1.727 2007/03/13 13:02:55 glen
-- AC-branch merge
-
-Revision 1.726 2007/03/11 16:04:58 glen
-- AC-branch merge: move %{name}/share to %{_datadir}, now external noarch packages possible
-
-Revision 1.725 2007/03/11 12:24:34 qrczak
-- Fixed updating desktop & mime database.
-- Updated a comment about disk space requirements.
-- rel 6
-
-Revision 1.724 2007/03/09 20:15:26 qrczak
-- Added explicit --with-xalan-jar
-
-Revision 1.723 2007/03/08 22:13:35 glen
-- AC-branch merge
-
-Revision 1.722 2007/03/08 16:21:40 glen
-- openclipart gallery built externally, no more at install stage; rel 5
-
-Revision 1.721 2007/03/08 02:58:37 glen
-- plugin needs to be in ooo dir
-
-Revision 1.720 2007/03/08 02:18:01 glen
-- browser-plugins subpackage
-
-Revision 1.719 2007/03/08 00:40:11 glen
-- skip dictionaries install if system dicts are used
-
-Revision 1.718 2007/03/07 23:30:45 qrczak
-- Fixed ANT_HOME, at least for our ant-1.7.0.
-
-Revision 1.717 2007/03/06 02:17:15 glen
-- AC-branch merge
-
-Revision 1.716 2007/03/06 02:15:14 glen
-- dot
-
-Revision 1.715 2007/03/06 00:02:13 glen
-- AC-branch merge
-
-Revision 1.714 2007/03/05 20:53:04 glen
-- adapter
-
-Revision 1.713 2007/03/05 16:21:53 arekm
-- change libj680li_g.so to match libj680lx_g, too. libplacewareli*.so only once in impress subpackage
-
-Revision 1.712 2007/03/05 14:19:26 glen
-- files update for system agg and hunspell
-
-Revision 1.711 2007/03/05 08:08:37 arekm
-- use serializer.jar from new xerces-j if available; fallback to xalan.jar
-
-Revision 1.710 2007/03/05 01:39:35 glen
-- AC-branch merge
-
-Revision 1.709 2007/03/03 14:51:22 glen
-- configure args cosmetics
-
-Revision 1.708 2007/03/03 14:22:33 glen
-- AC-branch merge (use system hsqldb, jdb blocker removed)
-
-Revision 1.707 2007/03/03 14:18:01 glen
-- localization todo
-
-Revision 1.706 2007/03/01 09:02:48 arekm
-- missing backslash
-
-Revision 1.705 2007/02/28 23:18:23 glen
-- use ooo build for java6 patch
-
-Revision 1.704 2007/02/25 16:49:46 glen
-- deps for system_* java bconds should be also runtime as now /usr/share/java
- paths are used.
-
-Revision 1.703 2007/02/25 16:43:25 glen
-- -libs dep not needed
-
-Revision 1.702 2007/02/25 13:37:52 glen
-- when system_xalan is used serializer.jar cames from xalan
-
-Revision 1.701 2007/02/24 22:54:53 glen
-- missing jars are due using system pkgs
-- add possible java6 fix for amd64 platform
-
-Revision 1.700 2007/02/24 16:47:55 glen
-- less noisy languages installation
-
-Revision 1.699 2007/02/24 11:46:57 glen
-- build with xulrunner
-
-Revision 1.698 2007/02/13 07:16:51 glen
-- tabs in preamble
-
-Revision 1.697 2007/02/12 00:49:17 baggins
-- converted to UTF-8
-
-Revision 1.696 2007/01/26 16:22:46 glen
-- -libs-{kde,gtk} are still optional
-- dropped -dirs as no longer needed
-- not tested as my build fails ;(
-
-Revision 1.695 2007/01/23 22:30:21 glen
-- internal db & java won't work (xmlhelp will fail)
-
-Revision 1.694 2007/01/22 23:24:18 glen
-- as java 6 is known to be broken, add dep
-
-Revision 1.693 2007/01/12 10:15:01 qboosh
-- fixed system_db bcond desc
-
-Revision 1.692 2007/01/09 20:29:27 ankry
-- tabs
-
-Revision 1.691 2007/01/09 18:24:15 glen
-- R: shared-mime-info due file packaged there
-
-Revision 1.690 2007/01/09 13:06:29 glen
-- unify
-
-Revision 1.689 2007/01/08 21:10:30 sls
-- turning off java dependent bconds
-
-Revision 1.688 2007/01/08 21:05:58 sls
-- rewritten TODO about system libs
-- added bconds system_xalan, system_xerces, system_xml_apis
-- fixed (?) description bcond system_db, system_libhnj
-- fixed and switched off bcond system_libhnj
-- sorted TODO
-
-Revision 1.687 2007/01/08 19:06:18 sls
-- BC: java-sun-1.4.2 removed
-- added TODO entries about java
-
-Revision 1.686 2007/01/07 19:32:23 qboosh
-- use gnomevfs bcond for its files
-
-Revision 1.685 2007/01/07 19:24:22 qboosh
-- pl for new packages
-
-Revision 1.684 2007/01/07 19:12:40 qboosh
-- acor_* already packaged, not to be marked with lang() (not UI)
-
-Revision 1.683 2007/01/07 13:56:03 glen
-- add -web to metapackage
-
-Revision 1.682 2007/01/07 13:47:47 glen
-- restore -libs virtual as do my knowledge ooo2 can't run without kde or gnome toolkit
-
-Revision 1.681 2007/01/07 13:46:27 glen
-- yes, -core needs -dirs due parent dirs
-
-Revision 1.680 2007/01/07 13:43:02 glen
-- unify font package naming
-
-Revision 1.679 2007/01/07 10:13:42 sls
-- created subpackage -fonts-OpenSymbol
-
-Revision 1.678 2007/01/07 08:31:37 sls
-- added missing regcomp.bin
-
-Revision 1.677 2007/01/07 05:24:06 sls
-- removed autodetected BR: libwpd
-
-Revision 1.676 2007/01/07 04:50:57 sls
-- new subpackage -web (or should be included to -writer?)
-
-Revision 1.675 2007/01/07 03:05:37 sls
-- moved files from -impress to proper packages
-
-Revision 1.674 2007/01/07 02:33:05 sls
-- TODO update
-
-Revision 1.673 2007/01/07 01:31:45 sls
-- remove bogus dependencies
-
-Revision 1.672 2007/01/07 01:28:13 sls
-- more TODO
-
-Revision 1.671 2007/01/05 19:16:51 sls
-- more TODO
-
-Revision 1.670 2007/01/05 18:29:01 sls
-- not creating empty package
-
-Revision 1.669 2007/01/05 17:47:51 sls
-- more TODO
-
-Revision 1.668 2007/01/05 17:34:48 sls
-- exclude files not existed --without java
-
-Revision 1.667 2007/01/05 01:01:41 glen
-- obsolete oooqs
-
-Revision 1.666 2007/01/05 00:21:32 sls
-- add possibility to build without all languages
-
-Revision 1.665 2007/01/05 00:16:26 glen
-- split to applications, inspired by FC openoffice.org-2.1.0-6.7.src.rpm
-
-Revision 1.664 2007/01/04 23:17:19 sls
-- TODO cleanup
-
-Revision 1.663 2007/01/04 22:36:38 glen
-- i believe without system db db-java is not needed
-
-Revision 1.662 2007/01/04 22:04:48 glen
-- expand share/registry/data
-
-Revision 1.661 2007/01/04 21:56:28 sls
-- added temporary bcond xvfb
-- added BR: xorg-font-font-{misc-misc-base,cursor-misc} needed to run Xvfb
-
-Revision 1.660 2007/01/04 21:34:35 glen
-- expand share/registry/schema
-
-Revision 1.659 2007/01/04 20:46:46 glen
-- expand share/registry/modules
-
-Revision 1.658 2007/01/04 19:39:39 glen
-- expand share/xslt
-
-Revision 1.657 2007/01/04 18:49:13 glen
-- expand resources, classes, help files
-
-Revision 1.656 2007/01/04 18:11:51 glen
-- more verbose files
-
-Revision 1.655 2007/01/04 17:16:23 glen
-- %files cleanup
-
-Revision 1.654 2007/01/04 16:49:58 glen
-- add files produced by building with java on ac-i686
-- add more symlinks
-
-Revision 1.653 2007/01/04 14:23:02 sls
-- configure --with-system-libxslt
-- TODO changes about system libraries
-
-Revision 1.652 2007/01/04 13:28:33 glen
-- executable chmod once is sufficent
-
-Revision 1.651 2007/01/04 12:33:01 sls
-- removed BR: ImageMagick
-
-Revision 1.650 2007/01/04 09:37:42 glen
-- com.sleepycat.db.Database not available earlier than 4.3
-
-Revision 1.649 2007/01/04 09:06:29 glen
-- subshell optimize
-
-Revision 1.648 2007/01/04 09:05:12 glen
-- apply stl-amd64.patch
-
-Revision 1.647 2007/01/03 22:59:43 glen
-- remove or package files
-- remove executable permissions of rcfiles
-- gconfbe1.uno.so, ucpgvfs1.uno.so moved to -libs-gtk
-
-Revision 1.646 2007/01/03 21:40:45 sls
-- added missing BR: libbonobo-devel
-
-Revision 1.645 2007/01/03 20:53:56 glen
-- package also symlinks
-
-Revision 1.644 2007/01/03 19:37:26 glen
-- more %files moves
-
-Revision 1.643 2007/01/03 17:51:52 glen
-- verbose files instead of program/*.so
-
-Revision 1.642 2007/01/03 17:50:47 glen
-- ... and the second part
-
-Revision 1.641 2007/01/03 17:39:29 glen
-- move %files to one place (for easy commenting them out)
-
-Revision 1.640 2007/01/03 17:06:42 sls
-- added patch java16
-- added missing BR: xorg-lib-libXaw-devel
-
-Revision 1.639 2007/01/03 16:59:53 glen
-- put gnome-set-default-application to gtk package
-
-Revision 1.638 2007/01/03 12:39:00 glen
-- --with-system-stdlibs solves missing libstdc++ problem
-- expand *.bin and move gnome-open-url.bin to proper package
-- ooqstart is installed by default
-- more possible todo
-
-Revision 1.637 2007/01/03 12:01:26 sls
-- updated TODO
-
-Revision 1.636 2007/01/02 23:33:55 glen
-- no CDE in PLD
-
-Revision 1.635 2007/01/02 23:10:47 glen
-- yay. built this beast on ac-i686
-
-Revision 1.634 2006/12/27 03:51:41 qboosh
-- comment about cups
-
-Revision 1.633 2006/12/27 03:43:26 qboosh
-- db R is autodetected
-
-Revision 1.632 2006/12/26 23:14:40 qboosh
-- mdbtools sources not needed to build
-
-Revision 1.631 2006/12/26 21:39:54 qboosh
-- BR: libwpd-devel >= 0.8.6 (this version is included); no need include libwpd sources
-
-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
-
-Revision 1.628 2006/12/23 18:09:58 qboosh
-- added kde bcond (untested)
-
-Revision 1.627 2006/12/23 18:06:08 qboosh
-- BR reorders, ac/am versions
-
-Revision 1.626 2006/12/23 17:50:06 qboosh
-- unified bcond name (vfs -> gnomevfs)
-
-Revision 1.625 2006/12/19 22:18:41 sls
-- added subpackage bash-completion-openoffice
-- rel up (0.3)
-- TODO updates
-
-Revision 1.624 2006/12/18 11:02:11 sls
-- TODO updates
-- added some i18n packages
-- rel up (0.2)
-- fixed typo in i18n-mk
-
-Revision 1.623 2006/12/16 19:45:43 sls
-- updated Source0 md5sum
-- removed is_pre macro and related stuff
-
-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
-
-Revision 1.620 2006/11/02 00:26:12 glen
-- STLport epoch
-
-Revision 1.619 2006/11/01 22:36:31 glen
-- fix amd64 build (thx sis)
-
-Revision 1.618 2006/11/01 22:34:47 glen
-- i believe there was wrong variable used instead of RPM_BUILD_NR_THREADS
-- cosmetics
-
-Revision 1.617 2006/11/01 22:32:06 glen
-- more accurate check for RPM_BUILD_NR_THREADS
-
-Revision 1.616 2006/11/01 22:30:22 glen
-- avoid errors when %{__make} ends with space
-
-Revision 1.615 2006/11/01 22:06:20 glen
-- gstreamer 0.10 deps
-
-Revision 1.614 2006/11/01 21:00:20 glen
-- checking ICU version... configure: error: no. you need at least icu 3.4
-
-Revision 1.613 2006/11/01 18:14:51 sls
-- renamed firefox patch (.patch -> .diff)
-- TODO updates
-- fixed group for i18n packages (X11/applications)
-
-Revision 1.612 2006/10/31 21:45:52 glen
-- BuildConflicts/BuildRequires: libicu-devel together make no sense
-
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.746&r2=1.747&f=u
More information about the pld-cvs-commit
mailing list