rpms/koffice/F-7 koffice.spec,1.54,1.55
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Jun 15 16:16:32 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/koffice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25364
Modified Files:
koffice.spec
Log Message:
* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.2-2
- Require version of kdelibs used to build against (#244091)
- -suite: use versioned Requires
Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-7/koffice.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- koffice.spec 8 Jun 2007 13:41:18 -0000 1.54
+++ koffice.spec 15 Jun 2007 16:15:42 -0000 1.55
@@ -1,7 +1,7 @@
Name: koffice
Version: 1.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A free, integrated office suite for KDE
Group: Applications/Productivity
@@ -15,6 +15,9 @@
# BuildRequires: world-devel ;)
BuildRequires: kdebase-devel
BuildRequires: kdelibs-devel
+# See http://bugzilla.redhat.com/244091
+%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.6) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+Requires: kdelibs >= 6:%{kdelibs_ver}
## kjsembed bits, afaict, not really used (yet) -- Rex
#BuildRequires: kdebindings-devel
BuildRequires: freetype-devel
@@ -66,21 +69,21 @@
Group: Applications/Productivity
Obsoletes: koffice <= 4:%{version}-%{release}
Obsoletes: koffice-i18n < 4:%{version}
-Requires: koffice-core
-Requires: koffice-kword
-Requires: koffice-kspread
-Requires: koffice-kpresenter
-Requires: koffice-kivio
-Requires: koffice-karbon
-Requires: koffice-krita
-Requires: koffice-kugar
-Requires: koffice-kexi
-Requires: koffice-kexi-driver-mysql
-Requires: koffice-kexi-driver-pgsql
-Requires: koffice-kchart
-Requires: koffice-kformula
-Requires: koffice-filters
-Requires: koffice-kplato
+Requires: koffice-core = %{version}-%{release}
+Requires: koffice-kword = %{version}-%{release}
+Requires: koffice-kspread = %{version}-%{release}
+Requires: koffice-kpresenter = %{version}-%{release}
+Requires: koffice-kivio = %{version}-%{release}
+Requires: koffice-karbon = %{version}-%{release}
+Requires: koffice-krita = %{version}-%{release}
+Requires: koffice-kugar = %{version}-%{release}
+Requires: koffice-kexi = %{version}-%{release}
+Requires: koffice-kexi-driver-mysql = %{version}-%{release}
+Requires: koffice-kexi-driver-pgsql = %{version}-%{release}
+Requires: koffice-kchart = %{version}-%{release}
+Requires: koffice-kformula = %{version}-%{release}
+Requires: koffice-filters = %{version}-%{release}
+Requires: koffice-kplato = %{version}-%{release}
%description suite
KOffice - Integrated Office Suite
@@ -676,6 +679,11 @@
%changelog
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.2-2
+- Require version of kdelibs used to build against (#244091)
+- -suite: use versioned Requires
+
* Fri Jun 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.3-1
- koffice-1.6.3
More information about the scm-commits
mailing list