diff --git a/buildfix-ucb-glib-2.31.diff b/buildfix-ucb-glib-2.31.diff
new file mode 100644
index 0000000..310c4c9
--- /dev/null
+++ b/buildfix-ucb-glib-2.31.diff
@@ -0,0 +1,11 @@
+--- 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>
+ 
diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec
index 7ed4fe7..09b2625 100644
--- a/libreoffice-branding-upstream.spec
+++ b/libreoffice-branding-upstream.spec
@@ -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
diff --git a/libreoffice-desktop-icons-256x256.tar.bz2 b/libreoffice-desktop-icons-256x256.tar.bz2
new file mode 100644
index 0000000..d72ce05
--- /dev/null
+++ b/libreoffice-desktop-icons-256x256.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e9c32ff72b71b953f971d3f1b518ab2560dfa57aa93388d420dae0c9b381ace
+size 283612
diff --git a/libreoffice-help-en-US.changes b/libreoffice-help-en-US.changes
index 55ebe74..e72dabf 100644
--- a/libreoffice-help-en-US.changes
+++ b/libreoffice-help-en-US.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jan 12 16:51:02 CET 2012 - dmueller@suse.de
+
+- obsolete OpenOffice_org-help-en-US-devel (bnc#741043)
+
+-------------------------------------------------------------------
+Wed Jan  4 14:44:31 UTC 2012 - pmladek@suse.com
+
+- added automake into BuildRequires to fix build in Factory
+
 -------------------------------------------------------------------
 Wed Nov 23 14:29:30 CET 2011 - pmladek@suse.cz
 
diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec
index 5270a89..ed1b1a2 100644
--- a/libreoffice-help-en-US.spec
+++ b/libreoffice-help-en-US.spec
@@ -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 @@ Release:        1
 %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 @@ Supplements:    libreoffice-l10n-en-US
 # 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
diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in
index 322a72f..bbea469 100644
--- a/libreoffice-help-en-US.spec.in
+++ b/libreoffice-help-en-US.spec.in
@@ -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 @@ Release:        1
 %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 @@ Supplements:    libreoffice-l10n-en-US
 # 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 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #!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 @@ export PATH="$PATH:/usr/sbin"
 cd helpcontent2
 build --all $PARALLEL_BUILD
 
+
 %install
 . ./*Env.Set.sh
 test -z "%lo_langs" && langs="en-US" || langs="%lo_langs"
@@ -226,6 +231,7 @@ for lang in $langs ; do
     echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
 done
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -233,4 +239,5 @@ rm -rf $RPM_BUILD_ROOT
 
 @SUBPACKAGES_FILELIST@
 
+
 %changelog
diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes
index 4ddbcfa..9585398 100644
--- a/libreoffice-help-group1.changes
+++ b/libreoffice-help-group1.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  4 14:44:31 UTC 2012 - pmladek@suse.com
+
+- added automake into BuildRequires to fix build in Factory
+
 -------------------------------------------------------------------
 Wed Nov 23 14:29:30 CET 2011 - pmladek@suse.cz
 
diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec
index 27e15e2..2a06e2e 100644
--- a/libreoffice-help-group1.spec
+++ b/libreoffice-help-group1.spec
@@ -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 @@ Release:        1
 %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 @@ Czech help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-cs.
 
 
-
 %endif
 %if %test_build_langs >= 2
 
@@ -153,7 +152,6 @@ Danish help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-da.
 
 
-
 %endif
 %if %test_build_langs >= 1
 
@@ -178,7 +176,6 @@ German help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-de.
 
 
-
 %endif
 %if %test_build_langs >= 2
 
@@ -202,7 +199,6 @@ Provides:       OpenOffice_org-en-GB:%_prefix/ooo-2.0/help/en-GB/default.css
 British help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-en-GB.
 
-
 %endif
 
 
diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes
index 878a5e7..2c65d02 100644
--- a/libreoffice-help-group2.changes
+++ b/libreoffice-help-group2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  4 14:44:31 UTC 2012 - pmladek@suse.com
+
+- added automake into BuildRequires to fix build in Factory
+
 -------------------------------------------------------------------
 Wed Nov 23 14:29:30 CET 2011 - pmladek@suse.cz
 
diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec
index 0cb443c..81bdd18 100644
--- a/libreoffice-help-group2.spec
+++ b/libreoffice-help-group2.spec
@@ -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 @@ Release:        1
 %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 @@ Provides:       OpenOffice_org-gl:%_prefix/ooo-2.0/help/gl/default.css
 Galician help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-gl.
 
-
 %endif
 
 
diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes
index bb340db..d822ef8 100644
--- a/libreoffice-help-group3.changes
+++ b/libreoffice-help-group3.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  4 14:44:31 UTC 2012 - pmladek@suse.com
+
+- added automake into BuildRequires to fix build in Factory
+
 -------------------------------------------------------------------
 Wed Nov 23 14:29:30 CET 2011 - pmladek@suse.cz
 
diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec
index 57e3c17..f4617a6 100644
--- a/libreoffice-help-group3.spec
+++ b/libreoffice-help-group3.spec
@@ -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 @@ Release:        1
 %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 @@ Hindi help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-hi-IN.
 
 
-
 %endif
 %if %test_build_langs >= 1
 
@@ -174,7 +173,6 @@ Hungarian help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-hu.
 
 
-
 %endif
 %if %test_build_langs >= 2
 
@@ -199,7 +197,6 @@ Italian help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-it.
 
 
-
 %endif
 %if %test_build_langs >= 1
 
@@ -224,7 +221,6 @@ Japanese help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-ja.
 
 
-
 %endif
 %if %test_build_langs >= 2
 
@@ -248,7 +244,6 @@ Provides:       OpenOffice_org-km:%_prefix/ooo-2.0/help/km/default.css
 Khmer help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-km.
 
-
 %endif
 
 
diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes
index 0b87982..540180e 100644
--- a/libreoffice-help-group4.changes
+++ b/libreoffice-help-group4.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  4 14:44:31 UTC 2012 - pmladek@suse.com
+
+- added automake into BuildRequires to fix build in Factory
+
 -------------------------------------------------------------------
 Wed Nov 23 14:29:30 CET 2011 - pmladek@suse.cz
 
diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec
index 9aaad8b..40c0b1a 100644
--- a/libreoffice-help-group4.spec
+++ b/libreoffice-help-group4.spec
@@ -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 @@ Release:        1
 %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 @@ Provides:       OpenOffice_org-pt:%_prefix/ooo-2.0/help/pt/default.css
 Portuguese help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-pt.
 
-
 %endif
 
 
diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes
index 878a5e7..2c65d02 100644
--- a/libreoffice-help-group5.changes
+++ b/libreoffice-help-group5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  4 14:44:31 UTC 2012 - pmladek@suse.com
+
+- added automake into BuildRequires to fix build in Factory
+
 -------------------------------------------------------------------
 Wed Nov 23 14:29:30 CET 2011 - pmladek@suse.cz
 
diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec
index a70ec3f..dd45bcf 100644
--- a/libreoffice-help-group5.spec
+++ b/libreoffice-help-group5.spec
@@ -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 @@ Release:        1
 %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 @@ Provides:       OpenOffice_org-zh-TW:%_prefix/ooo-2.0/help/zh-TW/default.css
 Chinese Traditional help localization for LibreOffice. The other localized stuff
 is in libreoffice-l10n-zh-TW.
 
-
 %endif
 
 
diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in
index 95c95f6..c2bf80d 100644
--- a/libreoffice-help-groupX.spec.in
+++ b/libreoffice-help-groupX.spec.in
@@ -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 @@ Release:        1
 %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 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #!ExclusiveArch:  %ix86 x86_64 ppc
 BuildArch:      noarch
 
+
 %description
 This package provides files related to the LibreOffice help
 development.
@@ -204,6 +206,7 @@ export PATH="$PATH:/usr/sbin"
 cd helpcontent2
 build --all $PARALLEL_BUILD
 
+
 %install
 . ./*Env.Set.sh
 test -z %lo_langs && langs="en-US" || langs=%lo_langs
@@ -226,11 +229,12 @@ for lang in $langs ; do
     echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
 done
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
-
 @SUBPACKAGES_SCRIPTS@
 
 @SUBPACKAGES_FILELIST@
 
+
 %changelog
diff --git a/libreoffice.changes b/libreoffice.changes
index 896453f..034ffe7 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Jan 11 14:05:57 UTC 2012 - pmladek@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 - pmladek@suse.com
+
+- add compat symlinks for the old main desktop icon (bnc#724087)
+
+-------------------------------------------------------------------
+Tue Jan  3 17:25:02 UTC 2012 - pmladek@suse.com
+
+- define %%python_sitelib on SLED11 and older systems to fix installation
+
+-------------------------------------------------------------------
+Tue Jan  3 16:54:07 UTC 2012 - pmladek@suse.com
+
+- correctly obsolete OpenOffice_org-artwork-devel (bnc#734781)
+
 -------------------------------------------------------------------
 Tue Dec 13 16:31:50 UTC 2011 - bwiedemann@suse.de
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 00d7d14..962f819 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -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 @@ BuildRequires:  gst-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commo
 %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 @@ Obsoletes:      OpenOffice_org-Quickstarter < 3.3.1
 # 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 @@ Source16:       libreoffice-testing-%version.tar.bz2
 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 @@ Patch24:        avoid-wrong-asserts.diff
 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 @@ bin/unpack-sources `pwd` \
      %{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 @@ cp $RPM_SOURCE_DIR/README* .
 %patch24 -p1
 %patch25
 %patch26
+%patch27
 # PostgreSQL SDBC driver
 %patch801
 %patch802
@@ -1607,6 +1618,17 @@ echo "%dir %_datadir/mime-info" >>file-lists/common_list.txt
 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
diff --git a/lo-help-gen-spec b/lo-help-gen-spec
index 645d434..a65684e 100644
--- a/lo-help-gen-spec
+++ b/lo-help-gen-spec
@@ -119,6 +119,7 @@ sub write_help_package_section($$$)
 	$oldPackage = "OpenOffice_org-$curLang";
     }
 
+    ${$outp} .= "\n";
     ${$outp} .= "\n";
     ${$outp} .= "%package -n libreoffice-help-$curLang\n";
     ${$outp} .= "License:        LGPLv3\n";
@@ -140,11 +141,11 @@ sub write_help_package_section($$$)
 
     ${$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 @@ sub write_help_scripts_section($$$)
     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";
@@ -172,6 +177,7 @@ sub write_help_files_section($$$$)
 
     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";