From 855cfb9a42a949f7ceeba4cd569dcebfc0d2b903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 29 Dec 2016 22:44:59 +0100 Subject: [PATCH] Properly build the documentation --- uthash-2.0.1_fix-asciidoc.patch | 21 +++++++++++++++++++++ uthash.spec | 19 ++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 uthash-2.0.1_fix-asciidoc.patch diff --git a/uthash-2.0.1_fix-asciidoc.patch b/uthash-2.0.1_fix-asciidoc.patch new file mode 100644 index 0000000..f2d35f5 --- /dev/null +++ b/uthash-2.0.1_fix-asciidoc.patch @@ -0,0 +1,21 @@ +From 0190e9e7234b0049a8c61cea536ab6aaeda28194 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Thu, 29 Dec 2016 22:59:59 +0100 +Subject: [PATCH] Fix Author-string for older versions of asciidoc + +--- + doc/userguide.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/userguide.txt b/doc/userguide.txt +index 7a04d0c..9f96e5a 100644 +--- a/doc/userguide.txt ++++ b/doc/userguide.txt +@@ -1,6 +1,6 @@ + uthash User Guide + ================= +-Troy D. Hanson, Arthur O'Dwyer ++:Author: Troy_D._Hanson,_Arthur_O'Dwyer + v2.0.1, July 2016 + + To download uthash, follow this link back to the diff --git a/uthash.spec b/uthash.spec index de00113..b00c09e 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,4 +1,5 @@ %global sover 0 +%global git_url https://github.com/troydhanson/%{name} %global common_desc \ Any C structure can be stored in a hash table using uthash. Just \ @@ -8,13 +9,16 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash -Source0: https://github.com/troydhanson/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{git_url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: %{git_url}/pull/98.patch#/%{name}-2.0.1_fix-asciidoc.patch + +BuildRequires: asciidoc BuildRequires: perl %description @@ -51,7 +55,7 @@ Development-files for libut. %prep -%autosetup +%autosetup -p1 %build @@ -61,14 +65,16 @@ export CFLAGS="-fPIC ${CFLAGS}" %{__cc} -shared ${CFLAGS} ${LDFLAGS} \ -Wl,-soname,libut.so.%{sover} \ -o libut/libut.so.%{sover} libut/*.o +%make_build -C doc %install -%{__mkdir} -p %{buildroot}%{_includedir} \ +%{__mkdir} -p html %{buildroot}%{_includedir} \ %{buildroot}%{_libdir} %{__install} -pm 0644 src/*.h %{buildroot}%{_includedir} %{__install} -pm 0755 libut/libut.so.0 %{buildroot}%{_libdir} /bin/ln -s %{_libdir}/libut.so.0 %{buildroot}%{_libdir}/libut.so +%{__cp} -a doc/*.html doc/*.css doc/*.png html %check @@ -84,7 +90,7 @@ export CFLAGS="-fPIC ${CFLAGS}" %files devel %license LICENSE -%doc doc/*.txt +%doc html/ %exclude %{_includedir}/utvector.h %{_includedir}/ut*.h @@ -101,6 +107,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Thu Dec 29 2016 Björn Esser - 2.0.1-3 +- Properly build the documentation + * Sun Dec 18 2016 Björn Esser - 2.0.1-2 - Run testsuite with threads, too