rpms/kdebase/devel kdebase.spec,1.263.2.12,1.263.2.13

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Mon Jul 30 21:26:35 UTC 2007


Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28141

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
- bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8
- consolekit_kdm patch only needs BR dbus-devel, not ConsoleKit-devel


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.12
retrieving revision 1.263.2.13
diff -u -r1.263.2.12 -r1.263.2.13
--- kdebase.spec	30 Jul 2007 20:21:50 -0000	1.263.2.12
+++ kdebase.spec	30 Jul 2007 21:26:03 -0000	1.263.2.13
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
 Version:       3.92.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 %if 0%{?fedora} > 7
 Name:          kdebase
@@ -22,7 +22,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # /usr/bin/plasma
-Conflicts:  rss-glx < 0.8.1.p-7 
+Conflicts:  rss-glx < 0.8.1.p-8
 
 # FIXME/TODO: consider using patched/hard-coded XDG_MENU_PREFIX  
 # don't rely on env (same goes for kde3) -- Rex
@@ -57,8 +57,8 @@
 BuildRequires: bzip2-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: cmake
-BuildRequires: ConsoleKit-devel
 BuildRequires: cyrus-sasl-devel
+BuildRequires: dbus-devel
 BuildRequires: doxygen
 BuildRequires: imake
 BuildRequires: fontconfig-devel
@@ -254,6 +254,10 @@
 
 
 %changelog
+* Mon Jul 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.92.0-3
+- bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8
+- consolekit_kdm patch only needs BR dbus-devel, not ConsoleKit-devel
+
 * Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2
 - consolekit_kdm patch (#228111, kde#147790)
 - update startkde patch




More information about the scm-commits mailing list