update: kdebase-workspace, kdeedu

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2787 ec354946-7b23-47d6-9f5a-488ba84defc7

k/kdebase-workspace/kdebase-workspace-vl.spec

@@ -7,7 +7,7 @@ Name: kdebase-workspace
 Summary: KDE Workspace
 Summary(ja): KDE ワークスペース
 Version: 4.6.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -62,6 +62,10 @@ Patch101: kdebase-workspace-4.6.0-oxygen_qtoolbutton.patch
 Patch200: kdebase-workspace-4.5.85-no_HAL.patch
 Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
 
+# Vine patches
+# don't link with xmms
+Patch700: kdebase-workspace-4.6.0-noxmms.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
@@ -75,8 +79,10 @@ BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libboost-devel
+BuildRequires: libdmtx-devel
 BuildRequires: libqalculate-devel
-#BuildRequires: libusb-devel
+BuildRequires: libraw1394-devel
+BuildRequires: libusb-devel
 BuildRequires: libutempter-devel
 %if %{?_dist_release} !="vl5"
 BuildRequires: libuuid-devel
@@ -87,6 +93,7 @@ BuildRequires: libxklavier-devel >= 3.0
 BuildRequires: libxml2-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXres-devel
+BuildRequires: libXScrnSaver-devel
 BuildRequires: libXtst-devel
 BuildRequires: lm-sensors-devel
 BuildRequires: NetworkManager-devel
@@ -97,7 +104,8 @@ BuildRequires: python-devel
 BuildRequires: qedje-devel >= 0.4.0
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
-BuildRequires: xmms-devel
+# dropt by Patch700
+#BuildRequires: xmms-devel
 %if %{?_dist_release} !="vl5"
 BuildRequires: xz-devel
 %endif
@@ -302,6 +310,9 @@ Requires: akonadi
 %patch210 -p1 -b .no_HAL2
 #endif
 
+# Vine patches
+%patch700 -p1 -b .noxmms
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -681,6 +692,10 @@ fi
 %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
+* Sun Feb 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.0-2
+- added BR: libdmtx-devel, libraw1394-devel, libusb-devel, libXScrnSaver-devel
+- added Patch700 and removed BR: xmms-devel
+
 * Sat Feb 12 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.0-1
 - new upstream release
 

k/kdeedu/kdeedu-vl.spec

@@ -2,7 +2,7 @@ Name: kdeedu
 Summary: Educational/Edutainment applications for KDE
 Summary(ja): KDE 向け教育・教養アプリケーション集
 Version: 4.6.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: GPLv2
 Group: Applications/Edutainment
@@ -29,8 +29,10 @@ BuildRequires: desktop-file-utils
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
+BuildRequires: soprano-devel
 BuildRequires: libspectre-devel
 BuildRequires: libusb-devel
+BuildRequires: libXpm-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
 BuildRequires: ocaml
@@ -39,6 +41,7 @@ BuildRequires: python-devel python
 BuildRequires: readline-devel
 BuildRequires: R libRmath-devel
 BuildRequires: avogadro-devel
+BuildRequires: gcc-gfortran
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -583,6 +586,9 @@ fi
 
 
 %changelog
+* Sun Feb 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-2
+- added BR: gcc-gfortran, libXpm-devel, soprano-devel
+
 * Fri Feb 25 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
 - new upstream release
 - added kstars-libs, math-cantor-r subpackages