[kdepim-runtime] 4.7.95 drop fix linking wrt convenience lib nepomukfeederpluginlib patch

Radek Novacek rnovacek at fedoraproject.org
Wed Dec 21 15:45:24 UTC 2011


commit 7f8b778e952673c65bcb0f32e705f1a61838d0e3
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Wed Dec 21 16:45:23 2011 +0100

    4.7.95
    drop fix linking wrt convenience lib nepomukfeederpluginlib patch

 .gitignore                                         |    1 +
 ...time-4.7.90-nepomukfeederpluginlib_static.patch |   12 ------------
 kdepim-runtime.spec                                |   11 ++++++-----
 sources                                            |    2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f656db..e8276ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /kdepim-runtime-4.7.3.tar.bz2
 /kdepim-runtime-4.7.80.tar.bz2
 /kdepim-runtime-4.7.90.tar.bz2
+/kdepim-runtime-4.7.95.tar.bz2
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index 8d6e2af..0b36ea4 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -4,8 +4,8 @@
 Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Epoch:   1
-Version: 4.7.90
-Release: 4%{?dist}
+Version: 4.7.95
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -21,8 +21,6 @@ Patch0: kdepim-runtime-4.4.93-show_akonadi_kcm.patch
 Patch50: kdepim-runtime-4.7.1-sqlite-support.patch
 
 ## upstream patches
-# fix linking wrt convenience lib nepomukfeederpluginlib
-Patch100: kdepim-runtime-4.7.90-nepomukfeederpluginlib_static.patch
 
 # nuke ill-advised -devel pkg
 Obsoletes: kdepim-runtime-devel < 1:4.7.90-3
@@ -62,7 +60,6 @@ Requires: akonadi%{?_isa} >= %{akonadi_version}
 
 %patch0 -p1 -b .show_akonadi_kcm
 %patch50 -p1 -b .sqlite-support
-%patch100 -p1 -b .nepomukfeederpluginlib_static
 
 
 %build
@@ -149,6 +146,10 @@ fi
 
 
 %changelog
+* Wed Dec 21 2011 Radek Novacek <rnovacek at redhat.com> - 1:4.7.95-1
+- 4.7.95
+- drop fix linking wrt convenience lib nepomukfeederpluginlib patch
+
 * Wed Dec 07 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.7.90-4
 - fix Obsoletes: kdepim-runtime-devel versioning (missing epoch)
 
diff --git a/sources b/sources
index ca5f85a..d5546a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e170860cfdbeb23abb58ff8bf64a4cb  kdepim-runtime-4.7.90.tar.bz2
+8c79fca23c7ed201039c4e27902dab90  kdepim-runtime-4.7.95.tar.bz2


More information about the scm-commits mailing list