SHA256
1
0
forked from pool/htmldoc

- Update to new version 1.9.1:

* Fixed monospace font size issue
  * Added support for reproducible builds
  * Added limited support for the HTML 4.0 SPAN element
  * Added (extremely limited) UTF-8 support for input files
  * Fixed buffer underflow for (invalid) short HTML comments
  * Now indent PRE text, by popular request.
  * EPUB output now makes sure that <element property> is written
    as <element property="property">.
  * Now support both NAME and ID for table-of-contents targets.
  * Added support for repeating a single header row for tables that
    span multiple pages
  * Added support for embedding the current filename/URL in the
    header or footer
  * Added EPUB support
  * Added Markdown support
  * Fixed a regression in header/footer image scaling
  * Documentation updates
  * Compiler fixes
  * Fixed a bug when running HTMLDOC as a macOS application.
  * Updated the bundled libpng to v1.6.29.
  * And many more
- Drop upstreamed htmldoc-cups_rand.patch and no longer needed
  htmldoc-docpath.diff

OBS-URL: https://build.opensuse.org/package/show/Publishing/htmldoc?expand=0&rev=19
This commit is contained in:
Martin Pluskal 2017-12-04 08:43:37 +00:00 committed by Git OBS Bridge
parent 4b3c80a851
commit df9cf61fa0
6 changed files with 41 additions and 87 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a688bd820ad6f7bdebb274716102dafbf4d5fcfa20a5b8d87a56b030d184732
size 4026568

3
htmldoc-1.9.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:11ffc85d35d571690b8318d96c0996f4820d0bea9efcc9de038a30ee66e49314
size 4465739

View File

@ -1,20 +0,0 @@
bug#510: Fix undefined symbols CUPS_SRAND and CUPS_RAND
https://www.msweet.org/bugs.php?U510
Index: htmldoc-1.8.28/htmldoc/http.c
===================================================================
--- htmldoc-1.8.28.orig/htmldoc/http.c
+++ htmldoc-1.8.28/htmldoc/http.c
@@ -1229,10 +1229,10 @@ httpInitialize(void)
* it is the best we can do (on others, this seed isn't even used...)
*/
- CUPS_SRAND(time(NULL));
+ srand(time(NULL));
for (i = 0; i < sizeof(data); i ++)
- data[i] = CUPS_RAND();
+ data[i] = rand();
RAND_seed(data, sizeof(data));
#endif /* HAVE_GNUTLS */

View File

@ -1,36 +0,0 @@
Author: Günther Deschner <guenther at deschner dot de>
Subject: Fix doc path
Index: config.h.in
===================================================================
--- config.h.in.orig
+++ config.h.in
@@ -42,7 +42,7 @@
* Locations of files...
*/
-#define DOCUMENTATION "/usr/share/doc/htmldoc"
+#define DOCUMENTATION "/usr/share/doc/packages/htmldoc/doc"
#define HTML_DATA "/usr/share/htmldoc"
Index: doc/Makefile
===================================================================
--- doc/Makefile.orig
+++ doc/Makefile
@@ -44,11 +44,11 @@ all: $(DOCUMENTS)
#
install: $(DOCUMENTS)
- if test ! -d $(datadir)/doc/htmldoc; then\
- $(MKDIR) $(datadir)/doc/htmldoc;\
+ if test ! -d $(datadir)/doc/packages/htmldoc; then\
+ $(MKDIR) $(datadir)/doc/packages/htmldoc;\
fi
- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc
- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/*
+ $(CP) $(DOCFILES) $(datadir)/doc/packages/htmldoc
+ $(CHMOD) ugo+r $(datadir)/doc/packages/htmldoc/*
if test ! -d $(mandir)/man1; then\
$(MKDIR) $(mandir)/man1;\
fi

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Mon Dec 4 08:06:31 UTC 2017 - mpluskal@suse.com
- Update to new version 1.9.1:
* Fixed monospace font size issue
* Added support for reproducible builds
* Added limited support for the HTML 4.0 SPAN element
* Added (extremely limited) UTF-8 support for input files
* Fixed buffer underflow for (invalid) short HTML comments
* Now indent PRE text, by popular request.
* EPUB output now makes sure that <element property> is written
as <element property="property">.
* Now support both NAME and ID for table-of-contents targets.
* Added support for repeating a single header row for tables that
span multiple pages
* Added support for embedding the current filename/URL in the
header or footer
* Added EPUB support
* Added Markdown support
* Fixed a regression in header/footer image scaling
* Documentation updates
* Compiler fixes
* Fixed a bug when running HTMLDOC as a macOS application.
* Updated the bundled libpng to v1.6.29.
* And many more
- Drop upstreamed htmldoc-cups_rand.patch and no longer needed
htmldoc-docpath.diff
-------------------------------------------------------------------
Sat Mar 11 01:18:13 UTC 2017 - sfalken@opensuse.org

View File

@ -17,59 +17,41 @@
Name: htmldoc
Version: 1.8.28
Version: 1.9.1
Release: 0
Summary: HTML Processor that Generates HTML, PostScript, and PDF Files
License: LGPL-2.1+
Group: Productivity/Publishing/HTML/Tools
Url: http://htmldoc.org/
Source: http://www.msweet.org/files/project1/%{name}-%{version}-source.tar.bz2
Patch0: %{name}-docpath.diff
# PATCH-FIX-UPSTREAM htmldoc-cups_rand.patch upstream bug #510
Patch1: htmldoc-cups_rand.patch
BuildRequires: autoconf
Url: https://michaelrsweet.github.io/htmldoc/index.html
Source: https://github.com/michaelrsweet/htmldoc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: fltk-devel
BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: libXpm-devel
BuildRequires: libdrm-devel
BuildRequires: libgcrypt-devel
BuildRequires: libgnutls-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: openssl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: zlib-devel
%description
HTMLDOC converts HTML source files into indexed HTML, PostScript, or
Portable Document Format (PDF) files that can be viewed online or
printed.
Portable Document Format (PDF) files that can be viewed online or printed.
%prep
%setup -q
%patch0
%patch1 -p1
%build
autoconf
export CFLAGS="%{optflags} -fno-strict-aliasing"
%configure \
--with-gui
make %{?_smp_mflags} V=1
%install
make \
%{?_smp_mflags} \
bindir=%{buildroot}/%{_bindir} \
prefix=%{buildroot}/%{_usr} \
mandir=%{buildroot}/%{_mandir} \
datadir=%{buildroot}/%{_datadir} \
install
%make_install
%files
%defattr(-,root,root)
%doc cgi-bin/ CHANGES.txt COPYING.txt README.txt
%doc CHANGES.md COPYING README.md
%{_bindir}/htmldoc
%{_datadir}/htmldoc
%{_mandir}/man1/htmldoc.1%{ext_man}
%{_docdir}/%{name}
%changelog