diff --git a/.gitignore b/.gitignore index 07c8f21..f606258 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 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 +/avr-libc-1.8.0.tar.bz2 diff --git a/avr-libc-1.7.1-PSTR.patch b/avr-libc-1.7.1-PSTR.patch deleted file mode 100644 index 30a2ae3..0000000 --- a/avr-libc-1.7.1-PSTR.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 806db37..c47377a 100644 --- a/avr-libc.spec +++ b/avr-libc.spec @@ -6,15 +6,14 @@ %global _binaries_in_noarch_packages_terminate_build 0 Name: avr-libc -Version: 1.7.1 -Release: 4%{?dist} +Version: 1.8.0 +Release: 1%{?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 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 texlive-texmf-latex texlive-latex @@ -44,7 +43,6 @@ access these). %prep %setup -q %patch0 -p0 -%patch1 -p0 for i in doc/api/faq.dox doc/api/overview.dox include/stdio.h include/stdlib.h; do @@ -107,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version}/%{name}-user-manual-%{version}* %changelog +* Thu Nov 15 2012 Michal Hlavinka - 1.8.0-1 +- updated to 1.8.0 + * Wed Jul 18 2012 Fedora Release Engineering - 1.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index c730916..8a720af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8608061dcff075d44d5c59cb7b6a6f39 avr-libc-1.7.1.tar.bz2 +54c71798f24c96bab206be098062344f avr-libc-1.8.0.tar.bz2