diff --git a/0001-convert-to-UTF-8.patch b/0001-convert-to-UTF-8.patch new file mode 100644 index 0000000..e478a6b --- /dev/null +++ b/0001-convert-to-UTF-8.patch @@ -0,0 +1,43 @@ +From a691504d5fb8fada5343252d3ce5bd147c677e50 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Sat, 13 Feb 2016 12:52:56 +0100 +Subject: [PATCH] convert to UTF-8 + +--- + NEWS | 2 +- + THANKS | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/NEWS b/NEWS +index b3c4c19..65dd5d8 100644 +--- a/NEWS ++++ b/NEWS +@@ -164,7 +164,7 @@ + Win32DynamicLibraryManager.cpp. + + - MinGW, cygwin: enable build of shared library when using libtool. +- patch #1194394 contributed by St�phane Fillod. ++ patch #1194394 contributed by Stéphane Fillod. + + - autotool: applied patch #1076398 contributed by Henner Sudek. Quote: + "This patch allows AM_PATH_CPPUNIT to accept version +diff --git a/THANKS b/THANKS +index 89cfa9c..331f916 100644 +--- a/THANKS ++++ b/THANKS +@@ -14,10 +14,10 @@ Lavoie Philippe + Pavel Zabelin + Marco Welti + Thomas Neidhart +-Hans B�hler (Dynamic Window library used by MFC UI) ++Hans Bühler (Dynamic Window library used by MFC UI) + John Sisson + Steven Mitter + Stephan Stapel + Abdessattar Sassi (hp-ux plug-in support) + Max Quatember and Andreas Pfaffenbichler (VC++ 7 MFC TestRunner go to source line) +-Vincent Rivi�re ++Vincent Rivière +-- +2.5.0 + diff --git a/cppunit.spec b/cppunit.spec index f2938eb..3515621 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -10,6 +10,7 @@ License: LGPLv2+ Url: https://www.freedesktop.org/wiki/Software/cppunit/ Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.gz Patch0: 0001-Update-FSF-address-in-LGPL-license.patch +Patch1: 0001-convert-to-UTF-8.patch BuildRequires: doxygen BuildRequires: graphviz @@ -36,11 +37,6 @@ the popular doxygen documentation generation tool. %prep %autosetup -p1 -for file in THANKS NEWS; do - iconv -f latin1 -t utf8 < $file > ${file}.utf8 - touch -c -r $file ${file}.utf8 - mv ${file}.utf8 $file -done %build %configure --enable-doxygen --disable-static --disable-silent-rules