rpms/kdelibs4/F-8 kdelibs4.spec,1.6,1.7

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15010

Modified Files:
	kdelibs4.spec 
Log Message:
* Tue Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-4
- Requires: kdebase-runtime oxygen-icon-theme (where available)

* Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-3
- Requires: dbus-x11 (#390851)

* Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-2
- -devel: (Build)Requires: libXcomposite-devel libXdamage-devel
   libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel
   libXv-devel libXxf86misc-devel
- devel: Requires: strigi-devel >= 0.5.7
- (Build)Requires: kde-filesystem >= 4



Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdelibs4.spec	16 Nov 2007 02:53:41 -0000	1.6
+++ kdelibs4.spec	20 Nov 2007 18:49:08 -0000	1.7
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.96.0
-Release: 1%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 9
 Name: kdelibs
@@ -25,9 +25,14 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # for macros.kde4
-BuildRequires: kde-filesystem
+BuildRequires: kde-filesystem >= 4
+Requires: dbus-x11
 Requires: hicolor-icon-theme
-Requires: kde-filesystem
+## FIXME/TODO: When kdebase-runtime is available -- Rex
+%if 0%{?fedora} > 7 
+Requires: kdebase-runtime oxygen-icon-theme
+%endif
+Requires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
 #Requires: kde4-settings
@@ -74,6 +79,9 @@
 BuildRequires: soprano-devel >= 1.97.1
 BuildRequires: strigi-devel >= 0.5.7
 BuildRequires: zlib-devel
+# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) 
+%define x_deps libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
+%{?x_deps:BuildRequires: %{x_deps}}
 
 %description
 Libraries for the K Desktop Environment 4.
@@ -89,7 +97,9 @@
 %endif
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
+Requires: bzip2-devel gamin-devel libacl-devel zlib-devel
+Requires: strigi-devel >= 0.5.7
+%{?x_deps:Requires: %{x_deps}}
 %description devel
 This package includes the header files you will need to compile
 applications for KDE 4.
@@ -211,6 +221,19 @@
 
 
 %changelog
+* Tue Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-4
+- Requires: kdebase-runtime oxygen-icon-theme (where available)
+
+* Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-3
+- Requires: dbus-x11 (#390851)
+
+* Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-2
+- -devel: (Build)Requires: libXcomposite-devel libXdamage-devel
+   libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel
+   libXv-devel libXxf86misc-devel
+- devel: Requires: strigi-devel >= 0.5.7
+- (Build)Requires: kde-filesystem >= 4
+
 * Thu Nov 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-1
 - kde-3.96.0