[kdepim] fix version

[Jaroslav Reznik]

commit 81318c8e3aa512bbad6de15c6621bb335946a584
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Mar 12 16:28:20 2012 +0100

    fix version
    
    - remove g++47 patch as it's already applied upstream

 kdepim-4.7.97-fix-for-g++47.patch |   13 -------------
 kdepim-4.8.1-fix-version.patch    |   12 ++++++++++++
 kdepim.spec                       |   14 ++++++++------
 3 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/kdepim-4.8.1-fix-version.patch b/kdepim-4.8.1-fix-version.patch
new file mode 100644
index 0000000..1345e87
--- /dev/null
+++ b/kdepim-4.8.1-fix-version.patch
@@ -0,0 +1,12 @@
+diff -up kdepim-4.8.1/CMakeLists.txt.fix-version kdepim-4.8.1/CMakeLists.txt
+--- kdepim-4.8.1/CMakeLists.txt.fix-version	2012-01-18 19:46:55.000000000 +0100
++++ kdepim-4.8.1/CMakeLists.txt	2012-03-12 16:14:16.806502592 +0100
+@@ -124,7 +124,7 @@ if(DEFINED KDEPIM_DEV_VERSION)
+   set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
+ endif()
+ 
+-set(KDEPIM_VERSION "4.8.0")
++set(KDEPIM_VERSION "4.8.1")
+ 
+ configure_file(kdepim-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-version.h @ONLY)
+ 
diff --git a/kdepim.spec b/kdepim.spec
index ae9d444..b0a9a47 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -2,7 +2,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   7
 Version: 4.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -21,10 +21,9 @@ Patch0:  kdepim-4.5.85-install-headers.patch
 # fix KMail migration (kde#283563)
 Patch2: kdepim-4.7.2-kmail-migration.patch
 
-# fix build with g++4.7
-Patch3: kdepim-4.7.97-fix-for-g++47.patch
-
 # upstream patches
+# fix version s/4.8.0/4.8.1
+Patch100: kdepim-4.8.1-fix-version.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -97,9 +96,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %patch0 -p1 -b .install-headers
 %patch2 -p1 -b .kmail-migration
-# no longer applies, hopefully no longer needed -- rex
-#patch3 -p1 -b .fix-for-g++47
 
+%patch100 -p1 -b .fix-version
 
 %build
 mkdir -p %{_target_platform}
@@ -223,6 +221,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 12 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.1-3
+- fix version
+- remove g++47 patch as it's already applied upstream
+
 * Tue Mar 06 2012 Than Ngo <than at redhat.com> - 4.8.1-2
 - respin