[packages/dillo] - updated to 3.0.3 - removed outdated ac,libpng patches - enabled ssl (alpha code, but it's common f

[qboosh]

commit 1960bb87eebdbcfc9529b8bf519838e923c5c805
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 8 16:07:57 2014 +0100

    - updated to 3.0.3
    - removed outdated ac,libpng patches
    - enabled ssl (alpha code, but it's common feature nowadays)

 dillo-ac.patch     | 15 ---------------
 dillo-libpng.patch | 11 -----------
 dillo.spec         | 47 ++++++++++++++++++++++++++++-------------------
 3 files changed, 28 insertions(+), 45 deletions(-)
---
diff --git a/dillo.spec b/dillo.spec
index 785ae77..993ee89 100644
--- a/dillo.spec
+++ b/dillo.spec
@@ -1,30 +1,28 @@
-# TODO gettext support
+# TODO: gettext support (there was a patch for some archaic version)
 Summary:	DILLO - The FLTK Web Browser
 Summary(pl.UTF-8):	DILLO - przeglądarka WWW
 Name:		dillo
-Version:	3.0.2
-Release:	3
-License:	GPL
+Version:	3.0.3
+Release:	1
+License:	GPL v3+
 Group:		X11/Applications/Networking
 Source0:	http://www.dillo.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	81b82112cefcc7d54fe2972a21f42930
+# Source0-md5:	726cd0b7a18c5e25f4d80ebeffe7607e
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 # needs a review, disabled for now
 Patch0:		%{name}-gzip_fallback.patch
-Patch1:		%{name}-ac.patch
-#Patch2:		%{name}-libpng.patch
 URL:		http://www.dillo.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	fltk-devel >= 1.3.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 1.0.9
+BuildRequires:	libstdc++-devel
+BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/dillo
-
 %description
 Dillo is a small FLTK based (GNOME is NOT required!) web browser.
 Dillo aims to be a multi-platform browser alternative that's small,
@@ -39,15 +37,16 @@ użyteczna, szybka i rozszerzalna.
 %prep
 %setup -q
 #%%patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--enable-cookies \
-	--enable-ipv6 
+	--enable-ipv6 \
+	--enable-ssl
 %{__make}
 
 %install
@@ -68,12 +67,22 @@ rm -rf $RPM_BUILD_ROOT
 #%%files -f %{name}.lang
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog dillorc NEWS README
-%attr(755,root,root) %{_bindir}/*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%doc AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/dillo
+%attr(755,root,root) %{_bindir}/dillo-install-hyphenation
+%attr(755,root,root) %{_bindir}/dpid
+%attr(755,root,root) %{_bindir}/dpidc
 %dir %{_libdir}/dillo
-%attr(755,root,root) %{_libdir}/dillo/*
-%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+%dir %{_libdir}/dillo/dpi
+%dir %{_libdir}/dillo/dpi/*
+%attr(755,root,root) %{_libdir}/dillo/dpi/*/*.dpi
+%dir %{_docdir}/dillo
+%{_docdir}/dillo/user_help.html
+%dir %{_sysconfdir}/dillo
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dillo/dillorc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dillo/domainrc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dillo/dpidrc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dillo/keysrc
+%{_desktopdir}/dillo.desktop
+%{_pixmapsdir}/dillo.png
 %{_mandir}/man1/dillo.1*
diff --git a/dillo-ac.patch b/dillo-ac.patch
deleted file mode 100644
index 1106377..0000000
--- a/dillo-ac.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -burNp dillo-2.0/configure.in dillo-2.0-dud/configure.in
---- dillo-2.0/configure.in	2008-10-10 22:37:17.000000000 +0200
-+++ dillo-2.0-dud/configure.in	2009-03-24 10:43:37.021819865 +0100
-@@ -489,6 +489,11 @@ AC_SUBST(LIBFLTK_CFLAGS)
- AC_SUBST(LIBFLTK_LIBS)
- AC_SUBST(LIBICONV_LIBS)
- AC_SUBST(datadir)
-+AC_SUBST(src)
-+AC_SUBST(doc)
-+AC_SUBST(bin)
-+AC_SUBST(util)
-+AC_SUBST(lib)
- 
- AC_OUTPUT(Makefile dlib/Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile dw/Makefile lout/Makefile src/Makefile src/IO/Makefile test/Makefile)
- 
diff --git a/dillo-libpng.patch b/dillo-libpng.patch
deleted file mode 100644
index bff9366..0000000
--- a/dillo-libpng.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dillo-0.8.6/src/png.c~	2005-10-27 18:20:14.000000000 +0200
-+++ dillo-0.8.6/src/png.c	2010-01-28 21:49:04.810003532 +0100
-@@ -355,7 +355,7 @@
-             return;            /* need MORE data */
-          }
-          /* check the image signature - DON'T update ipbufstart! */
--         if (!png_check_sig(png->ipbuf, DATASIZE)) {
-+         if (png_sig_cmp(png->ipbuf, 0, DATASIZE)) {
-             /* you lied to me about it being a PNG image */
-             png->state = IS_finished;
-             break;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dillo.git/commitdiff/1960bb87eebdbcfc9529b8bf519838e923c5c805