rpms/libnl/devel libnl-1.1-doc-inlinesrc.patch, NONE, 1.1 libnl.spec, 1.26, 1.27
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Fri Jun 27 15:59:42 UTC 2008
Author: dcbw
Update of /cvs/extras/rpms/libnl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv490
Modified Files:
libnl.spec
Added Files:
libnl-1.1-doc-inlinesrc.patch
Log Message:
* Fri Jun 27 2008 Dan Williams <dcbw at redhat.com> - 1.1-5
- Build documentation in -devel package (rh #452646)
libnl-1.1-doc-inlinesrc.patch:
--- NEW FILE libnl-1.1-doc-inlinesrc.patch ---
diff -up libnl-1.1/doc/Doxyfile.in.srclink libnl-1.1/doc/Doxyfile.in
--- libnl-1.1/doc/Doxyfile.in.srclink 2008-06-24 16:37:11.000000000 +0900
+++ libnl-1.1/doc/Doxyfile.in 2008-06-24 16:37:39.000000000 +0900
@@ -580,7 +580,7 @@ SOURCE_BROWSER = YES
# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
-INLINE_SOURCES = NO
+INLINE_SOURCES = YES
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
# doxygen to hide any special comment blocks from generated source code
Index: libnl.spec
===================================================================
RCS file: /cvs/extras/rpms/libnl/devel/libnl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libnl.spec 29 May 2008 15:54:54 -0000 1.26
+++ libnl.spec 27 Jun 2008 15:58:58 -0000 1.27
@@ -3,7 +3,7 @@
License: LGPLv2
Name: libnl
Version: 1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://people.suug.ch/~tgr/libnl/
Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -13,6 +13,7 @@
Patch3: libnl-1.0-pre8-use-vasprintf-retval.patch
Patch4: libnl-1.0-pre8-more-build-output.patch
Patch5: libnl-1.1-include-limits-h.patch
+Patch6: libnl-1.1-doc-inlinesrc.patch
%description
This package contains a convenience library to simplify
@@ -36,10 +37,15 @@
%patch3 -p1 -b .use-vasprintf-retval
%patch4 -p1 -b .more-build-output
%patch5 -p1 -b .limits
+%patch6 -p1 -b .doc-inlinesrc
+
+# a quick hack to make doxygen stripping builddir from html outputs.
+sed -i.org -e "s,^STRIP_FROM_PATH.*,STRIP_FROM_PATH = `pwd`," doc/Doxyfile.in
%build
%configure
make
+make gendoc
%install
%{__rm} -rf $RPM_BUILD_ROOT
@@ -59,12 +65,15 @@
%files devel
%defattr(-,root,root,0755)
%{_includedir}/netlink/
-%doc doc/*
+%doc doc/html
%{_libdir}/%{name}.so
%{_libdir}/%{name}.a
%{_libdir}/pkgconfig/%{name}-1.pc
%changelog
+* Fri Jun 27 2008 Dan Williams <dcbw at redhat.com> - 1.1-5
+- Build documentation in -devel package (rh #452646)
+
* Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-4
- fix license tag
More information about the fedora-extras-commits
mailing list