[kdebase-workspace] Revert "confirmed qedje support is history, drop it"

Rex Dieter rdieter at fedoraproject.org
Fri Mar 18 16:56:39 UTC 2011


commit 36a9d189643ae4203e44b0b9424555b52311ed77
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 18 11:55:54 2011 -0500

    Revert "confirmed qedje support is history, drop it"
    
    This reverts commit f89601fcfb4b44eca2e10196cefb52512b2bc414.

 kdebase-workspace.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 8f96271..962bc2e 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.1
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version 4.6.1
 
-Release: 0.3%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -105,6 +105,8 @@ BuildRequires: dbusmenu-qt-devel
 BuildRequires: desktop-file-utils
 %if 0%{?fedora}
 BuildRequires: google-gadgets-devel >= 0.10.5
+## disabled?  double check on future releases -- Rex
+#BuildRequires: qedje-devel >= 0.4.0
 BuildRequires: gpsd-devel
 BuildRequires: libcaptury-devel
 %endif
@@ -121,7 +123,7 @@ BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: libraw1394-devel
 %endif
-BuildRequires: NetworkManager-devel NetworkManager-glib-devel
+BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
 BuildRequires: polkit-qt-devel
 BuildRequires: qimageblitz-devel
@@ -217,7 +219,7 @@ BuildArch: noarch
 Summary: KDE wallpapers
 Group: User Interface/Desktops
 # Horos wallpaper moved back here in 4.6.1-2 (originally moved to main in 4.6.0-8)
-Conflicts: kdebase-workspace < 4.6.1-0.2
+Conflicts: kdebase-workspace < 4.6.1-2
 Requires: kde-filesystem
 BuildArch: noarch
 %description wallpapers


More information about the scm-commits mailing list