rpms/kdelibs/F-13 kdelibs.spec,1.601,1.602

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18037

Modified Files:
	kdelibs.spec 
Log Message:
* Tue Mar 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.1-4
- Requires: hal (for solid)
- drop Requires: dbus-x11 (it's already Req'd in kdebase-workspace)
- drop Requires: coreutils grep (F-12+)
- make Requires: kdelibs-common versioned



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-13/kdelibs.spec,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -p -r1.601 -r1.602
--- kdelibs.spec	2 Mar 2010 14:12:53 -0000	1.601
+++ kdelibs.spec	10 Mar 2010 02:10:55 -0000	1.602
@@ -8,7 +8,7 @@
 
 Summary: KDE Libraries
 Version: 4.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -25,21 +25,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 BuildRequires: kde4-macros(api) >= 2
 BuildRequires: kde-filesystem >= 4-23
+%if 0%{?fedora} &&  0%{?fedora} < 12
 # used in kde.(sh|csh)
 Requires: coreutils grep
-# dbus-launch needed here? don't think so, but be safe and keep 
-# for now -- Rex
-Requires: dbus-x11
+%endif
 Requires: hicolor-icon-theme
 Requires: kde-filesystem >= 4-23
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: shared-mime-info
-Requires: kdelibs-common
+# versioned dep ok, as long as it comes from *here*
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: hal
 Requires: hunspell
 %global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
 Requires: phonon%{?_isa} >= %{phonon_version} 
 Requires: shared-desktop-ontologies
+Requires: shared-mime-info
 %global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
 Requires: soprano%{?_isa} >= %{soprano_version} 
 %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
@@ -425,6 +426,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.1-4
+- Requires: hal (for solid)
+- drop Requires: dbus-x11 (it's already Req'd in kdebase-workspace)
+- drop Requires: coreutils grep (F-12+)
+- make Requires: kdelibs-common versioned
+
 * Sun Feb 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.1-3
 - put back CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE to avoid 
   %%_libdir/kde/devel rpaths (#568495)