[kdevplatform/f15/master] Update to 1.2.2. Removed FTBFS with g++ 4.6 patch.

Radek Novacek rnovacek at fedoraproject.org
Thu Apr 7 08:56:09 UTC 2011


commit 5b036d9e17dcdc51242a1de083204f1d9551a098
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Thu Apr 7 10:00:36 2011 +0200

    Update to 1.2.2. Removed FTBFS with g++ 4.6 patch.

 .gitignore        |    1 +
 kdevplatform.spec |   13 +++++++------
 sources           |    1 +
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57515c6..f4ea971 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kdevplatform-1.2.0.tar.bz2
+/kdevplatform-1.2.2.tar.bz2
diff --git a/kdevplatform.spec b/kdevplatform.spec
index bce7844..2aa6529 100644
--- a/kdevplatform.spec
+++ b/kdevplatform.spec
@@ -1,15 +1,13 @@
 
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
-Version:        1.2.0
-Release:        3%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/kdevelop/4.2.0/src/kdevplatform-%{version}.tar.bz2
-# fix FTBFS with g++ 4.6
-Patch0:         kdevplatform-1.2.0-gcc46.patch
+Source0:        ftp://ftp.kde.org/pub/kde/stable/kdevelop/4.2.2/src/kdevplatform-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -50,7 +48,6 @@ Requires: subversion-devel
 
 %prep
 %setup -q -n kdevplatform-%{version}
-%patch0 -p1 -b .gcc46
 
 
 %build
@@ -112,6 +109,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Thu Apr 07 2011 Radek Novacek <rnovacek at redhat.com> - 1.2.2-1
+- Update to 1.2.2
+- Remove FTBFS with g++ 4.6 patch
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 8410ee1..ea9b868 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 bcfaa34dccd210faa59ca89ffacee067  kdevplatform-1.2.0.tar.bz2
+fa75b91097d9e0f86e0797b00ef702e9  kdevplatform-1.2.2.tar.bz2


More information about the scm-commits mailing list