rpms/koffice/F-10 koffice.spec,1.77,1.78

Rex Dieter rdieter at fedoraproject.org
Mon Oct 13 15:38:21 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12516

Modified Files:
	koffice.spec 
Log Message:
cleanup legacy/EL branch support



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-10/koffice.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- koffice.spec	18 Sep 2008 19:00:48 -0000	1.77
+++ koffice.spec	13 Oct 2008 15:37:50 -0000	1.78
@@ -1,4 +1,11 @@
 
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
 Name:           koffice
 Epoch:          1
 Version:        1.6.3
@@ -25,9 +32,9 @@
 Patch3: koffice-1.6.3-gcc43.patch
 
 # BuildRequires: world-devel ;)
-BuildRequires:  kdelibs3-devel
+BuildRequires:  %{kdelibs3}-devel
 # See http://bugzilla.redhat.com/244091
-%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 ## kjsembed bits, afaict, not really used (yet) -- Rex
 #BuildRequires:  kdebindings-devel
 BuildRequires:  freetype-devel
@@ -110,7 +117,7 @@
 Summary:        Runtime libraries for %{name} 
 Group:          System Environment/Libraries
 Conflicts:      koffice <= 4:%{version}-%{release}
-Requires:       kdelibs3 >= %{kdelibs_ver}
+Requires:       %{kdelibs3} >= %{kdelibs3_ver}
 License:        LGPLv2+
 %description libs
 %{summary}.




More information about the scm-commits mailing list