Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2012-01-20 20:24:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice", Maintainer is "pmla...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-en-US.changes
2011-12-25 17:36:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-help-en-US.changes
2012-01-20 20:24:12.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Jan 12 16:51:02 CET 2012 - dmuel...@suse.de
+
+- obsolete OpenOffice_org-help-en-US-devel (bnc#741043)
+
+-------------------------------------------------------------------
+Wed Jan 4 14:44:31 UTC 2012 - pmla...@suse.com
+
+- added automake into BuildRequires to fix build in Factory
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-group1.changes
2011-12-25 17:36:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-help-group1.changes
2012-01-20 20:24:12.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 4 14:44:31 UTC 2012 - pmla...@suse.com
+
+- added automake into BuildRequires to fix build in Factory
+
+-------------------------------------------------------------------
libreoffice-help-group2.changes: same change
libreoffice-help-group3.changes: same change
libreoffice-help-group4.changes: same change
libreoffice-help-group5.changes: same change
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2011-12-25
17:36:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes
2012-01-20 20:24:13.000000000 +0100
@@ -1,0 +2,23 @@
+Wed Jan 11 14:05:57 UTC 2012 - pmla...@suse.com
+
+- buildfix-ucb-glib-2.31.diff: fix build with glib-2.31; glib/gthread.h
+ can't be included directly
+- libreoffice-desktop-icons-256x256.tar.bz2: add missing 256x256 desktop
+ icons (bnc#722644)
+
+-------------------------------------------------------------------
+Wed Jan 4 16:36:32 UTC 2012 - pmla...@suse.com
+
+- add compat symlinks for the old main desktop icon (bnc#724087)
+
+-------------------------------------------------------------------
+Tue Jan 3 17:25:02 UTC 2012 - pmla...@suse.com
+
+- define %%python_sitelib on SLED11 and older systems to fix installation
+
+-------------------------------------------------------------------
+Tue Jan 3 16:54:07 UTC 2012 - pmla...@suse.com
+
+- correctly obsolete OpenOffice_org-artwork-devel (bnc#734781)
+
+-------------------------------------------------------------------
New:
----
buildfix-ucb-glib-2.31.diff
libreoffice-desktop-icons-256x256.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-branding-upstream.spec ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:35.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-branding-upstream
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ libreoffice-help-en-US.spec ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:35.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-help-en-US
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,7 @@
%define prepare_build 1
#!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
-BuildRequires: ant ant-apache-regexp bison boost-devel db-devel flac-devel
flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
+BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel
flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
%if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives
@@ -56,6 +56,8 @@
# compat stuff
Provides: OpenOffice_org-help-en-US = %version
Obsoletes: OpenOffice_org-help-en-US < %version
+Provides: OpenOffice_org-help-en-US-devel = %version
+Obsoletes: OpenOffice_org-help-en-US-devel < %version
Provides: libreoffice:%_prefix/ooo-2.0/help/en/default.css
# Arabic help was not realy localized
Provides: OpenOffice_org-help-ar = %version
++++++ libreoffice-help-group1.spec ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:35.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-help-group1
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -54,7 +54,7 @@
%endif
#!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
-BuildRequires: ant ant-apache-regexp bison boost-devel db-devel flac-devel
flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
+BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel
flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
%if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives
@@ -128,7 +128,6 @@
is in libreoffice-l10n-cs.
-
%endif
%if %test_build_langs >= 2
@@ -153,7 +152,6 @@
is in libreoffice-l10n-da.
-
%endif
%if %test_build_langs >= 1
@@ -178,7 +176,6 @@
is in libreoffice-l10n-de.
-
%endif
%if %test_build_langs >= 2
@@ -202,7 +199,6 @@
British help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-en-GB.
-
%endif
++++++ libreoffice-help-group2.spec ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:35.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-help-group2
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -54,7 +54,7 @@
%endif
#!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
-BuildRequires: ant ant-apache-regexp bison boost-devel db-devel flac-devel
flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
+BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel
flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
%if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives
@@ -211,7 +211,6 @@
Galician help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-gl.
-
%endif
++++++ libreoffice-help-group3.spec ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:35.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-help-group3
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -54,7 +54,7 @@
%endif
#!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
-BuildRequires: ant ant-apache-regexp bison boost-devel db-devel flac-devel
flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
+BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel
flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
%if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives
@@ -149,7 +149,6 @@
is in libreoffice-l10n-hi-IN.
-
%endif
%if %test_build_langs >= 1
@@ -174,7 +173,6 @@
is in libreoffice-l10n-hu.
-
%endif
%if %test_build_langs >= 2
@@ -199,7 +197,6 @@
is in libreoffice-l10n-it.
-
%endif
%if %test_build_langs >= 1
@@ -224,7 +221,6 @@
is in libreoffice-l10n-ja.
-
%endif
%if %test_build_langs >= 2
@@ -248,7 +244,6 @@
Khmer help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-km.
-
%endif
++++++ libreoffice-help-group4.spec ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:35.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-help-group4
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -54,7 +54,7 @@
%endif
#!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
-BuildRequires: ant ant-apache-regexp bison boost-devel db-devel flac-devel
flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
+BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel
flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
%if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives
@@ -190,7 +190,6 @@
Portuguese help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-pt.
-
%endif
++++++ libreoffice-help-group5.spec ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:35.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-help-group5
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -54,7 +54,7 @@
%endif
#!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
-BuildRequires: ant ant-apache-regexp bison boost-devel db-devel flac-devel
flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
+BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel
flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
%if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives
@@ -232,7 +232,6 @@
Chinese Traditional help localization for LibreOffice. The other localized
stuff
is in libreoffice-l10n-zh-TW.
-
%endif
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:35.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -156,7 +156,11 @@
%else
%define java_target_version 1.4
%endif
-#
+# python paths
+%if 0%{?suse_version} <= 01110
+%define python_sitelib %(python -c "from distutils.sysconfig import
get_python_lib; import sys; sys.stdout.write(get_python_lib())")
+%endif
+# LO paths
%define lo_prefix %_libdir
%define lo_home libreoffice
%define lo_basis_dir basis3.4
@@ -252,7 +256,7 @@
# split build compat stuff obsoleted with LO-3.4
# artwork
Provides: OpenOffice_org-artwork-devel = %version
-Obsoletes: OpenOffice_org-artwork-devel = %version
+Obsoletes: OpenOffice_org-artwork-devel < %version
Provides: libreoffice-artwork-devel = %version
Obsoletes: libreoffice-artwork-devel < %version
# bootstrap
@@ -426,6 +430,8 @@
Source17: libreoffice-translations-%version.tar.bz2
Source18: libreoffice-ure-%version.tar.bz2
Source19: libreoffice-writer-%version.tar.bz2
+# 256x256 desktop icons (bnc#722644)
+Source20: libreoffice-desktop-icons-256x256.tar.bz2
# SUSE config files
Source100: SUSE.conf
Source101: SUSE-10.1.conf
@@ -576,6 +582,8 @@
Patch25: horizontal-scrollbars-with-kde-oxygen-style.diff
# add pyuno to python path
Patch26: pyuno-path.diff
+# fix build with glib-2.31; glib/gthread.h can't be included directly
+Patch27: buildfix-ucb-glib-2.31.diff
#
# PostgreSQL SDBC driver
Patch801: 801-sdbc-postgresql.diff
@@ -1330,6 +1338,8 @@
%{S:6} %{S:7} %{S:8} %{S:9} %{S:10} \
%{S:11} %{S:12} %{S:13} %{S:14} %{S:15} \
%{S:16} %{S:17} %{S:18} %{S:19}
+# 256x256 icons
+tar -xjf %{S:20}
# SUSE config files
cp $RPM_SOURCE_DIR/SUSE*.conf distro-configs
# READMEs
@@ -1363,6 +1373,7 @@
%patch24 -p1
%patch25
%patch26
+%patch27
# PostgreSQL SDBC driver
%patch801
%patch802
@@ -1607,6 +1618,17 @@
echo "%dir %_datadir/mimelnk" >>file-lists/common_list.txt
echo "%dir %_datadir/mimelnk/application" >>file-lists/common_list.txt
################
+# compat symlinks for the old main icon (bnc#724087)
+icon_found=
+for icon in `find $RPM_BUILD_ROOT/%_datadir/icons -name libreoffice-main.png`
; do
+ icon_found=1
+ icon_name=$(basename $icon)
+ icon_dir=$(dirname $icon | sed -e "s|^$RPM_BUILD_ROOT||")
+ ln -sf $icon_name $RPM_BUILD_ROOT/$icon_dir/ooo-gulls.png
+ echo "$icon_dir/ooo-gulls.png" >>file-lists/common_list.txt
+done
+test -z "$icon_found" && echo "ERROR: Can't find compat icon for
ooo-gulls.png" && exit 1;
+################
# common helpcontent files
# create symlinks to /usr/share for noarch help packages
mkdir -p $RPM_BUILD_ROOT/%lo_prefix/%lo_home/%lo_basis_dir/help
++++++ buildfix-ucb-glib-2.31.diff ++++++
--- ucb/source/ucp/gvfs/gvfs_content.hxx.old 2011-05-19 12:27:43.000000000
+0200
+++ ucb/source/ucp/gvfs/gvfs_content.hxx 2012-01-11 15:00:28.000000000
+0100
@@ -35,7 +35,7 @@
#include <com/sun/star/ucb/XContentCreator.hpp>
#include <ucbhelper/contenthelper.hxx>
-#include <glib/gthread.h>
+#include <glib.h>
#include <libgnomevfs/gnome-vfs-ops.h>
#include <libgnomevfs/gnome-vfs-directory.h>
++++++ libreoffice-help-en-US.spec.in ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:36.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:36.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-help-en-US
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,7 @@
# norootforbuild
+
Name: libreoffice-help-en-US
@DO_NOT_EDIT_COMMENT@
Version: 3.4.4.3
@@ -33,7 +34,7 @@
%define prepare_build 1
#!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
-BuildRequires: ant ant-apache-regexp bison boost-devel db-devel flac-devel
flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
+BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel
flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
%if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives
@@ -51,6 +52,8 @@
# compat stuff
Provides: OpenOffice_org-help-en-US = %version
Obsoletes: OpenOffice_org-help-en-US < %version
+Provides: OpenOffice_org-help-en-US-devel = %version
+Obsoletes: OpenOffice_org-help-en-US-devel < %version
Provides: libreoffice:%_prefix/ooo-2.0/help/en/default.css
# Arabic help was not realy localized
Provides: OpenOffice_org-help-ar = %version
@@ -95,6 +98,7 @@
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
+
%description
American help localization for LibreOffice. The other localized
stuff is in LibreOffice-l10n-en-US.
@@ -204,6 +208,7 @@
cd helpcontent2
build --all $PARALLEL_BUILD
+
%install
. ./*Env.Set.sh
test -z "%lo_langs" && langs="en-US" || langs="%lo_langs"
@@ -226,6 +231,7 @@
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -233,4 +239,5 @@
@SUBPACKAGES_FILELIST@
+
%changelog
++++++ libreoffice-help-groupX.spec.in ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:36.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:36.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libreoffice-help-group1
+# spec file for package libreoffice-help-group@GROUP_NUMBER@
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,7 @@
# norootforbuild
+
Name: libreoffice-help-group@GROUP_NUMBER@
@DO_NOT_EDIT_COMMENT@
Version: 3.4.4.3
@@ -49,7 +50,7 @@
%endif
#!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
-BuildRequires: ant ant-apache-regexp bison boost-devel db-devel flac-devel
flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
+BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel
flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel
libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel
perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip
xorg-x11-devel zip
%if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives
@@ -94,6 +95,7 @@
#!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch
+
%description
This package provides files related to the LibreOffice help
development.
@@ -204,6 +206,7 @@
cd helpcontent2
build --all $PARALLEL_BUILD
+
%install
. ./*Env.Set.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs
@@ -226,11 +229,12 @@
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done
+
%clean
rm -rf $RPM_BUILD_ROOT
-
@SUBPACKAGES_SCRIPTS@
@SUBPACKAGES_FILELIST@
+
%changelog
++++++ lo-help-gen-spec ++++++
--- /var/tmp/diff_new_pack.K6HL5N/_old 2012-01-20 20:24:36.000000000 +0100
+++ /var/tmp/diff_new_pack.K6HL5N/_new 2012-01-20 20:24:36.000000000 +0100
@@ -120,6 +120,7 @@
}
${$outp} .= "\n";
+ ${$outp} .= "\n";
${$outp} .= "%package -n libreoffice-help-$curLang\n";
${$outp} .= "License: LGPLv3\n";
${$outp} .= "Summary: $datap->{'lang'}{$curLang}{'long_name'} Help
Localization for LibreOffice\n";
@@ -140,11 +141,11 @@
${$outp} .= "\n";
+ ${$outp} .= "\n";
${$outp} .= "%description -n libreoffice-help-$curLang\n";
${$outp} .= "$datap->{'lang'}{$curLang}{'long_name'} help localization for
LibreOffice. The other localized stuff\n";
${$outp} .= "is in libreoffice-l10n-$curLang.\n";
${$outp} .= "\n";
- ${$outp} .= "\n";
}
sub write_help_scripts_section($$$)
@@ -154,12 +155,16 @@
return if (defined $datap->{'lang'}{$curLang}{'poor-help'});
${$outp} .= "# $curLang\n";
+ ${$outp} .= "\n";
+ ${$outp} .= "\n";
${$outp} .= "%posttrans -n libreoffice-help-$curLang\n";
${$outp} .= "%_datadir/%lo_home/link-to-ooo-home
%_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt ||
true\n";
${$outp} .= "\n";
+ ${$outp} .= "\n";
${$outp} .= "%preun -n libreoffice-help-$curLang\n";
${$outp} .= "test \"\$1\" = \"0\" && cp
%_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt
%_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt.postun ||
true\n";
${$outp} .= "\n";
+ ${$outp} .= "\n";
${$outp} .= "%postun -n libreoffice-help-$curLang\n";
${$outp} .= "test \"\$1\" = \"0\" && %_datadir/%lo_home/link-to-ooo-home
--unlink
%_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt.postun ||
true\n";
${$outp} .= "rm -f
%_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt.postun
2>/dev/null\n";
@@ -173,6 +178,7 @@
return if (defined $datap->{'lang'}{$curLang}{'poor-help'});
${$outp} .= "\n";
+ ${$outp} .= "\n";
${$outp} .= "%files -f
file-lists/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt -n
libreoffice-help-$curLang\n";
${$outp} .= "%defattr(-,root,root)\n";
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
