Author: arekm Date: Sun Apr 8 13:06:11 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.5.2.2 (but there is bunch of files still unpackaged)
---- Files affected:
packages/libreoffice:
libreoffice-hamcrest.patch (1.1 -> 1.2) , libreoffice.spec (1.940 -> 1.941)
, libreoffice-3.5.1-kde-4.8.1-namespace.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/libreoffice/libreoffice-hamcrest.patch
diff -u packages/libreoffice/libreoffice-hamcrest.patch:1.1
packages/libreoffice/libreoffice-hamcrest.patch:1.2
--- packages/libreoffice/libreoffice-hamcrest.patch:1.1 Thu Feb 23 19:10:35 2012
+++ packages/libreoffice/libreoffice-hamcrest.patch Sun Apr 8 15:06:06 2012
@@ -12,12 +12,13 @@
else
AC_MSG_RESULT([internal])
SYSTEM_APACHE_COMMONS=NO
-@@ -9128,7 +9133,7 @@
+@@ -9159,7 +9159,7 @@
if test $? -eq 0; then
# check if either class-path entry is available for hamcrest or
# it's bundled
-- if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep -q hamcrest || \
-+ if "$JAVA_HOME/bin/jar" tf /usr/share/java/hamcrest-core.jar |grep -q
hamcrest || \
- "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep -q
'Class-Path: hamcrest'; then
+- if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |$GREP -q hamcrest || \
++ if "$JAVA_HOME/bin/jar" tf /usr/share/java/hamcrest-core.jar |$GREP
-q hamcrest || \
+ "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |$GREP
'Class-Path:' | $GREP -q 'hamcrest'; then
AC_MSG_RESULT([$OOO_JUNIT_JAR])
else
+
================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.940
packages/libreoffice/libreoffice.spec:1.941
--- packages/libreoffice/libreoffice.spec:1.940 Sat Mar 17 23:01:47 2012
+++ packages/libreoffice/libreoffice.spec Sun Apr 8 15:06:06 2012
@@ -44,7 +44,7 @@
%undefine with_system_hsqldb
%endif
-%define major_ver 3.5.1
+%define major_ver 3.5.2
Summary: LibreOffice - powerful office suite
Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy
@@ -58,15 +58,15 @@
# cd build
# git checkout -b libreoffice-3-3 origin/libreoffice-3-3
Source0:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-core-%{version}.tar.xz
-# Source0-md5: 1edf0d39a7a921f6415f6a6ec7b314b3
+# Source0-md5: a21156d5657b8619a523ffdc5cc0003e
Source1:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-binfilter-%{version}.tar.xz
-# Source1-md5: 15d242aefa61993f2324a3bea953862b
+# Source1-md5: fed222d9a1bf22891d1e3939025874d6
Source2:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source2-md5: b2d520d47394dde43879638599372652
+# Source2-md5: 782d0cecfccc200f8ad0a07f0cb53f08
Source3:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source3-md5: 607b544cd7b38f9e6db6fe7da25007a7
+# Source3-md5: 3c064a24191274fcd8fd466ce9d5dc42
Source4:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source4-md5: a3fa7818bfab14a6cccec645193e9982
+# Source4-md5: 17ebcd0d25e716d3905b1a905907fd67
Source20:
http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
# Source20-md5: 185d60944ea767075d27247c3162b3bc
@@ -86,8 +86,7 @@
# Source29-md5: 18f577b374d60b3c760a3a3350407632
Source30:
http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
# Source30-md5: 17410483b5b5f267aa18b7e00b65e6e0
-Patch0: %{name}-3.5.1-kde-4.8.1-namespace.patch
-Patch1: %{name}-hamcrest.patch
+Patch0: %{name}-hamcrest.patch
URL: http://www.documentfoundation.org/
BuildRequires: /usr/bin/getopt
BuildRequires: GConf2-devel
@@ -2427,8 +2426,7 @@
%prep
%setup -q -n %{name}-core-%{version} -a1 -a2 -a3 -a4
-%patch0 -p1
-%patch1 -p0
+%patch0 -p0
for dir in *-%{version}; do
[ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
@@ -4099,6 +4097,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.941 2012/04/08 13:06:06 arekm
+- up to 3.5.2.2 (but there is bunch of files still unpackaged)
+
Revision 1.940 2012/03/17 22:01:47 arekm
- up to 3.5.1.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/libreoffice/libreoffice-hamcrest.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/libreoffice/libreoffice.spec?r1=1.940&r2=1.941
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
