From c9dd2b13d70af3e1f2abf7f7c7dade12b3c16647 Mon Sep 17 00:00:00 2001
From: Thibault North <tnorth@fedoraproject.org>
Date: Dec 10 2011 15:03:08 +0000
Subject: Re-add docs


---

diff --git a/.gitignore b/.gitignore
index b41eea1..07c8f21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ avr-libc-1.7.0.tar.bz2
 avr-libc-user-manual-1.7.0.tar.bz2
 /avr-libc-1.7.1.tar.bz2
 /avr-libc-user-manual-1.7.1.tar.bz2
+/avr-libc-user-manual-1.7.1.pdf.bz2
diff --git a/avr-libc.spec b/avr-libc.spec
index a4e6a61..d563d55 100644
--- a/avr-libc.spec
+++ b/avr-libc.spec
@@ -7,13 +7,14 @@
 
 Name:           avr-libc
 Version:        1.7.1
-Release:        1%{?dist}
+Release:        2%{?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
 
@@ -47,6 +48,16 @@ access these).
 %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
@@ -58,7 +69,7 @@ done
 
 %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
 
@@ -106,6 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files docs
 %defattr(-,root,root,-)
+%doc html/
+%doc pdf/
 #%doc %{_docdir}/%{name}-%{version}/%{name}-user-manual-%{version}*
 #%doc %{name}-user-manual-%{version}*
 
@@ -113,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 7 2011 Thibault North <tnorth@fedoraproject.org> 1.7.1-2
+- Add html and pdf docs
+
 * Sat Oct 15 2011 Thibault North <tnorth@fedoraproject.org> 1.7.1-1
 - New upstream release
 - Fix PSTR definition BZ#737449
diff --git a/sources b/sources
index 5e3ee7c..e806be2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 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