[skstream] Build API docs again.
Ville Skyttä
scop at fedoraproject.org
Sat Dec 14 20:08:45 UTC 2013
commit 0fa7dbf457d0807e8058108b7466729a7952d1b9
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Sat Dec 14 22:08:48 2013 +0200
Build API docs again.
skstream.spec | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/skstream.spec b/skstream.spec
index d4510da..7ce8fe7 100644
--- a/skstream.spec
+++ b/skstream.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: skstream
Version: 0.3.9
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: C++ I/O library for WorldForge clients/servers
Group: Development/Libraries
@@ -10,7 +12,7 @@ Source0: http://downloads.sourceforge.net/worldforge/%{name}-%{version}.t
Patch1: skstream-0.3.6-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cppunit-devel
+BuildRequires: cppunit-devel doxygen
%description
skstream is an iotream C++ socket library and is recommended for use as a
@@ -36,9 +38,7 @@ Libraries and header files for developing applications that use skstream.
%build
%configure
make %{?_smp_mflags}
-
-# It looks like upstream forgot the doxygen input file?
-#make docs
+make docs
%install
@@ -47,12 +47,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}-0.3.la
-### cleaning up redundant docs
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-
# Fix one file that gets installed incorrectly
mv $RPM_BUILD_ROOT%{_libdir}/%{name}-0.3/include/%{name}/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}-0.3/%{name}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}
+
+install -dm 755 $RPM_BUILD_ROOT%{_pkgdocdir}
+cp -pR AUTHORS ChangeLog COPYING README README.FreeSockets TODO doc/* $RPM_BUILD_ROOT%{_pkgdocdir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -73,17 +72,28 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING README README.FreeSockets TODO ChangeLog
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/AUTHORS
+%{_pkgdocdir}/ChangeLog
+%{_pkgdocdir}/COPYING
+%{_pkgdocdir}/README
+%{_pkgdocdir}/README.FreeSockets
+%{_pkgdocdir}/TODO
%{_libdir}/lib%{name}-0.3.so.*
-
%files devel
%defattr(-,root,root,-)
+%{_pkgdocdir}/html
+%{_pkgdocdir}/latex
%{_includedir}/%{name}-0.3
%{_libdir}/lib%{name}-0.3.so
%{_libdir}/pkgconfig/*.pc
+
%changelog
+* Sat Dec 14 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.3.9-4
+- Build API docs again.
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list