[avr-libc] New upstream release and fixes

Sat Oct 15 20:04:25 UTC 2011

commit e6ab9c76bf9954f09a802eab9ae0f2d250490761
Author: Thibault North <tnorth at fedoraproject.org>
Date:   Sat Oct 15 16:03:40 2011 -0400

    New upstream release and fixes

 .gitignore                |    2 ++
 avr-libc-1.7.1-PSTR.patch |   31 +++++++++++++++++++++++++++++++
 avr-libc.spec             |   38 ++++++++++++++++++++++++--------------
 sources                   |    4 ++--
 4 files changed, 59 insertions(+), 16 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b10ce22..b41eea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,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
diff --git a/avr-libc-1.7.1-PSTR.patch b/avr-libc-1.7.1-PSTR.patch
new file mode 100644
index 0000000..30a2ae3
--- /dev/null
+++ b/avr-libc-1.7.1-PSTR.patch
@@ -0,0 +1,31 @@
+--- include/avr/pgmspace.h	2011/05/09 16:44:33	2238
++++ include/avr/pgmspace.h	2011/05/09 17:11:12	2239
+@@ -252,7 +252,7 @@
+ # define PSTR(s) ((const PROGMEM char *)(s))
+ #else  /* !DOXYGEN */
+ /* The real thing. */
+-# define PSTR(s) (__extension__({static char __c[] PROGMEM = (s); &__c[0];}))
++# define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
+ #endif /* DOXYGEN */
+ 
+ #define __LPM_classic__(addr)   \
+
+--- libc/stdlib/dtostre.c	2011/05/09 22:18:18	2240
++++ libc/stdlib/dtostre.c	2011/05/11 12:59:48	2241
+@@ -37,12 +37,12 @@
+ char *
+ dtostre (double val, char *sbeg, unsigned char prec, unsigned char flags)
+ {
+-    __attribute__((progmem)) static char str_nan[2][4] =
++    __attribute__((progmem)) static const char str_nan[2][4] =
+ 	{"nan", "NAN"};
+-    __attribute__((progmem)) static char str_inf[2][sizeof(str_nan[0])] =
++    __attribute__((progmem)) static const char str_inf[2][sizeof(str_nan[0])] =
+ 	{"inf", "INF"};
+     char *d;		/* dst	*/
+-    char *s;		/* src	*/
++    const char *s;		/* src	*/
+     signed char exp;
+     unsigned char vtype;
+ 
+
diff --git a/avr-libc.spec b/avr-libc.spec
index 3afb869..a4e6a61 100644
--- a/avr-libc.spec
+++ b/avr-libc.spec
@@ -6,8 +6,8 @@
 %global _binaries_in_noarch_packages_terminate_build 0
 
 Name:           avr-libc
-Version:        1.7.0
-Release:        2%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        C library for use with GCC on Atmel AVR microcontrollers
 Group:          Development/Tools
 License:        BSD
@@ -15,8 +15,10 @@ 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
 Patch0:         avr-libc-1.6.4-documentation.patch
+Patch1:         avr-libc-1.7.1-PSTR.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
-BuildRequires:  avr-gcc doxygen transfig netpbm-progs tetex-latex
+BuildRequires:  avr-gcc doxygen transfig netpbm-progs texlive-texmf-latex texlive-latex
 BuildArch:      noarch
 
 %description
@@ -43,18 +45,20 @@ access these).
 %prep
 %setup -q -a1
 %patch0 -p0
+%patch1 -p0
+
+
 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 --disable-ps-doc
+./configure --prefix=%{_prefix} --host=avr --build=`./config.guess` #  --enable-doc
 # don't use %{?_smp_mflags}, it breaks the build
 make
 
@@ -63,11 +67,12 @@ 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/*
+#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}
@@ -85,8 +90,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*
@@ -101,13 +106,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files docs
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/%{name}-user-manual-%{version}*
-%doc %{name}-user-manual-%{version}*
+#%doc %{_docdir}/%{name}-%{version}/%{name}-user-manual-%{version}*
+#%doc %{name}-user-manual-%{version}*
 
 
 
 
 %changelog
+* Sat Oct 15 2011 Thibault North <tnorth at fedoraproject.org> 1.7.1-1
+- New upstream release
+- Fix PSTR definition BZ#737449
+- Remove docs for now as they don't compile properly (sorry)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 564efa2..5e3ee7c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3eff7b779bd950400cb0a45f3c2fb377  avr-libc-1.7.0.tar.bz2
-9a7c1dc4b4f318edada0a42f46884b5e  avr-libc-user-manual-1.7.0.tar.bz2
+8608061dcff075d44d5c59cb7b6a6f39  avr-libc-1.7.1.tar.bz2
+1d0490f6f83192b8ab4f88ac027978e2  avr-libc-user-manual-1.7.1.tar.bz2
