[kdelibs/f15] clean fedora conditional
Than Ngo
than at fedoraproject.org
Tue Aug 30 09:04:56 UTC 2011
commit 1979fdc467cd652bbe69b854953b69201bd2c62f
Author: Than Ngo <than at redhat.com>
Date: Tue Aug 30 11:05:18 2011 +0200
clean fedora conditional
kdelibs.spec | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 148007c..80f0cb5 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -7,7 +7,6 @@
%define qt4_ver 4.7.0
%define soprano_ver 2.6.0
%define strigi_ver 0.7.2
-# to build/include apidocs or not
%define apidocs 1
# to build/include QCH apidocs or not (currently broken)
#define apidocs_qch 1
@@ -21,7 +20,7 @@
Summary: KDE Libraries
Version: 4.6.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Name: kdelibs
Epoch: 6
@@ -343,7 +342,7 @@ mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
# create/own stuff
# see http://bugzilla.redhat.com/483318
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
-%if 0%{?fedora} < 15
+%if 0%{?fedora} && 0%{?fedora} < 15
# moved to kde-filesystem f15+
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/plugins/{gui_platform,styles}
%endif
@@ -554,6 +553,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 30 2011 Than Ngo <than at redhat.com> - 4.6.5-4
+- clean fedora conditional
+
* Fri Aug 26 2011 Than Ngo <than at redhat.com> - 4.6.5-3
- drop kdelibs-4.3.1-drkonq.patch which is merged in upstream
More information about the scm-commits
mailing list