rpms/kdebase-workspace/devel kdebase-workspace.spec,1.159,1.160

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20585

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Mon Dec 22 2008 Rex Dieter 4.1.85-6
- (re)enable edje, google-gadget support



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kdebase-workspace.spec	19 Dec 2008 21:58:36 -0000	1.159
+++ kdebase-workspace.spec	22 Dec 2008 14:10:27 -0000	1.160
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.85
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -44,8 +44,7 @@
 
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
-# update pending, http://bugzilla.redhat.com/477251 
-# BuildRequires: google-gadgets-devel >= 0.10.4 google-gadgets-qt
+BuildRequires: google-gadgets-devel >= 0.10.4
 BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libcaptury-devel
@@ -60,19 +59,10 @@
 BuildRequires: openldap-devel
 BuildRequires: python-devel
 BuildRequires: PyKDE4-devel >= %{version}
-# under review, http://bugzilla.redhat.com/477223
-#BuildRequires: qedje-devel
+BuildRequires: qedje-devel
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
-#-- The following OPTIONAL packages could NOT be located on your system.
-#-- Consider installing them to enable more features from this software.
-#+ GoogleGadgets: Google Gadgets library <http://code.google.com/p/google-gadgets-for-linux/>
-#Needed to build plasma scriptengine for google gadgets
-#+ QEdje: QEdje library <http://dev.openbossa.org/trac/qedje/>
-#Needed to build plasma scriptengine for edje files
-
-
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kde-settings-kdm
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -295,6 +285,9 @@
 
 
 %changelog
+* Mon Dec 22 2008 Rex Dieter 4.1.85-6
+- (re)enable edje, google-gadget support
+
 * Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-5
 - drop BR edje-devel, we need QEdje instead, which we don't have yet
 - comment out BR google-gadgets-* for now, need 0.10.4, have 0.10.3