diff --git a/recode-format-security.patch b/recode-format-security.patch new file mode 100644 index 0000000..756ba3f --- /dev/null +++ b/recode-format-security.patch @@ -0,0 +1,12 @@ +diff -up recode-3.6/src/names.c.printf recode-3.6/src/names.c +--- recode-3.6/src/names.c.printf 2000-12-06 20:41:29.000000000 +0100 ++++ recode-3.6/src/names.c 2013-12-18 12:48:42.578052395 +0100 +@@ -892,7 +892,7 @@ list_concise_charset (RECODE_OUTER outer + if (ucs2 >= 0) + printf (format, code); + else if (mnemonic || counter2 != 112) +- printf (blanks); ++ printf ("%s", blanks); + + if (mnemonic) + printf (counter2 == 112 ? " %s\n" : " %-3s", mnemonic); diff --git a/recode.spec b/recode.spec index 2fa4731..f295052 100644 --- a/recode.spec +++ b/recode.spec @@ -1,17 +1,17 @@ Summary: Conversion between character sets and surfaces Name: recode Version: 3.6 -Release: 37%{?dist} +Release: 38%{?dist} License: GPLv2+ Group: Applications/File +Url: http://recode.progiciels-bpi.ca/ Source: http://recode.progiciels-bpi.ca/archives/recode-%{version}.tar.gz Patch0: recode.patch Patch1: recode-3.6-getcwd.patch Patch2: recode-bool-bitfield.patch Patch3: recode-flex-m4.patch Patch4: recode-automake.patch -Url: http://recode.progiciels-bpi.ca/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch5: recode-format-security.patch Requires(post): /sbin/install-info Requires(post): /sbin/ldconfig @@ -24,7 +24,7 @@ BuildRequires: texinfo %description The `recode' converts files between character sets and usages. -It recognises or produces nearly 150 different character sets +It recognizes or produces nearly 150 different character sets and is able to transliterate files between almost any pair. When exact transliteration are not possible, it may get rid of the offending characters or fall back on approximations. Most RFC 1345 character sets @@ -33,11 +33,11 @@ are supported. %package devel Summary: Header files for development using recode Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The `recode' library converts files between character sets and usages. -The library recognises or produces nearly 150 different character sets +The library recognizes or produces nearly 150 different character sets and is able to transliterate files between almost any pair. When exact transliteration are not possible, it may get rid of the offending characters or fall back on approximations. Most RFC 1345 character sets @@ -50,6 +50,7 @@ are supported. %patch2 -p0 %patch3 -p1 %patch4 -p1 +%patch5 -p1 rm m4/libtool.m4 rm acinclude.m4 @@ -62,8 +63,6 @@ make %{?_smp_mflags} make check %install -rm -rf $RPM_BUILD_ROOT - %makeinstall %find_lang %{name} @@ -85,11 +84,7 @@ fi %postun -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang -%defattr(-,root,root) %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO %{_mandir}/*/* %{_infodir}/recode.info* @@ -97,11 +92,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so.0* %files devel -%defattr(-,root,root) %{_libdir}/*.so %{_includedir}/* %changelog +* Wed Dec 18 2013 Jiri Popelka - 3.6-38 +- Fix FTBFS if "-Werror=format-security" flag is used (#1037305). + * Sun Aug 04 2013 Fedora Release Engineering - 3.6-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild