rpms/kdebase/F-7 kdebase.spec,1.256,1.257

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Jun 12 15:04:34 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24684

Modified Files:
	kdebase.spec 
Log Message:
* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
- fix BR: kdelibs-devel
- cleanup Req's wrt kde-settings



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-7/kdebase.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- kdebase.spec	11 Jun 2007 18:40:00 -0000	1.256
+++ kdebase.spec	12 Jun 2007 15:03:58 -0000	1.257
@@ -19,7 +19,7 @@
 Name:    kdebase
 Epoch:   6
 Version: 3.5.7
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: GPL
 Url: http://www.kde.org
@@ -69,11 +69,6 @@
 Requires(post): fileutils sh-utils
 Requires(postun): fileutils sh-utils
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-#Requires: /etc/X11/xdm/Xaccess
-#Requires: /etc/X11/xdm/Xservers
-#Requires: /etc/X11/xdm/Xwilling
-#Requires: /etc/X11/xinit/Xsession
-#Requires: /etc/X11/xdm/Xsetup_0
 # See http://bugzilla.redhat.com/191306
 Requires(hint): htdig
 # man2html
@@ -98,23 +93,18 @@
 Requires: kde-settings-kdm
 %else
 Requires: xorg-x11-xdm
-%endif
-
-%if %{redhatify}
 Requires: desktop-backgrounds-basic
 Requires: redhat-menus => 6.7.5
 Requires: redhat-artwork-kde >= 7.0.0-8
 %endif
 
-BuildRequires: kdelibs-devel >= %{kde_version}
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
 BuildRequires: libxslt-devel libxml2-devel
 %if 0%{?fedora} > 6
 BuildRequires: libsmbclient-devel
 %else
 BuildRequires: samba 
 %endif
-# leave this out for now -- Rex
-#Requires(hint): samba-common
 BuildRequires: pam-devel
 BuildRequires: gettext
 BuildRequires: imake
@@ -628,6 +618,10 @@
 
 
 %changelog
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
+- fix BR: kdelibs-devel
+- cleanup Req's wrt kde-settings
+
 * Mon Jun 11 2007 Than Ngo <than at redhat.com> -  6:3.5.7-1.fc7.1
 - remove kdebase-3.4.2-npapi-64bit-fixes.patch, it's included
   in new upstream




More information about the scm-commits mailing list