diff --git a/squid-fix-pod2man-check.patch b/squid-fix-pod2man-check.patch new file mode 100644 index 0000000..eb4664a --- /dev/null +++ b/squid-fix-pod2man-check.patch @@ -0,0 +1,11 @@ +diff -urN squid-3.2.11.old/helpers/basic_auth/DB/config.test squid-3.2.11/helpers/basic_auth/DB/config.test +--- squid-3.2.11.old/helpers/basic_auth/DB/config.test 2013-07-25 12:15:59.645954336 +0200 ++++ squid-3.2.11/helpers/basic_auth/DB/config.test 2013-07-25 12:16:26.881955259 +0200 +@@ -2,6 +2,6 @@ + + ## Test: do we have perl to build the helper scripts? + ## Test: do we have pod2man to build the manual? +-perl --version >/dev/null && echo | pod2man >/dev/null ++perl --version >/dev/null && echo =encoding US-ASCII | pod2man >/dev/null + + exit $? diff --git a/squid.changes b/squid.changes index bdc1f1a..158a794 100644 --- a/squid.changes +++ b/squid.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 25 10:19:05 UTC 2013 - tchvatal@suse.com + +- Add patch squid-fix-pod2man-check.patch solving building with + new perl. + ------------------------------------------------------------------- Tue Apr 30 11:42:06 UTC 2013 - bruno@ioda-net.ch diff --git a/squid.spec b/squid.spec index 9ede61a..8753877 100644 --- a/squid.spec +++ b/squid.spec @@ -58,6 +58,8 @@ Patch101: %{name}-nobuilddates.patch ## File is compiled without RPM_OPT_FLAGS # squid3 no-rpm-opt-flags :./cf_gen.cc Patch102: %{name}-compiled_without_RPM_OPT_FLAGS.patch +# Upstream notified of this problem by mageia guys +Patch103: %{name}-fix-pod2man-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq PreReq: %insserv_prereq @@ -148,6 +150,7 @@ perl -p -i -e 's|/usr/local/bin/perl|/usr/bin/perl|' `find -name "*.pl"` chmod a-x CREDITS %patch101 %patch102 +%patch103 -p1 %build export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"