[kdelibs] 4.7.1
Than Ngo
than at fedoraproject.org
Fri Sep 2 10:39:20 UTC 2011
commit 384716c152cb92c01393b38f9501a00056725ed9
Author: Than Ngo <than at redhat.com>
Date: Fri Sep 2 12:39:48 2011 +0200
4.7.1
.gitignore | 1 +
kdelibs-4.3.1-drkonq.patch | 12 ------------
kdelibs.spec | 16 ++++++----------
sources | 2 +-
4 files changed, 8 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d4e0698..8f289a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/kdelibs-4.7.0.tar.bz2
+/kdelibs-4.7.1.tar.bz2
diff --git a/kdelibs.spec b/kdelibs.spec
index 054de10..863a942 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,4 +1,3 @@
-
%define attica_ver 0.2.0
%define dbusmenu_qt_ver 0.5.2
%define phonon_ver 4.5.0
@@ -17,10 +16,11 @@
%global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver})
%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
+%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
Summary: KDE Libraries
-Version: 4.7.0
-Release: 5%{?dist}
+Version: 4.7.1
+Release: 1%{?dist}
Name: kdelibs
Epoch: 6
@@ -41,7 +41,6 @@ BuildRequires: kde-filesystem >= 4-23
BuildRequires: kde-settings
BuildRequires: docbook-dtds docbook-style-xsl
Requires: ca-certificates
-%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
Requires: docbook-dtds docbook-style-xsl
Requires: hicolor-icon-theme
@@ -90,9 +89,6 @@ Patch18: kdelibs-4.6.90-kstandarddirs.patch
# set build type
Patch20: kdelibs-4.1.70-cmake.patch
-# disable drkonqi by default, RHEL prefers/wants abrt
-Patch24: kdelibs-4.3.1-drkonq.patch
-
# die rpath die, since we're using standard paths, we can avoid
# this extra hassle (even though cmake is *supposed* to not add standard
# paths (like /usr/lib64) already! With this, we can drop
@@ -307,9 +303,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch14 -p1 -b .libexecdir
%patch18 -p1 -b .kstandarddirs
%patch20 -p1 -b .xxcmake
-%if 0%{?rhel} > 5
-%patch24 -p1 -b .drkonq
-%endif
%patch27 -p1 -b .no_rpath
# libplasma PackageKit integration
@@ -575,6 +568,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Sep 02 2011 Than Ngo <than at redhat.com> - 4.7.1-1
+- 4.7.1
+
* Tue Aug 30 2011 Than Ngo <than at redhat.com> - 4.7.0-5
- clean up fedora conditonals
diff --git a/sources b/sources
index 01c9c2e..4f7ba97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d12b9c32da28b38f64718cf10527e80 kdelibs-4.7.0.tar.bz2
+eaeacc3c94501f343eb7c4ef74c7475b kdelibs-4.7.1.tar.bz2
More information about the scm-commits
mailing list