Hello community,
here is the log from the commit of package libreoffice-templates-de for
openSUSE:Factory checked in at 2014-04-18 15:52:44
Comparing /work/SRC/openSUSE:Factory/libreoffice-templates-de (Old)
and /work/SRC/openSUSE:Factory/.libreoffice-templates-de.new (New)
Package is libreoffice-templates-de
Changes:
---
/work/SRC/openSUSE:Factory/libreoffice-templates-de/libreoffice-templates-de.changes
2013-01-31 16:45:46.0 +0100
+++
/work/SRC/openSUSE:Factory/.libreoffice-templates-de.new/libreoffice-templates-de.changes
2014-04-18 15:52:45.0 +0200
@@ -1,0 +2,5 @@
+Fri Apr 18 12:55:31 UTC 2014 - tchva...@suse.com
+
+- Fix build in factory by converting all file names to ascii.
+
+---
Other differences:
--
++ libreoffice-templates-de.spec ++
--- /var/tmp/diff_new_pack.RsDLsG/_old 2014-04-18 15:52:46.0 +0200
+++ /var/tmp/diff_new_pack.RsDLsG/_new 2014-04-18 15:52:46.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-templates-de
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,45 +17,25 @@
Name: libreoffice-templates-de
-Provides: locale(OpenOffice_org:de)
-Provides: locale(libreoffice:de)
-# compat stuff
-Provides: OpenOffice_org-templates-de = %version
-Obsoletes: OpenOffice_org-templates-de = %version
-Provides: OpenOffice_org-de-templates = 8.2
-Obsoletes: OpenOffice_org-de-templates = 8.2
Version:3.3
Release:0
Summary:German Templates for LibreOffice
License:BSD-4-Clause and LGPL-2.1+
Group: Productivity/Office/Suite
+Url:
http://extensions.services.openoffice.org/project/TemplatePackII
Source0:ooo-templates-de-2.0.4.tar.bz2
Source1:ooo-templates-de-suse-2.0.4.tar.bz2
-# http://extensions.services.openoffice.org/project/TemplatePackII
Source2:Sun_ODF_Template_Pack_de-non-layout.tar.bz2
+Provides: locale(OpenOffice_org:de)
+Provides: locale(libreoffice:de)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
A compilation of German templates for LibreOffice.
-
-
-Authors:
-
-Berthold Gerdes berth...@bgerdes.de
-Johannes Czerwinski johan...@openoffice.org
-Olaf Eichborn oeichh...@openoffice.org
-Dennis Kielhorn dkielh...@openoffice.org
-Harald Schilly myste...@openoffice.org
-Karlhanns Spiegel k...@s.netic.de
-Sven Vermeulen si...@openoffice.org
-Helmut Weigel wei...@openoffice.org
-Frank Welker gandalfdergr...@openoffice.org
-K. J. Welter k...@teamstaroffice.org
-
%prep
-%setup -c -q -b1 -b2
+%setup -q -c -b1 -b2
# update the Sun templates dir
sun_name=Sun_ODF_Template_Pack
sun_dir=${sun_name}_de-non-layout
@@ -74,25 +54,24 @@
%build
%install
-install -m 755 -d $RPM_BUILD_ROOT/usr/share/templates/libreoffice/
-cp -a ooo-templates-de-*/de $RPM_BUILD_ROOT/usr/share/templates/libreoffice/
-cp -a Sun_ODF_Template_Pack_de-non-layout/template/*
$RPM_BUILD_ROOT/usr/share/templates/libreoffice/de
-# compat stuff
-install -m 755 -d $RPM_BUILD_ROOT/usr/share/templates/ooo/
-for dir in `find $RPM_BUILD_ROOT/usr/share/templates/libreoffice/ -type d
-printf %%P \n` ; do
-echo ~$RPM_BUILD_ROOT/usr/share/templates/ooo/$dir~
-mkdir -p $RPM_BUILD_ROOT/usr/share/templates/ooo/$dir
+install -m 755 -d %{buildroot}%{_datadir}/templates/libreoffice/
+cp -a ooo-templates-de-*/de %{buildroot}%{_datadir}/templates/libreoffice/
+cp -a Sun_ODF_Template_Pack_de-non-layout/template/*
%{buildroot}%{_datadir}/templates/libreoffice/de
+# Convert to ascii names
+find %{buildroot}%{_datadir}/templates/libreoffice/ -type f utf8list
+iconv -f UTF-8 -t ASCII//TRANSLIT utf8list asciilist
+for file in $(cat utf8list); do
+ newname=$(head -$i asciilist | tail -1 | tr -d '\n')
+ if [ -e $newname ] ; then
+ rm $file
+ else
+ mv $file $newname
+ fi
done
-for file in `find $RPM_BUILD_ROOT/usr/share/templates/libreoffice/ -type f
-printf %%P ` ; do
-ln -sf /usr/share/templates/libreoffice/$file
$RPM_BUILD_ROOT/usr/share/templates/ooo/$file
-done
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc ooo-templates-de-*/README*.txt Sun*/{README.*,LICENSE.*}
-/usr/share/templates/
+%{_datadir}/templates/
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org