[kdepimlibs] 4.7.97 drop upstreamed patch for bug kde#289693

Radek Novacek rnovacek at fedoraproject.org
Wed Jan 4 11:10:49 UTC 2012


commit 90f364a5ee330de0d5675b4b06a10d252853cd87
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Wed Jan 4 12:10:43 2012 +0100

    4.7.97
    drop upstreamed patch for bug kde#289693

 .gitignore                           |    1 +
 kdepimlibs-4.7.95-kdebug289381.patch |   20 --------------------
 kdepimlibs.spec                      |   13 ++++++-------
 sources                              |    2 +-
 4 files changed, 8 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4531e3f..1b95dbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /kdepimlibs-4.7.4.tar.bz2
 /kdepimlibs-4.7.90.tar.bz2
 /kdepimlibs-4.7.95.tar.bz2
+/kdepimlibs-4.7.97.tar.bz2
diff --git a/kdepimlibs.spec b/kdepimlibs.spec
index 21e54b2..ad72992 100644
--- a/kdepimlibs.spec
+++ b/kdepimlibs.spec
@@ -6,8 +6,8 @@
 
 Name: kdepimlibs
 Summary: KDE PIM Libraries
-Version: 4.7.95
-Release: 2%{?dist}
+Version: 4.7.97
+Release: 1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -20,10 +20,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # https://bugs.kde.org/249992
 Patch52: kdepimlibs-4.7.3-dovecot_kde249992.patch
 
-## upstream patches
-# https://bugs.kde.org/289381
-Patch100: kdepimlibs-4.7.95-kdebug289381.patch
-
 %if ! 0%{?akonadi_subpkg}
 Obsoletes: %{name}-akonadi < %{version}-%{release}
 Provides:  %{name}-akonadi = %{version}-%{release}
@@ -91,7 +87,6 @@ format for easy browsing.
 %setup -q
 
 %patch52 -p1 -b .dovecot_kde249992
-%patch100 -p1 -b .kdebug289381
 
 
 %build
@@ -217,6 +212,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 04 2012 Radek Novacek <rnovacek at redhat.com> - 4.7.97-1
+- 4.7.97
+- drop upstreamed patch for bug kde#289693
+
 * Thu Dec 29 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.95-2
 - Kmail crash on exit (kde#289693)
 
diff --git a/sources b/sources
index 97a1603..78fb56b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e8be771181bc0a8087692827acea0e6  kdepimlibs-4.7.95.tar.bz2
+d2588b11ece586e7798ffff12492c229  kdepimlibs-4.7.97.tar.bz2


More information about the scm-commits mailing list