[avr-libc/f18] use upstream documentation, when generating own, doxygen leaks unwanted directories

[Michal Hlavinka]

commit ae75b56104e0061dd3f567b4ede3641c379f271c
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Nov 15 22:44:50 2012 +0100

    use upstream documentation, when generating own, doxygen leaks unwanted directories

 .gitignore    |    3 +++
 avr-libc.spec |   32 +++++++++++++++++++++++---------
 sources       |    3 +++
 3 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f606258..47c18ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ avr-libc-user-manual-1.7.0.tar.bz2
 /avr-libc-user-manual-1.7.1.tar.bz2
 /avr-libc-user-manual-1.7.1.pdf.bz2
 /avr-libc-1.8.0.tar.bz2
+/avr-libc-manpages-1.8.0.tar.bz2
+/avr-libc-user-manual-1.8.0.pdf.bz2
+/avr-libc-user-manual-1.8.0.tar.bz2
diff --git a/avr-libc.spec b/avr-libc.spec
index c47377a..41e63bc 100644
--- a/avr-libc.spec
+++ b/avr-libc.spec
@@ -13,10 +13,12 @@ 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-manpages-%{version}.tar.bz2
+Source2:        http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%{version}.tar.bz2
+Source3:        http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%{version}.pdf.bz2
 Patch0:         avr-libc-1.6.4-documentation.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
-BuildRequires:  avr-gcc doxygen transfig netpbm-progs texlive-texmf-latex texlive-latex
+BuildRequires:  avr-gcc 
 BuildArch:      noarch
 
 %description
@@ -41,9 +43,21 @@ access these).
 
 
 %prep
-%setup -q
+%setup -q -a 1
 %patch0 -p0
 
+# Add html docs
+mkdir html
+cd html/
+tar -jxvf %SOURCE2
+cd -
+# Add pdf manual
+mkdir pdf
+cd pdf/
+bzip2 -dc %SOURCE3 > 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
@@ -54,7 +68,7 @@ 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
 
@@ -63,12 +77,10 @@ make
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-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/*
+find man/ -type f -exec gzip {} \;
+mv man  $RPM_BUILD_ROOT%{_prefix}/avr/share
 
 # we only want to use %doc with an absolute path to avoid rpmbuild from erasing
 # %{_docdir}/%{name}-%{version}
@@ -102,7 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/%{name}-user-manual-%{version}*
+#%doc %{_docdir}/%{name}-%{version}/%{name}-user-manual-%{version}*
+%doc html/*
+%doc pdf/*
 
 %changelog
 * Thu Nov 15 2012 Michal Hlavinka <mhlavink at redhat.com> - 1.8.0-1
diff --git a/sources b/sources
index 8a720af..ec986a9 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
 54c71798f24c96bab206be098062344f  avr-libc-1.8.0.tar.bz2
+35af895d775015731b77d027a9e07cca  avr-libc-manpages-1.8.0.tar.bz2
+dbdc7b66262f930c82f8ebf94e15f225  avr-libc-user-manual-1.8.0.pdf.bz2
+d8a02a987cc0ea447348e0b6a08ab679  avr-libc-user-manual-1.8.0.tar.bz2