[kdepim] fix build
Rex Dieter
rdieter at fedoraproject.org
Thu Dec 20 02:33:04 UTC 2012
commit f218a54248ab829d78004cc0efa24e24bac97a96
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Dec 19 20:32:41 2012 -0600
fix build
drop old kleopatra patch, nothing uses it anymore
adjust deps a bit
.gitignore | 1 +
kdepim-4.5.85-install-headers.patch | 123 -----------------------------------
kdepim.spec | 18 ++---
sources | 2 +-
4 files changed, 9 insertions(+), 135 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f1a3d7..1457c04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/kdepim-4.8.5.tar.xz
/kdepim-4.9.4.tar.xz
/kdepim-4.9.90.tar.xz
+/kdepim-4.9.95.tar.xz
diff --git a/kdepim.spec b/kdepim.spec
index 013209b..353fa88 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,7 +1,7 @@
Name: kdepim
Summary: KDE PIM (Personal Information Manager) applications
Epoch: 7
-Version: 4.9.90
+Version: 4.9.95
Release: 1%{?dist}
License: GPLv2
@@ -14,11 +14,6 @@ URL: http://www.kde.org/
%endif
Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
-# revert http://websvn.kde.org/?view=revision&revision=1072331 (rebased to 4.6)
-Patch0: kdepim-4.5.85-install-headers.patch
-
-## upstream patches
-
Provides: kdepim4 = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -58,11 +53,11 @@ BuildRequires: zlib-devel
# TODO: patch to use gpg2 (unconditionally or as in addition to gpg)
Requires: gnupg
%if 0%{?fedora}
-##Optional bits
Requires: pinentry-gui
-Requires: spambayes
+##Optional bits
+#Requires: spambayes
#Requires: spamassassin
-#{?fedora:Requires: bogofilter}
+#Requires: bogofilter
%endif
%description
@@ -92,8 +87,6 @@ Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%prep
%setup -q -n kdepim-%{version}%{?pre}
-%patch0 -p1 -b .install-headers
-
%build
mkdir -p %{_target_platform}
@@ -211,6 +204,9 @@ fi
%changelog
+* Thu Dec 20 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.9.95-1
+- 4.9.95
+
* Tue Dec 04 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-1
- 4.9.90
diff --git a/sources b/sources
index 87e4b55..8c5f6a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed9b299d6843708638f9c7805ff308a5 kdepim-4.9.90.tar.xz
+dd985cf3c31bd16f8394514ef70fa5cc kdepim-4.9.95.tar.xz
More information about the scm-commits
mailing list