[htmldoc] htmldoc-1.8.28

[Rex Dieter]

commit e1280ac280be1d31e98d93eeb0cdea95fc5273b5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed May 14 10:50:07 2014 -0500

    htmldoc-1.8.28

 .gitignore                             |    1 +
 htmldoc-1.8.27-dingbats-standard.patch |   13 ---
 htmldoc-1.8.27-fortify-fail.patch      |   21 -----
 htmldoc-1.8.27-libpng15.patch          |  148 --------------------------------
 htmldoc-1.8.27-scanf-overflows.patch   |   38 --------
 htmldoc-1.8.28-errno.patch             |   11 +++
 htmldoc.spec                           |   46 ++++------
 sources                                |    2 +-
 8 files changed, 30 insertions(+), 250 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0261857..7e7aca0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 htmldoc-1.8.27-source.tar.bz2
+/htmldoc-1.8.28-source.tar.bz2
diff --git a/htmldoc-1.8.28-errno.patch b/htmldoc-1.8.28-errno.patch
new file mode 100644
index 0000000..1ea7fdc
--- /dev/null
+++ b/htmldoc-1.8.28-errno.patch
@@ -0,0 +1,11 @@
+diff -up htmldoc-1.8.28/htmldoc/http-addrlist.c.errno htmldoc-1.8.28/htmldoc/http-addrlist.c
+--- htmldoc-1.8.28/htmldoc/http-addrlist.c.errno	2011-12-30 01:41:10.000000000 -0600
++++ htmldoc-1.8.28/htmldoc/http-addrlist.c	2014-05-14 10:42:11.327247422 -0500
+@@ -27,6 +27,7 @@
+ #ifdef HAVE_RESOLV_H
+ #  include <resolv.h>
+ #endif /* HAVE_RESOLV_H */
++#include <errno.h>
+ 
+ 
+ /*
diff --git a/htmldoc.spec b/htmldoc.spec
index 7130cbf..dff2991 100644
--- a/htmldoc.spec
+++ b/htmldoc.spec
@@ -1,6 +1,6 @@
 Name:		htmldoc
-Version:	1.8.27
-Release:	25%{?dist}
+Version:	1.8.28
+Release:	1%{?dist}
 Summary:	Converter from HTML into indexed HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
@@ -8,17 +8,16 @@ Group:		Applications/Publishing
 # GPLv2 with OpenSSL exception
 License:	GPLv2 with exceptions
 URL:		http://www.htmldoc.org/
-Source:		http://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2
-
-Patch0:		htmldoc-1.8.27-desktop-icon.patch
-Patch1:		htmldoc-1.8.27-dingbats-standard.patch
-Patch2:		htmldoc-1.8.27-system-fonts.patch
-Patch3:		htmldoc-1.8.27-scanf-overflows.patch
-Patch4:		htmldoc-1.8.27-fortify-fail.patch
-Patch5:		htmldoc-1.8.27-fixdso.patch
-# http://www.htmldoc.org/str.php?L243+P0+S-2+C0+I0+E0+M10+Q
-# http://www.htmldoc.org/strfiles/243/patch-ae
-Patch6: 	htmldoc-1.8.27-libpng15.patch
+Source0: 	http://www.msweet.org/files/project1/htmldoc-%{version}-source.tar.bz2
+
+# fix desktop icon (http://www.htmldoc.org/str.php?L169)
+Patch0: 	htmldoc-1.8.27-desktop-icon.patch
+# fix build, errno/EINVAL undefined
+Patch1: 	htmldoc-1.8.28-errno.patch
+# use Fedora system fonts (http://www.htmldoc.org/str.php?L196)
+Patch2: 	htmldoc-1.8.27-system-fonts.patch
+# # Fix DSO linking
+Patch5: 	htmldoc-1.8.27-fixdso.patch
 
 BuildRequires:	openssl-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:	fltk-devel libXpm-devel desktop-file-utils
@@ -49,16 +48,10 @@ you to change options and generate documents interactively.
 # fix up hardcoded documentation path
 sed -i 's/\(\$prefix\/share\/doc\/htmldoc\)/\1-%{version}/g' configure
 
-# Fix DSO linking
 %patch5 -p1 -b .fixdso
-
-# fix desktop icon (http://www.htmldoc.org/str.php?L169)
 %patch0 -p1 -b .desktop-icon
+%patch1 -p1 -b .errno
 
-# make Dingbats standard (http://www.htmldoc.org/str.php?L198)
-%patch1 -p1 -b .dingbats
-
-# use Fedora system fonts (http://www.htmldoc.org/str.php?L196)
 %patch2 -p1 -b .system-fonts
 cd fonts
 rm -f *.pfa *.afm
@@ -104,18 +97,10 @@ ln -s %{_fontbasedir}/dejavu/DejaVuSerif-Italic.ttf
 ln -s %{_fontbasedir}/dejavu/DejaVuSerif.ttf
 cd ..
 
-# fix some scanf overflows (http://www.htmldoc.org/str.php?L214)
-%patch3 -p1 -b .scanf-overflows
-
-# fix limitation of -D_FORTIFY_SOURCE=2
-%patch4 -p1 -b .fortify-fail
-
-# fix build with libpng-1.5+
-%patch6 -p0 -b .libpng15
-
 
 %build
 %configure
+
 make %{?_smp_mflags}
 
 
@@ -190,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 14 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.28-1
+- htmldoc-1.8.28
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.27-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 059e09e..b9e8b00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35589e7b8fe9c54e11be87cd5aec4dcc  htmldoc-1.8.27-source.tar.bz2
+8e4e3f49ee9b2c5af01eb81a518ce7e7  htmldoc-1.8.28-source.tar.bz2