[kdepimlibs] 4.8.1 remove dovecot patch, upstream

Jaroslav Reznik jreznik at fedoraproject.org
Mon Mar 5 09:17:35 UTC 2012


commit 412b6fb65c9d7ff3def53ac5b1d5f7ef8a117530
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Mar 5 10:16:27 2012 +0100

    4.8.1
    remove dovecot patch, upstream

 kdepimlibs-4.7.3-dovecot_kde249992.patch |   26 --------------------------
 kdepimlibs.spec                          |   18 ++++++++----------
 sources                                  |    2 +-
 3 files changed, 9 insertions(+), 37 deletions(-)
---
diff --git a/kdepimlibs.spec b/kdepimlibs.spec
index 1f0ca62..7300de4 100644
--- a/kdepimlibs.spec
+++ b/kdepimlibs.spec
@@ -6,8 +6,8 @@
 
 Name: kdepimlibs
 Summary: KDE PIM Libraries
-Version: 4.8.0
-Release: 2%{?dist}
+Version: 4.8.1
+Release: 1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -19,13 +19,9 @@ URL: http://www.kde.org/
 %else
 %global stable stable
 %endif
-Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kdepimlibs-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kdepimlibs-%{version}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-# https://bugs.kde.org/249992
-Patch52: kdepimlibs-4.7.3-dovecot_kde249992.patch
-
 %if ! 0%{?akonadi_subpkg}
 Obsoletes: %{name}-akonadi < %{version}-%{release}
 Provides:  %{name}-akonadi = %{version}-%{release}
@@ -92,8 +88,6 @@ format for easy browsing.
 %prep
 %setup -q
 
-%patch52 -p1 -b .dovecot_kde249992
-
 
 %build
 mkdir -p %{_target_platform}
@@ -118,7 +112,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 # hack around HTML doc multilib conflicts
 for doxy_hack in kcontrol/kresources ; do
 pushd %{buildroot}%{_kde4_docdir}/HTML/en/${doxy_hack}
-bunzip2 index.cache.bz2
+bunzip2 index.cache.xz
 sed -i -e 's!<a name="id[0-9]*"></a>!!g' index.cache
 bzip2 -9 index.cache
 done
@@ -218,6 +212,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 05 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.1-1
+- 4.8.1
+- remove dovecot patch, upstream
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.0-2
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index 9eb8820..f5c1df3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e1ea1d5f56eb87c0c305d941ac414c0  kdepimlibs-4.8.0.tar.bz2
+b5d77e68e6daa93cae3364c825142b4e  kdepimlibs-4.8.1.tar.xz


More information about the scm-commits mailing list