[avr-libc] Rebuild doxygen docs now that doxygen is > 1.7.5. Man pages are back.
Thibault North
tnorth at fedoraproject.org
Wed Jan 4 00:05:01 UTC 2012
commit 9b95e9f580c7ca7e5222321e9389c81bc440f4c6
Author: Thibault North <tnorth at fedoraproject.org>
Date: Tue Jan 3 19:04:18 2012 -0500
Rebuild doxygen docs now that doxygen is > 1.7.5.
Man pages are back.
avr-libc.spec | 52 ++++++++++++++++++----------------------------------
sources | 2 --
2 files changed, 18 insertions(+), 36 deletions(-)
---
diff --git a/avr-libc.spec b/avr-libc.spec
index d563d55..50e8e7b 100644
--- a/avr-libc.spec
+++ b/avr-libc.spec
@@ -7,14 +7,12 @@
Name: avr-libc
Version: 1.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: C library for use with GCC on Atmel AVR microcontrollers
Group: Development/Tools
License: BSD
URL: http://www.nongnu.org/avr-libc/
Source0: http://download.savannah.gnu.org/releases/avr-libc/avr-libc-%{version}.tar.bz2
-Source1: http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%{version}.tar.bz2
-Source2: http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%{version}.pdf.bz2
Patch0: avr-libc-1.6.4-documentation.patch
Patch1: avr-libc-1.7.1-PSTR.patch
@@ -32,44 +30,33 @@ like the GPL, yet impose as little restrictions for the use of the library in
closed-source commercial applications as possible.
-%package docs
+%package doc
Summary: AVR C library docs in html and pdf format
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
-%description docs
+%description doc
This package contains the AVR C library docs in html and pdf format, the main
package already contains the docs in man-page format (use "avr-man xxxx" to
access these).
%prep
-%setup -q -a1
+%setup -q
%patch0 -p0
%patch1 -p0
-# Add html docs
-mkdir html
-cd html/
-bzip2 -dc %SOURCE1 | tar -xvvf -
-cd -
-# Add pdf manual
-mkdir pdf
-cd pdf/
-bzip2 -dc %SOURCE2 > avr-libc-user-manual-%{version}.pdf
-cd -
-
for i in doc/api/faq.dox doc/api/overview.dox include/stdio.h include/stdlib.h;
do
iconv -f CP1252 -t UTF8 $i > tmp
mv tmp $i
done
-#sed -i 's|@DOC_INST_DIR@/man|%{_prefix}/avr/share/man|' scripts/avr-man.in
+sed -i 's|@DOC_INST_DIR@/man|%{_prefix}/avr/share/man|' scripts/avr-man.in
%build
# The ps doc ways in at 7Mb versus 2.5 for the pdf and has little added value
-./configure --prefix=%{_prefix} --host=avr --build=`./config.guess` # --enable-doc
+./configure --prefix=%{_prefix} --host=avr --build=`./config.guess` --enable-doc
# don't use %{?_smp_mflags}, it breaks the build
make
@@ -78,12 +65,12 @@ make
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/man
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/man
# put the man-pages in the FHS mandir and gzip them
-#mkdir -p $RPM_BUILD_ROOT%{_prefix}/avr/share
-#mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/man \
-# $RPM_BUILD_ROOT%{_prefix}/avr/share
-#gzip $RPM_BUILD_ROOT%{_prefix}/avr/share/man/man3/*
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/avr/share
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/man \
+ $RPM_BUILD_ROOT%{_prefix}/avr/share
+gzip $RPM_BUILD_ROOT%{_prefix}/avr/share/man/man3/*
# we only want to use %doc with an absolute path to avoid rpmbuild from erasing
# %{_docdir}/%{name}-%{version}
@@ -101,8 +88,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%dir %{_prefix}/avr
-#%dir %{_prefix}/avr/share
-#%doc %{_prefix}/avr/share/man
+%dir %{_prefix}/avr/share
+%doc %{_prefix}/avr/share/man
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/AUTHORS
%doc %{_docdir}/%{name}-%{version}/C*
@@ -115,17 +102,14 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/avr/lib
%{_bindir}/avr-man
-%files docs
+%files doc
%defattr(-,root,root,-)
-%doc html/
-%doc pdf/
-#%doc %{_docdir}/%{name}-%{version}/%{name}-user-manual-%{version}*
-#%doc %{name}-user-manual-%{version}*
-
-
-
+%doc %{_docdir}/%{name}-%{version}/%{name}-user-manual-%{version}*
%changelog
+* Tue Jan 3 2012 Thibault North <tnorth at fedoraproject.org> 1.7.1-3
+- Build docs with doxygen
+
* Wed Dec 7 2011 Thibault North <tnorth at fedoraproject.org> 1.7.1-2
- Add html and pdf docs
diff --git a/sources b/sources
index e806be2..c730916 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
8608061dcff075d44d5c59cb7b6a6f39 avr-libc-1.7.1.tar.bz2
-ba1aa55ddfb2c6591cc9ea8f750bd183 avr-libc-user-manual-1.7.1.pdf.bz2
-1d0490f6f83192b8ab4f88ac027978e2 avr-libc-user-manual-1.7.1.tar.bz2
More information about the scm-commits
mailing list