Author: arekm Date: Thu Oct 13 20:27:13 2011 GMT
Module: packages Tag: LIBREOFFICE_3_3
---- Log message:
- start playing with 3.4.3.2
---- Files affected:
packages/libreoffice:
libreoffice.spec (1.895.2.2 -> 1.895.2.3)
---- Diffs:
================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.895.2.2
packages/libreoffice/libreoffice.spec:1.895.2.3
--- packages/libreoffice/libreoffice.spec:1.895.2.2 Sun Oct 9 12:26:03 2011
+++ packages/libreoffice/libreoffice.spec Thu Oct 13 22:27:08 2011
@@ -39,66 +39,65 @@
%undefine with_system_hsqldb
%endif
+%define major_ver 3.4.3
%define upd 330
Summary: LibreOffice - powerful office suite
Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy
Name: libreoffice
-Version: 3.3.2.2
-Release: 3
+Version: %{major_ver}.2
+Release: 0.1
License: GPL/LGPL
Group: X11/Applications
# we use git because released tarballs are buggy too often
# git clone git://anongit.freedesktop.org/git/libreoffice/build
# cd build
# git checkout -b libreoffice-3-3 origin/libreoffice-3-3
-Source0:
http://download.documentfoundation.org/libreoffice/src/%{name}-build-%{version}.tar.gz
-# Source0-md5: 2f54261deaf89d8154440ea33bf12cc2
+Source0:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-bootstrap-%{version}.tar.bz2
+# Source0-md5: 465b3be0e30f88e1139c45d2e2217927
Source1: http://download.go-oo.org/DEV300/ooo-cli-prebuilt-3.3.tar.bz2
# Source1-md5: fc46e64367c3b09a1668fb9ab40c031b
-Source2:
http://download.documentfoundation.org/libreoffice/src/%{name}-artwork-%{version}.tar.bz2
-# Source2-md5: cd9f83d8dc2f85f06b2999fd3d23a74d
-Source3:
http://download.documentfoundation.org/libreoffice/src/%{name}-base-%{version}.tar.bz2
-# Source3-md5: 46fb3c85cc878daabb58d94fa848a59d
-Source4:
http://download.documentfoundation.org/libreoffice/src/%{name}-bootstrap-%{version}.tar.bz2
-# Source4-md5: 19698765fe35dcbb1f6d7d55c617c39f
-Source5:
http://download.documentfoundation.org/libreoffice/src/%{name}-calc-%{version}.tar.bz2
-# Source5-md5: 0274eb33f462e620cb2f37aa696d18b1
-Source6:
http://download.documentfoundation.org/libreoffice/src/%{name}-components-%{version}.tar.bz2
-# Source6-md5: a5f11a035faa6160121dd2d3f984065f
-Source7:
http://download.documentfoundation.org/libreoffice/src/%{name}-extensions-%{version}.tar.bz2
-# Source7-md5: d54e5f7e5cde7f648d74e382eb5e44fc
-Source8:
http://download.documentfoundation.org/libreoffice/src/%{name}-extras-%{version}.tar.bz2
-# Source8-md5: db5d3a8886ec451c11e1ef3cea132ce0
-Source9:
http://download.documentfoundation.org/libreoffice/src/%{name}-filters-%{version}.tar.bz2
-# Source9-md5: 4ae9b40116ef3f840b232cb3454be4e3
-Source10:
http://download.documentfoundation.org/libreoffice/src/%{name}-help-%{version}.tar.bz2
-# Source10-md5: 2dc8e4b347866f9469eb6c42a9cb0b81
-Source11:
http://download.documentfoundation.org/libreoffice/src/%{name}-impress-%{version}.tar.bz2
-# Source11-md5: e9211340b2a7f48c17883db76d1e8e03
-Source12:
http://download.documentfoundation.org/libreoffice/src/%{name}-l10n-%{version}.tar.bz2
-# Source12-md5: 688768909f823b5006162d27638aa15e
-Source13:
http://download.documentfoundation.org/libreoffice/src/%{name}-libs-core-%{version}.tar.bz2
-# Source13-md5: 26ca2152535ba45bf71d8aa3b26fc967
-Source14:
http://download.documentfoundation.org/libreoffice/src/%{name}-libs-extern-%{version}.tar.bz2
-# Source14-md5: 9df0af97ec8d085864c5341678bb1d0d
-Source15:
http://download.documentfoundation.org/libreoffice/src/%{name}-libs-extern-sys-%{version}.tar.bz2
-# Source15-md5: 09b22bf1a812affbfe561230940d7da2
-Source16:
http://download.documentfoundation.org/libreoffice/src/%{name}-libs-gui-%{version}.tar.bz2
-# Source16-md5: e3dc1c328dfdf4a288946957c69ad32b
-Source17:
http://download.documentfoundation.org/libreoffice/src/%{name}-postprocess-%{version}.tar.bz2
-# Source17-md5: 5c0a8203253d053f23613e68cdb69565
-Source18:
http://download.documentfoundation.org/libreoffice/src/%{name}-sdk-%{version}.tar.bz2
-# Source18-md5: 2e68a800e323fd3286a0a3305e3d3e39
-Source19:
http://download.documentfoundation.org/libreoffice/src/%{name}-testing-%{version}.tar.bz2
-# Source19-md5: e91523550f9cae015923685ad3fce5ad
-Source20:
http://download.documentfoundation.org/libreoffice/src/%{name}-ure-%{version}.tar.bz2
-# Source20-md5: a17434cc2469a263ffabd345e90d8911
-Source21:
http://download.documentfoundation.org/libreoffice/src/%{name}-writer-%{version}.tar.bz2
-# Source21-md5: 6faf9924a74b836527906f49fcea40c2
-Source22: http://download.go-oo.org/SRC680/biblio.tar.bz2
-# Source22-md5: 1948e39a68f12bfa0b7eb309c14d940c
-Source23: http://download.go-oo.org/SRC680/extras-3.1.tar.bz2
+Source2:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-artwork-%{version}.tar.bz2
+# Source2-md5: 7c2e73f1197d169519f86efe422e5df9
+Source3:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-base-%{version}.tar.bz2
+# Source3-md5: 823956297a7e0b7603c585c49bd9fd4e
+Source4:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-writer-%{version}.tar.bz2
+# Source4-md5: da8a40cac4bd9d4f6f326e0e3b1b7e2a
+Source5:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-calc-%{version}.tar.bz2
+# Source5-md5: a1d5af5be5eb522c8a24feacbb0161fa
+Source6:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-components-%{version}.tar.bz2
+# Source6-md5: 8b972e130dfe62eb41d1d71d72de4b76
+Source7:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-extensions-%{version}.tar.bz2
+# Source7-md5: a6b22494e3a65a3b242ecb896aa7ab48
+Source8:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-extras-%{version}.tar.bz2
+# Source8-md5: b7d86f8baee5b31af210cc81785e5676
+Source9:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-filters-%{version}.tar.bz2
+# Source9-md5: de6c062d334daab99cf0592aa3568215
+Source10:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.bz2
+# Source10-md5: df46914d540ef0126cd746d09c68ca2a
+Source11:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-impress-%{version}.tar.bz2
+# Source11-md5: 8f308250c397ddc6fdb1aae13e102927
+Source12:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.bz2
+# Source12-md5: 502e89e7a190c2b955467215f7894af0
+Source13:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-libs-core-%{version}.tar.bz2
+# Source13-md5: 1fd00a0fcfd4a5d1956c3f6a0990d1ce
+Source14:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-libs-extern-%{version}.tar.bz2
+# Source14-md5: 86914ac8bc30ea721b708b2f2faa3111
+Source15:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-libs-extern-sys-%{version}.tar.bz2
+# Source15-md5: 1452229e57ac3c4191e798eac4c0a7e0
+Source16:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-libs-gui-%{version}.tar.bz2
+# Source16-md5: bb46bdb682689629d432cdbf5f3f42c2
+Source17:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-postprocess-%{version}.tar.bz2
+# Source17-md5: bec7f633562762debdf810690002e688
+Source18:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-sdk-%{version}.tar.bz2
+# Source18-md5: 87061613efece1c253906a90cd4dc01f
+Source19:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-testing-%{version}.tar.bz2
+# Source19-md5: 308284d7d1d1bd6860d128b26e24390b
+Source20:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-ure-%{version}.tar.bz2
+# Source20-md5: fa8b36365a2b2fb110c44886d7069774
+Source21: http://download.go-oo.org/SRC680/biblio.tar.bz2
+Source22: http://download.go-oo.org/SRC680/extras-3.1.tar.bz2
+# Source22-md5: 1aa219782c41ff6cabef9ecaf147556f
# Source23-md5: 1aa219782c41ff6cabef9ecaf147556f
Source100:
http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
# Source100-md5: fdb27bfe2dbe2e7b57ae194d9bf36bab
@@ -183,6 +182,7 @@
BuildRequires: freetype-devel >= 2.1
BuildRequires: glib2-devel >= 2.13.5
BuildRequires: gperf
+BuildRequires: graphite2-devel
BuildRequires: gstreamer-devel >= 0.10.0
BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
BuildRequires: gtk+2-devel >= 2:2.10
@@ -2467,31 +2467,8 @@
bashowe uzupełnianie nazw dla LibreOffice.
%prep
-%setup -q -n %{name}-build-%{version}
-%patch0 -p1
-
-install -d src
-
-# sources, icons, KDE_icons. You can verify that all needed sources
-# are here by running ./download script manually after rpmbuild -bp
-ln -sf %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
- %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
- %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
- %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} \
- %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} \
- %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE100} \
- %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} \
- %{SOURCE105} %{SOURCE106} %{SOURCE107} %{SOURCE108} \
- %{SOURCE109} %{SOURCE110} %{SOURCE111} %{SOURCE112} \
- %{SOURCE113} %{SOURCE114} %{SOURCE115} %{SOURCE116} \
- %{SOURCE117} %{SOURCE118} %{SOURCE119} %{SOURCE120} \
- %{SOURCE121} %{SOURCE122} %{SOURCE123} %{SOURCE124} \
- src
-
-ln -s %{PATCH100} patches/hotfixes/%{basename:%{PATCH100}}.diff
-ln -s %{PATCH101} patches/hotfixes/%{basename:%{PATCH101}}.diff
-ln -s %{PATCH102} patches/hotfixes/%{basename:%{PATCH102}}.diff
-ln -s %{PATCH103} patches/hotfixes/%{basename:%{PATCH103}}.diff
+%setup -q -n %{name}-bootstrap-%{version} -b1 -b2 -b3 -b4 -b5 -b6 -b7 -b8 \
+ -b9 -b10 -b11 -b12 -b13 -b14 -b15 -b16 -b17 -b18 -b19 -b20 -b21 -b22
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -4240,6 +4217,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.895.2.3 2011/10/13 20:27:08 arekm
+- start playing with 3.4.3.2
+
Revision 1.895.2.2 2011/10/09 10:26:03 arekm
- rel 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.895.2.2&r2=1.895.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
