[packages/htmlcxx] Move iconv to %prep

glen glen at pld-linux.org
Wed Apr 7 13:27:50 CEST 2021


commit c2e64417e1bf4f1e3b03329b62a108cee76bb8db
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Apr 7 14:20:46 2021 +0300

    Move iconv to %prep
    
    This is to support re-entrant %build

 htmlcxx.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/htmlcxx.spec b/htmlcxx.spec
index 54d30d5..da21d46 100644
--- a/htmlcxx.spec
+++ b/htmlcxx.spec
@@ -56,6 +56,11 @@ Statyczna wersja biblioteki htmlcxx.
 %prep
 %setup -q
 
+# convert to utf8 due rpmlint warning W: file-not-utf8 %{_docdir}/htmlcxx/AUTHORS
+# convert to utf8 due rpmlint warning W: file-not-utf8 %{_docdir}/htmlcxx/README
+iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
+iconv -f iso8859-1 -t utf-8 README > README.conv && mv -f README.conv README
+
 %build
 autoupdate
 %{__libtoolize}
@@ -67,11 +72,6 @@ autoupdate
 	%{?with_static_libs:--enable-static} \
 	--enable-shared
 
-# convert to utf8 due rpmlint warning W: file-not-utf8 %{_docdir}/htmlcxx/AUTHORS
-# convert to utf8 due rpmlint warning W: file-not-utf8 %{_docdir}/htmlcxx/README
-iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
-iconv -f iso8859-1 -t utf-8 README > README.conv && mv -f README.conv README
-
 %{__make}
 
 %install
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/htmlcxx.git/commitdiff/be731d6b146a09bd77c662d679971403c7d6d7e0



More information about the pld-cvs-commit mailing list