Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2014-02-12 07:34:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2013-11-15
13:27:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes
2014-02-12 09:45:56.000000000 +0100
@@ -1,0 +2,355 @@
+Thu Feb 6 14:23:31 UTC 2014 - fcro...@suse.com
+
+- Fix vlc macro in specfile.
+
+-------------------------------------------------------------------
+Mon Feb 3 14:52:10 UTC 2014 - fcro...@suse.com
+
+- Change how to enable/disable VLC support, allowing to override
+ this with OBS prjconf (needed for SLE).
+
+-------------------------------------------------------------------
+Sun Feb 2 14:42:45 UTC 2014 - tchva...@suse.com
+
+- Switch to ghost files to work without modifying filelist.
+
+-------------------------------------------------------------------
+Sat Feb 1 12:09:19 UTC 2014 - tchva...@suse.com
+
+- Try hard to support migration from older layout where the
+ help and autotext are dirs not symlinks.
+
+-------------------------------------------------------------------
+Sat Feb 1 12:05:00 UTC 2014 - tchva...@suse.com
+
+- Add condition around uno cache removal so it is properly wiped
+ when needed.
+
+-------------------------------------------------------------------
+Sat Feb 1 11:34:26 UTC 2014 - tchva...@suse.com
+
+- Require libreoffice-l10n-en always to be sure we have something
+ that can really launch.
+
+-------------------------------------------------------------------
+Sat Feb 1 11:21:05 UTC 2014 - tchva...@suse.com
+
+- Requires libreoffice on post for iconpacks so we generate the
+ symlinks.
+
+-------------------------------------------------------------------
+Fri Jan 31 13:26:17 UTC 2014 - tchva...@suse.com
+
+- Version bump to 4.2.0.4 which is the final
+ * Fixes 20 of last crit bugs.
+
+-------------------------------------------------------------------
+Thu Jan 31 11:38:20 UTC 2014 - tchva...@suse.com
+
+- Remove patch for split icon search that is no longer working
+ split-icons-search-usr-share.diff
+- Use symlinking posttrans hack for all noarch pkgs
+- Fix the symlinking script to work properly
+
+-------------------------------------------------------------------
+Thu Jan 30 12:42:48 UTC 2014 - tchva...@suse.com
+
+- Add safeguards around the posttrans/postun scripts.
+
+-------------------------------------------------------------------
+Wed Jan 29 12:04:16 UTC 2014 - tchva...@suse.com
+
+- Workaround issue in rpm parser. Thanks to mls.
+
+-------------------------------------------------------------------
+Tue Jan 28 20:33:34 UTC 2014 - tchva...@suse.com
+
+- Add requires(post) for the post scripts.
+- Disable the update compat for now as there is something broken
+ there.
+
+-------------------------------------------------------------------
+Mon Jan 27 20:35:11 UTC 2014 - tchva...@suse.com
+
+- Try to introduce back the posttrans symlink creation needed
+ for proper use of the "noarch" packages.
+
+-------------------------------------------------------------------
+Mon Jan 27 10:07:33 UTC 2014 - tchva...@suse.com
+
+- Support update from older releases. Rpm can't handle dir->link.
+
+-------------------------------------------------------------------
+Sun Jan 26 17:34:58 UTC 2014 - tchva...@suse.com
+
+- sdk-doc can't be noarch as it is instaled in _libdir.
+
+-------------------------------------------------------------------
+Sun Jan 26 16:41:10 UTC 2014 - tchva...@suse.com
+
+- Reorder deps to be alphabetic again.
+
+-------------------------------------------------------------------
+Sun Jan 26 16:35:24 UTC 2014 - tchva...@suse.com
+
+- Explicitely want fbclient pkgconfig to be around.
+
+-------------------------------------------------------------------
+Sun Jan 26 10:35:11 UTC 2014 - tchva...@suse.com
+
+- Avoid collision with tn and sr translations.
+
+-------------------------------------------------------------------
+Sun Jan 26 08:59:53 UTC 2014 - tchva...@suse.com
+
+- sdk-doc can be noarch.
+
+-------------------------------------------------------------------
+Sat Jan 25 20:14:26 UTC 2014 - tchva...@suse.com
+
+- Version bump to 4.2.0 RC3 fixing handful of additionally found
+ bugs.
+
+-------------------------------------------------------------------
+Sat Jan 25 14:33:26 UTC 2014 - tchva...@suse.com
+
+- Add sifr icon theme package.
+
+-------------------------------------------------------------------
+Wed Jan 22 15:47:21 UTC 2014 - tchva...@suse.com
+
+- Add missing %dir directives.
+
+-------------------------------------------------------------------
+Wed Jan 22 15:42:03 UTC 2014 - tchva...@suse.com
+
+- Add back rpmlintrc as it is still needed
+- Update comment about sfir icons
+
+-------------------------------------------------------------------
+Fri Jan 17 20:19:39 UTC 2014 - tchva...@suse.com
+
+- Raise doxygen dependency.
+
+-------------------------------------------------------------------
+Fri Jan 17 20:17:00 UTC 2014 - tchva...@suse.com
+
+- Updated patch install-with-hardlinks.diff to keep sane whitespace
+
+-------------------------------------------------------------------
+Fri Jan 17 20:13:38 UTC 2014 - tchva...@suse.com
+
+- Bridges now seem to get the cflags properly so patch is not
+ really needed. bridges-missing-cxxflags.diff
+
+-------------------------------------------------------------------
+Fri Jan 17 19:08:20 UTC 2014 - tchva...@suse.com
+
+- Version bump to 4.2.0.2:
+ * another RC candidate
+- Download the data from URLs instead of not providing the link.
+- Depend on libabw as it is another dep.
+
+-------------------------------------------------------------------
+Fri Jan 10 10:01:43 UTC 2014 - tchva...@suse.com
+
+- Go back to 20 on constraints as the 25g machines seems to be no
+ avail
+
+-------------------------------------------------------------------
+Thu Jan 9 14:15:08 UTC 2014 - tchva...@suse.com
+
+- Drop the vlc dep on 12.3 and older.
+
+-------------------------------------------------------------------
+Wed Jan 8 14:52:28 UTC 2014 - tchva...@suse.com
+
+- Drop the rpmlintrc should not be needed
+- Raise the constraints more to really ensure build
+
+-------------------------------------------------------------------
+Wed Jan 8 14:05:14 UTC 2014 - mvysko...@suse.com
+
+- Now builds with external dependencies
+ * flute
+ * libbase
+ * libfonts
+ * libformula
+ * liblayout
+ * libloader
+ * librepository
+ * libserializer
+ * pentaho-libxml
+ * pentaho-reporting-flow-engine
+ * sac
+- enabled report builder
+
+-------------------------------------------------------------------
+Wed Jan 8 12:49:33 UTC 2014 - tchva...@suse.com
+
+- Enable slowcheck again with the added fonts dependency.
+
+-------------------------------------------------------------------
+Tue Jan 7 15:24:15 UTC 2014 - tchva...@suse.com
+
+- Sort out some whitespace and ordering with spec-cleaner.
+
+-------------------------------------------------------------------
++++ 158 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes
++++ and /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes
Old:
----
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.zip
46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz
7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz
8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
AbsoluteLayout.tar.bz2
Draft.jpg
README-draw-extensions.txt
README-mono.txt
README-scsolver.txt
a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
bridges-missing-cxxflags.diff
build-help-common.diff
build_prepare.inc
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
fix-collision.patch
install-l10n-helper
libcdr-0.0.14.tar.bz2
libmspub-0.0.6.tar.bz2
libmwaw-0.1.10.tar.bz2
libreoffice-4.1.3.2.tar.xz
libreoffice-branding-upstream.changes
libreoffice-branding-upstream.spec
libreoffice-help-4.1.3.2.tar.xz
libreoffice-help-en-US.changes
libreoffice-help-en-US.spec
libreoffice-help-en-US.spec.in
libreoffice-help-group1.changes
libreoffice-help-group1.spec
libreoffice-help-group2.changes
libreoffice-help-group2.spec
libreoffice-help-group3.changes
libreoffice-help-group3.spec
libreoffice-help-group4.changes
libreoffice-help-group4.spec
libreoffice-help-group5.changes
libreoffice-help-group5.spec
libreoffice-help-groupX.spec.in
libreoffice-icon-themes.changes
libreoffice-icon-themes.spec
libreoffice-l10n-rpmlintrc
libreoffice-l10n.changes
libreoffice-l10n.spec
libreoffice-l10n.spec.in
libreoffice-translations-4.1.3.2.tar.xz
libvisio-0.0.30.tar.bz2
lo-help-en-US
lo-help-gen-spec
lo-help-groupX
lo-l10n-data
lo-l10n-gen-spec
lo-provides-11.1
lo-provides-12.1
lo-requires-11.1
lo-requires-12.1
mail-1.4-sources.jar
make-3.82-gbuild-20120301.tar.bz2
scripting-prefer-internal-rhino.diff
solenv-java-source-version.diff
solenv-touch-no-dereference.diff
split-help-buildhack-no-vcl.diff
split-icons-search-usr-share.diff
swing-layout-1.0.4-doc.zip
swing-layout-1.0.4-src.zip
system-poppler-0.12.3.diff
zip-3.0-add_options_to_help.patch
zip-3.0-iso8859_2.patch
zip-3.0-nonexec-stack.patch
zip-3.0-optflags.patch
zip-3.0-tempfile.patch
zip-3.0.tar.bz2
zip-notimestamp.patch
New:
----
libreoffice-4.2.0.4.tar.xz
libreoffice-help-4.2.0.4.tar.xz
libreoffice-translations-4.2.0.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
++++ 2893 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/libreoffice/libreoffice.spec
++++ and /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.spec
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.rbXCIU/_old 2014-02-12 09:46:04.000000000 +0100
+++ /var/tmp/diff_new_pack.rbXCIU/_new 2014-02-12 09:46:04.000000000 +0100
@@ -3,11 +3,8 @@
<physicalmemory>
<size unit="M">4000</size>
</physicalmemory>
- <memory>
- <size unit="M">6000</size>
- </memory>
<disk>
- <size unit="G">15</size>
+ <size unit="G">25</size>
</disk>
</hardware>
</constraints>
++++++ install-with-hardlinks.diff ++++++
--- /var/tmp/diff_new_pack.rbXCIU/_old 2014-02-12 09:46:04.000000000 +0100
+++ /var/tmp/diff_new_pack.rbXCIU/_new 2014-02-12 09:46:04.000000000 +0100
@@ -6,7 +6,7 @@
}
else {
- copy ("$sourcepath", "$destdir$destination") || die "Can't copy
file: $sourcepath -> $destdir$destination $!";
-+ link ("$sourcepath", "$destdir$destination") || die "Can't hardlink
file: $sourcepath -> $destdir$destination $!";
++ link ("$sourcepath", "$destdir$destination") || die "Can't
hardlink file: $sourcepath -> $destdir$destination $!";
my $sourcestat = stat($sourcepath);
utime ($sourcestat->atime, $sourcestat->mtime,
"$destdir$destination");
chmod (oct($unixrights), "$destdir$destination") || die "Can't
change permissions: $!";
++++++ libreoffice-4.1.3.2.tar.xz -> libreoffice-4.2.0.4.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-4.1.3.2.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-4.2.0.4.tar.xz differ:
char 26, line 1
++++++ libreoffice-help-4.1.3.2.tar.xz -> libreoffice-help-4.2.0.4.tar.xz ++++++
++++ 20472 lines of diff (skipped)
++++++ libreoffice-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.rbXCIU/_old 2014-02-12 09:46:06.000000000 +0100
+++ /var/tmp/diff_new_pack.rbXCIU/_new 2014-02-12 09:46:06.000000000 +0100
@@ -1,5 +1,2 @@
-# FIXME: temporary disabled some lint errors
-# We must fix them in the upcomming big package split and rework
-
-addFilter("files-duplicated-waste")
+# libreoffice devel package is de facto called libreoffice-sdk
addFilter("devel-file-in-non-devel-package")
++++++ libreoffice-translations-4.1.3.2.tar.xz ->
libreoffice-translations-4.2.0.4.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-4.1.3.2.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-4.2.0.4.tar.xz
differ: char 26, line 1
++++++ link-to-ooo-home ++++++
--- /var/tmp/diff_new_pack.rbXCIU/_old 2014-02-12 09:46:06.000000000 +0100
+++ /var/tmp/diff_new_pack.rbXCIU/_new 2014-02-12 09:46:06.000000000 +0100
@@ -1,59 +1,90 @@
-#! /bin/sh
+#!/usr/bin/env bash
-usage()
-{
- echo "This script (un)links or unlinks the given to/from OOo home"
+usage() {
+ echo "This script (un)links or unlinks the given to/from libreoffice home"
echo
echo "Usage: ${0##*/} [--unlink] filelist"
}
-datadir=/usr/share
-# FIXME: It is hard to predict if 32-bit or 64-bit OOo is installed on x86_64
-libdir_list="/usr/lib"
-if test "`uname -m`" = "x86_64" ; then
- libdir_list="$libdir_list /usr/lib64"
-fi
+change_linking() {
+ local libdir="$1"
+ local filelist="$2"
+ local linkfile=""
+ local linkdir=""
+
+ # Decide if we are linking or wiping first
+ if ${link_mode}; then
+ # Grab all files from the proper folder
+ for file in `cat ${filelist} | grep "/usr/share/libreoffice" | sort`;
do
+ # if we get ourselves folder then just create it
+ # it might not be around so lets be safe
+ if [[ -d "${file}" ]] ; then
+ dirname="${file/${datadir}/${libdir}}"
+ # if the location is already there skip it
+ if [[ ! -e "${dirname}" ]]; then
+ mkdir -p "${dirname}"
+ fi
+ continue
+ fi
+ linkfile="${file/${datadir}/${libdir}}"
+ # if the file is already there, skip it
+ # this is true when the parent folder is link
+ if [[ ! -e "${linkfile}" ]]; then
+ ln -sf "${file}" "${linkfile}" || exit 1
+ fi
+ done
+ else
+ # first just remove the symlinks
+ for file in `cat ${filelist} | grep "/usr/share/libreoffice" | sort`;
do
+ linkfile=${file/${datadir}/${libdir}}
+ if [[ -L "${linkfile}" && ! -r "${linkfile}" ]]; then
+ rm -f "${linkfile}" || exit 1
+ fi
+ done
+ # continue by wiping out all EMPTY dirs
+ # we have to be sure it is not owned by anything else
+ # doing in 2nd run to ensure avoiding collisions
+ for file in `cat ${filelist} | grep "/usr/share/libreoffice" | sort`;
do
+ linkdir="${file/${datadir}/${libdir}}"
+ if [[ -d "${linkdir}" && -z `ls "${linkdir}"/*` ]]; then
+ # check if nothing else owns the dir
+ if [[ $(rpm -qf "${file}" 2>/dev/null |wc -l) == 0 ]]; then
+ rmdir "${linkdir}" || exit 1
+ fi
+ fi
+ done
+ fi
+}
+# Global VARS
+link_mode=true
+datadir=/usr/share
+libdirs=(
+ "/usr/lib/"
+ "/usr/lib64/"
+ "/usr/lib32/"
+)
-if test "$1" = "--unlink" ; then
+if [[ "$1" == "--unlink" ]]; then
link_mode=false
shift
-else
- link_mode=true
fi
-test "$1" = "--help" && usage && exit 0
-test ! -f "$1" -o -n "$2" && usage && exit 1
-
-filelist="$1"
-
+if [[ "$1" == "--help" ]]; then
+ usage
+ exit 0
+fi
-for libdir in $libdir_list ; do
+# Verify we have just one left argument which is the filelist
+if [[ $# > 1 || ! -f "$1" ]]; then
+ usage
+ exit 1
+fi
- if $link_mode ; then
- for dir in `grep "%dir" $filelist | sed "s|%dir ||"` ; do
- linkdir=`echo $dir | sed "s|$datadir|$libdir|"`
- mkdir -p $linkdir
- done
+for libdir in ${libdirs[@]}; do
+ # for each dir verify there is libreoffice folder, otherwise skip
+ if [[ ! -d "${libdir}/libreoffice/" ]]; then
+ continue
fi
-
- for file in `grep -v "%dir" $filelist | sed "s|%config ||"` ; do
- linkedfile=`echo $file | sed "s|$datadir|$libdir|"`
- if $link_mode ; then
- ln -sf $file $linkedfile
- else
- # do not remove still valid symlinks
- # they might have another meaning; they might be another package...
- test -L $linkedfile -a ! -r $linkedfile && rm -f $linkedfile
- fi
- done
-
-# FIXME: do not remove empty directories
-# they might be in another package that is not longer noarch, ...
-# if ! $link_mode ; then
-# for dir in `grep "%dir" $filelist | sed "s|%dir ||" | sort -r` ; do
-# linkdir=`echo $dir | sed "s|$datadir|$libdir|"`
-# rmdir $linkdir 2>/dev/null || true
-# done
-# fi
+ change_linking ${libdir} $1
done
++++++ office-cfg-linux-common-template-dir.diff ++++++
--- /var/tmp/diff_new_pack.rbXCIU/_old 2014-02-12 09:46:06.000000000 +0100
+++ /var/tmp/diff_new_pack.rbXCIU/_new 2014-02-12 09:46:06.000000000 +0100
@@ -1,20 +1,20 @@
-diff -urN
libreoffice-4.1.0.0.beta1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu
libreoffice-4.1.0.0.beta1/officecfg/registry/data/org/openoffice/Office/Common.xcu
----
libreoffice-4.1.0.0.beta1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu
2013-05-27 14:04:18.862304208 +0200
-+++
libreoffice-4.1.0.0.beta1/officecfg/registry/data/org/openoffice/Office/Common.xcu
2013-05-27 14:50:20.500303879 +0200
-@@ -699,4 +699,6 @@
+diff -urN
libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu
libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Common.xcu
+---
libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu
2013-12-30 11:24:13.235021217 +0100
++++
libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Common.xcu
2014-01-01 14:21:15.331016368 +0100
+@@ -703,4 +703,6 @@
<value oor:external="com.sun.star.configuration.backend.GconfBackend
OpenGL_Faster"/>
</prop>
</node>
+ <!-- FIXME: This comment is needed to change a checksum or so.
+ Then the updated list of templates paths is read from
Common.xcs-->
</oor:component-data>
-diff -urN
libreoffice-4.1.0.0.beta1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs
libreoffice-4.1.0.0.beta1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
----
libreoffice-4.1.0.0.beta1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs
2013-05-27 14:04:18.859304208 +0200
-+++
libreoffice-4.1.0.0.beta1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
2013-05-27 14:50:20.501303879 +0200
-@@ -1855,6 +1855,14 @@
+diff -urN
libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs
libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+---
libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs
2013-12-30 11:24:13.232021217 +0100
++++
libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
2014-01-01 14:22:32.801009186 +0100
+@@ -1667,6 +1667,14 @@
<value>
- <it>$(insturl)/share/template/$(vlang)</it>
- <it>$(insturl)/share/template/common</it>
+ <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it>
+ <it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it>
+ <it>file:///usr/share/templates/libreoffice/common</it>
+ <it>file:///usr/share/templates/libreoffice/$(vlang)</it>
+ <it>file:///usr/share/templates/ooo/common</it>
++++++ officecfg-help-in-usr-share.diff ++++++
--- /var/tmp/diff_new_pack.rbXCIU/_old 2014-02-12 09:46:06.000000000 +0100
+++ /var/tmp/diff_new_pack.rbXCIU/_new 2014-02-12 09:46:06.000000000 +0100
@@ -1,6 +1,6 @@
-diff -urN
libreoffice-4.1.0.0.beta1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu
libreoffice-4.1.0.0.beta1/officecfg/registry/data/org/openoffice/Office/Paths.xcu
----
libreoffice-4.1.0.0.beta1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu
2013-05-27 14:04:18.862304208 +0200
-+++
libreoffice-4.1.0.0.beta1/officecfg/registry/data/org/openoffice/Office/Paths.xcu
2013-05-27 14:38:16.224303965 +0200
+diff -urN
libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu
libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+---
libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu
2013-12-30 11:24:13.235021217 +0100
++++
libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu
2014-01-01 14:16:37.708042106 +0100
@@ -98,7 +98,7 @@
</node>
<node oor:name="Help" oor:op="fuse" oor:mandatory="true">
@@ -10,9 +10,9 @@
</node>
</node>
<node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
-diff -urN
libreoffice-4.1.0.0.beta1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs
libreoffice-4.1.0.0.beta1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
----
libreoffice-4.1.0.0.beta1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs
2013-05-27 14:04:18.859304208 +0200
-+++
libreoffice-4.1.0.0.beta1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
2013-05-27 14:37:02.371303974 +0200
+diff -urN
libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs
libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+---
libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs
2013-12-30 11:24:13.232021217 +0100
++++
libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
2014-01-01 14:16:37.710042106 +0100
@@ -1613,7 +1613,7 @@
<info>
<desc>Specifies the path to the Office help files.</desc>
++++++ wizards-create-temlates-with-python-2.6.diff ++++++
--- /var/tmp/diff_new_pack.rbXCIU/_old 2014-02-12 09:46:06.000000000 +0100
+++ /var/tmp/diff_new_pack.rbXCIU/_new 2014-02-12 09:46:06.000000000 +0100
@@ -1,23 +1,6 @@
-From 8a6be8341d0a962d1ec384440ece523607c8b1d5 Mon Sep 17 00:00:00 2001
-From: Petr Mladek <pmla...@suse.cz>
-Date: Tue, 14 May 2013 11:25:49 +0200
-Subject: [PATCH] allow to create Letter and Fax templates with python 2.6
-
-The localized file type desciptions have non-ascii characters.
-The "str" type acceppts only "ascii" characters in python-2.6,
-
-The string has to be encoded according to the system locale,
-otherwise it is broken in non-UTF-* locales.
-
-Change-Id: I0a138f10ec7c2665c0700918f671fbd5eb674bf6
----
- wizards/com/sun/star/wizards/common/SystemDialog.py | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py
b/wizards/com/sun/star/wizards/common/SystemDialog.py
-index ab9b463..aa3426a 100644
---- a/wizards/com/sun/star/wizards/common/SystemDialog.py
-+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
+diff -urN
libreoffice-4.2.0.1.old/wizards/com/sun/star/wizards/common/SystemDialog.py
libreoffice-4.2.0.1/wizards/com/sun/star/wizards/common/SystemDialog.py
+---
libreoffice-4.2.0.1.old/wizards/com/sun/star/wizards/common/SystemDialog.py
2013-12-30 11:24:14.200021127 +0100
++++ libreoffice-4.2.0.1/wizards/com/sun/star/wizards/common/SystemDialog.py
2014-01-01 14:34:21.173943513 +0100
@@ -15,6 +15,7 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
@@ -26,7 +9,7 @@
import traceback
from .Desktop import Desktop
-@@ -139,6 +140,24 @@ class SystemDialog(object):
+@@ -140,6 +141,24 @@
traceback.print_exc()
'''
@@ -51,7 +34,7 @@
note the result should go through conversion of the product name.
@param filterName
@return the UI localized name of the given filter name.
-@@ -152,7 +171,7 @@ class SystemDialog(object):
+@@ -153,7 +172,7 @@
xPropertyValue = list(oObject)
for i in xPropertyValue:
if i is not None and i.Name == "UIName":
@@ -60,6 +43,3 @@
raise NullPointerException(
"UIName property not found for Filter " + filterName);
---
-1.8.1.3
-
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
