From fad8761a2b4db60c40c5fcf4d3aa6cd2c97dee94ab4d03ff56becfdc1b174e19 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 26 Apr 2011 13:26:38 +0000 Subject: [PATCH] - make error description more clearn (bnc#686328) OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=5 --- rpmlint.changes | 5 +++++ rpmlint.spec | 2 ++ suse-speccheck-utf8.diff | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 suse-speccheck-utf8.diff diff --git a/rpmlint.changes b/rpmlint.changes index a6c3043..5bb4b2b 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 26 15:19:36 CEST 2011 - dmueller@suse.de + +- make error description more clearn (bnc#686328) + ------------------------------------------------------------------- Sat Apr 23 11:11:37 CEST 2011 - dmueller@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index b3acf3a..315f348 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -122,6 +122,7 @@ Patch85: suse-changelog.patch Patch86: suse-rclink-check.diff # already upstream Patch87: rpmlint-add-details.diff +Patch88: suse-speccheck-utf8.diff %py_requires %description @@ -199,6 +200,7 @@ Authors: %patch85 %patch86 %patch87 -p1 +%patch88 cp -p %{SOURCE1} . cp -p %{SOURCE2} . cp -p %{SOURCE3} . diff --git a/suse-speccheck-utf8.diff b/suse-speccheck-utf8.diff new file mode 100644 index 0000000..bf2e5cc --- /dev/null +++ b/suse-speccheck-utf8.diff @@ -0,0 +1,13 @@ +--- SpecCheck.py ++++ SpecCheck.py +@@ -597,8 +597,8 @@ + ("Name:" tag). Either rename your package or the specfile.''', + + 'non-utf8-spec-file', +-'''The character encoding of the spec file is not UTF-8. Convert it for +-example using iconv(1).''', ++'''The character encoding of the spec file (or the merged bits from the .changes file) ++is not UTF-8. Convert it for example using iconv(1).''', + + 'use-of-RPM_SOURCE_DIR', + '''You use $RPM_SOURCE_DIR or %{_sourcedir} in your spec file. If you have to