updated: kdebase-runtime, kdebase-workspace

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

k/kdebase-runtime/kdebase-runtime-vl.spec

@@ -2,7 +2,7 @@
 
 Name:          kdebase-runtime
 Summary:       K デスクトップ環境 - ランタイム
-Version:       4.4.1
+Version:       4.4.2
 Release:       1%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -21,10 +21,9 @@ Patch5:        kdebase-runtime-4.3.1-manpath.patch
 Patch6:        kdebase-runtime-4.3.3-home_onlyshowin_kde.patch
 
 ## 4.4 Upstream patches
-Patch101: kdebase-runtime-4.4.0-virtuosoconverter.patch
+Patch101:      kdebase-runtime-4.4.0-virtuosoconverter.patch
 
 # when kdesu was removed, this is/should-be only temporary
-#Conflicts: kdebase3 < 3.5.10-4
 Provides:  kdebase4-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
@@ -50,7 +49,6 @@ BuildRequires: clucene-core-devel
 BuildRequires: exiv2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
-#BuildRequires: kdelibs-experimental-devel
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libsmbclient-devel
 BuildRequires: libssh-devel >= 0.4.0
@@ -66,6 +64,7 @@ BuildRequires: soprano-devel >= 2.3.0
 BuildRequires: xine-lib-devel libxcb-devel
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
 %description
@@ -229,6 +228,9 @@ fi
 
 
 %changelog
+* Mon Apr 12 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.2-1
+- new upstream release
+
 * Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.1-1
 - new upstream release
 

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

@@ -3,7 +3,7 @@
 Summary: K Desktop Environment - Workspace
 Summary(ja): K デスクトップ環境 - ワークスペース
 Name: kdebase-workspace
-Version: 4.4.1
+Version: 4.4.2
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -11,18 +11,6 @@ Group: User Interface/Desktops
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 
-# addtional files for Vine (some files are based on kde-settings at FC)
-Source2: kdebase-kde.desktop
-Source3: env.sh
-Source4: gpg-agent-startup.sh
-Source5: gpg-agent-shutdown.sh
-Source10: kde4rc
-Source11: kderc
-Source20: kcheckpass.pamd
-Source21: kdm.pamd
-Source22: kdm-np.pamd
-Source23: kscreensaver.pamd
-
 Patch1: kdebase-workspace-4.3.95-redhat-startkde.patch
 Patch2: kdebase-workspace-4.3.98-plasma-konsole.patch
 Patch3: kdebase-workspace-4.3.75-show_systemsettings.patch
@@ -292,34 +280,6 @@ popd
 ## unpackaged files
 rm -fv $RPM_BUILD_ROOT%{_libdir}/kde4/libpolkitkdeprivate*.so
 
-# install gdm session support
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions
-#install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/KDE.desktop
-
-# install rc/script files
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown}
-#install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/env.sh
-#install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/gpg-agent-startup.sh
-#install -m 755 %{SOURCEX} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/vine-bookmarks.sh
-#install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/kde/shutdown/gpg-agent-shutdown.sh
-#install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/kde4rc
-#install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/kderc
-
-# default settings dir
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share
-#pushd $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share
-#  mkdir -p applications apps config icons services
-#popd
-
-# install pam.d
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
-#install -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kcheckpass
-#install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm
-#install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm-np
-#install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kscreensaver
-
-# 
-
 %check
 for f in $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*.desktop ; do
   desktop-file-validate $f
@@ -461,7 +421,7 @@ fi
 %{_docdir}/HTML/en/ksysguard/
 %{_docdir}/HTML/en/kxkb/
 #{_docdir}/HTML/en/PolicyKit-kde/
-%{_docdir}/HTML/en/plasma/
+%{_docdir}/HTML/en/plasma-desktop/
 %{_docdir}/HTML/en/systemsettings/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/oxygen/*/*/*
@@ -601,6 +561,10 @@ fi
 %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
+* Mon Apr 12 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.2-1
+- new upstream release
+- built with libxklaiver-5.0
+
 * Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.1-1
 - new upstream release