[avr-gcc/f14/master: 7/7] Merge branch 'master' into f14
Thibault North
tnorth at fedoraproject.org
Mon May 2 02:32:39 UTC 2011
commit 2916f651a38cf3cca7c8503174b739c9ff51011a
Merge: 3ac4fa0 be68ec8
Author: Thibault North <tnorth at fedoraproject.org>
Date: Sun May 1 22:30:35 2011 -0400
Merge branch 'master' into f14
Conflicts:
.gitignore
avr-gcc.spec
sources
.gitignore | 2 ++
avr-gcc-4.5.3-mint8.patch | 37 +++++++++++++++++++++++++++++++++++++
avr-gcc.spec | 11 +++++++----
sources | 5 +++--
4 files changed, 49 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 16e0b43,28be88b..d1c1c97
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,8 +1,6 @@@
gcc-core-4.5.0.tar.bz2
gcc-g++-4.5.0.tar.bz2
-gcc-core-4.5.1.tar.bz2
-gcc-g++-4.5.1.tar.bz2
/gcc-core-4.5.1.tar.bz2
/gcc-g++-4.5.1.tar.bz2
+ /gcc-core-4.5.3.tar.bz2
+ /gcc-g++-4.5.3.tar.bz2
diff --cc avr-gcc.spec
index 2218eda,e596cb6..f333b58
--- a/avr-gcc.spec
+++ b/avr-gcc.spec
@@@ -124,9 -126,16 +126,10 @@@ rm -rf $RPM_BUILD_ROO
%changelog
- * Wed Sep 29 2010 jkeating - 4.5.1-2.1
- - Rebuilt for gcc bug 634757
+ * Sun May 1 2011 Thibault North <tnorth at fedoraproject.org> - 4.5.3-1
+ - Updated to 4.5.3
+ - Fix #626889
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Sep 29 2010 jkeating - 4.5.1-3
-- Rebuilt for gcc bug 634757
-
* Fri Sep 24 2010 Thibault North <tnorth at fedoraproject.org> - 4.5.1-2
- Fix bug #637019 (gcc bug #45263) with the patch of Alastair D'Silva
diff --cc sources
index b6fb809,a5e0ccf..b473984
--- a/sources
+++ b/sources
@@@ -1,2 -1,2 +1,3 @@@
- dc8959e31b01a65ce10d269614815054 gcc-core-4.5.1.tar.bz2
- b294953ff0bb2f20c7acb2bf005d832a gcc-g++-4.5.1.tar.bz2
+ 98be5094b5b5a7b9087494291bc7f522 gcc-core-4.5.3.tar.bz2
+ 2c78bf1d5f08a0b116f280de88d3ffe7 gcc-g++-4.5.3.tar.bz2
++
More information about the scm-commits
mailing list