Browse Source

update: KDE 4.6.0
NEW: nepomukcontroller, openal-soft


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

inagaki 13 years ago
parent
commit
4b34156c30

+ 46 - 20
k/kdeaccessibility/kdeaccessibility-vl.spec

@@ -1,7 +1,7 @@
 Name: kdeaccessibility
-Summary: tools for handicapped people to use the GUI
-Summary(ja): ハンディを持つ人の GUI 使用をサポートするツール集
-Version: 4.5.0
+Summary: KDE Accessibility
+Summary(ja): KDE アクセシビリティパッケージ
+Version: 4.6.0
 Release: 1%{?_dist_release}
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeaccessibility-%{version}.tar.bz2
@@ -14,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 #BuildRequires: festival
-# workaround (hopefully) temporary borkage
 BuildRequires: speech-dispatcher-devel
 BuildRequires: flite-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -33,19 +32,27 @@ Included with this package are:
 * kmousetool: a program for people whom it hurts to click the mouse
 * kmouth: program that allows people who have lost their voice
 
-# Yes, it's a bit silly to have this, esp since we don't have a -devel pkg,
-# but that's how multilib currently works. -- Rex
 %package libs
 Summary: Runtime libraries for %{name}
+Summary(ja): %{name} のランタイムライブラリ
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}
 
 %description libs
 %{summary}.
 
+%package -n mono-icon-theme
+Summary: KDE monochrome icon theme
+Summary(ja): KDE のモノクロアイコン集
+Group: User Interface/Desktops
+BuildArch: noarch
+
+%description -n mono-icon-theme
+%{summary}.
+
 
 %prep
-%setup -q -n kdeaccessibility-%{version}
+%setup -q 
 
 %build
 mkdir -p %{_target_platform}
@@ -71,10 +78,10 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 # hack around HTML doc multilib conflicts
 for doxy_hack in jovie kmag kmousetool kmouth ; do
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/${doxy_hack}
-bunzip2 index.cache.bz2
-sed -i -e 's!<a name="id[0-9]*"></a>!!g' index.cache
-bzip2 -9 index.cache
+    pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/${doxy_hack}
+    bunzip2 index.cache.bz2
+    sed -i -e 's!<a name="id[0-9]*"></a>!!g' index.cache
+    bzip2 -9 index.cache
 done
 popd
 
@@ -84,7 +91,7 @@ rm -vf $RPM_BUILD_ROOT%{_libdir}/libkttsd.so
 
 %check
 for f in $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*.desktop ; do
-  desktop-file-validate $f
+    desktop-file-validate $f
 done
 
 %clean
@@ -92,24 +99,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-touch --no-create %{_datadir}/icons/mono &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-  touch --no-create %{_datadir}/icons/mono &> /dev/null
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{_datadir}/icons/mono &> /dev/null || :
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null
 fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/mono &> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
+%post -n mono-icon-theme
+touch --no-create %{_datadir}/icons/mono &> /dev/null || :
+
+%postun -n mono-icon-theme
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/mono &> /dev/null
+    gtk-update-icon-cache %{_datadir}/icons/mono &> /dev/null || :
+fi
+
+%posttrans -n mono-icon-theme
+gtk-update-icon-cache %{_datadir}/icons/mono &> /dev/null || :
+
+
 %files
 %defattr(-,root,root)
 %doc COPYING
@@ -128,16 +144,26 @@ gtk-update-icon-cache %{_datadir}/icons/mono &> /dev/null || :
 %doc %{_docdir}/HTML/en/kmag/
 %doc %{_docdir}/HTML/en/kmousetool/
 %doc %{_docdir}/HTML/en/kmouth/
-%{_datadir}/icons/mono
 %{_datadir}/icons/hicolor/*/*/*
-%{_libdir}/kde4/*
+%{_libdir}/kde4/*.so
+%{_libexecdir}/kde4/kaccessibleapp
+%{_datadir}/dbus-1/services/org.kde.kaccessible.service
 %{_mandir}/man1/*.1*
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/libkttsd.so.*
+%{_libdir}/kde4/plugins/accessiblebridge/
+
+%files -n mono-icon-theme
+%defattr(-,root,root,-)
+%{_datadir}/icons/mono/
 
 %changelog
+* Sun Feb 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+- split monochrome icons to subpackage
+
 * Sat Aug 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
 - new upstream release
 

+ 10 - 11
k/kdeadmin/kdeadmin-vl.spec

@@ -1,7 +1,7 @@
 Name: kdeadmin
-Summary: K Desktop Environment - Administrative tools
-Summary(ja): K デスクトップ環境 - 管理ツール集
-Version: 4.5.0
+Summary: KDE Administrative tools
+Summary(ja): KDE 向けシステム管理ツール集
+Version: 4.6.0
 Release: 1%{?_dist_release}
 
 Group: Applications/Administration
@@ -13,7 +13,8 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeadmin-%{version}.tar.
 Source6: kuser.pam
 Source7: kuser.pamd
 
-Patch0: kdeadmin-4.2.85-printing.patch
+# FIXME/TODO: upstream this! -- Rex
+Patch0: kdeadmin-4.5.80-printing.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: kdelibs4-devel >= %{version}
@@ -30,12 +31,13 @@ Conflicts: kdeadmin < 4
 
 %description
 The %{name} package includes administrative tools including:
-* knetworkconf: systemsettings module for network settings
+* kcron: systemsettings module for the cron task scheduler
 * ksystemlog: system log viewer
 * kuser: user manager
 
 %package -n system-config-printer-kde
 Summary: A printer administration tool for KDE
+Summary(ja): KDE 向けプリンタ管理ツール
 Group: Applications/System
 Requires: PyKDE4
 Requires: system-config-printer-libs
@@ -116,7 +118,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ksystemlog
 %{_bindir}/kuser
 %{_sbindir}/kuser
-%{_datadir}/kde4/apps/knetworkconf
 %{_datadir}/kde4/apps/ksystemlog
 %{_datadir}/kde4/apps/kuser
 %{_datadir}/applications/kde4/kuser.desktop
@@ -124,16 +125,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/config.kcfg/kuser.kcfg
 %{_datadir}/config/kuserrc
 %{_datadir}/kde4/services/kcm_cron.desktop
-%{_datadir}/kde4/services/kcm_knetworkconfmodule.desktop
-%doc %{_docdir}/HTML/en/kcontrol/
 %doc %{_docdir}/HTML/en/kcron/
 %doc %{_docdir}/HTML/en/ksystemlog/
 %doc %{_docdir}/HTML/en/kuser/
-%{_datadir}/icons/hicolor/*/*/knetworkconf.*
 %{_datadir}/icons/hicolor/*/*/kuser.*
-%{_datadir}/icons/hicolor/*/*/network*
 %{_libdir}/kde4/kcm_cron.so
-%{_libdir}/kde4/kcm_knetworkconfmodule.so
 %{_sysconfdir}/pam.d/kuser
 %{_sysconfdir}/security/console.apps/kuser
 
@@ -143,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/apps/system-config-printer-kde/
 
 %changelog
+* Sun Feb 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+
 * Fri Aug 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
 - new upstream release
 - added Requires: usermode

+ 20 - 1
k/kdeartwork/kdeartwork-vl.spec

@@ -1,11 +1,13 @@
 Name: kdeartwork
 Summary: Additional artwork (themes, sound themes, ...) for KDE
-Version: 4.5.0
+Summary(ja): KDE 追加テーマ
+Version: 4.6.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
+
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeartwork-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -30,10 +32,14 @@ Obsoletes: kdeartwork-kworldclock
 %description
 Additional artwork (themes, sound themes, ...) for KDE
 
+%description -l ja
+KDE の追加テーマです.
+
 %package -n nuvola-icon-theme
 Summary: Nuvola icon theme
 Summary(ja): Nuvola アイコンテーマ
 Group: User Interface/Desktops
+BuildArch: noarch
 Requires(post): gtk2
 Requires(postun): gtk2
 
@@ -42,6 +48,7 @@ Requires(postun): gtk2
 
 %package screensavers
 Summary: Additional screensavers for KDE
+Summary(ja): KDE 用追加スクリーンセーバー
 Group: User Interface/Desktops
 Requires: xscreensaver-base
 Requires: xscreensaver-extras
@@ -54,9 +61,14 @@ Conflicts: kdeartwork-screensavers
 %description screensavers
 Additional screensavers for KDE.
 
+%description screensavers -l ja
+KDE 用の追加スクリーンセーバーです.
+
 %package wallpapers
 Summary: Additional wallpapers
+Summary(ja): KDE 用のデスクトップ背景集
 Group: User Interface/Desktops
+BuildArch: noarch
 %if %{name} != kdeartwork
 Conflicts: kdeartwork-wallpapers
 %endif
@@ -66,7 +78,9 @@ Conflicts: kdeartwork-wallpapers
 
 %package sounds
 Summary: Additional sounds
+Summary(ja): KDE 用の追加効果音
 Group: User Interface/Desktops
+BuildArch: noarch
 
 %description sounds
 %{summary}.
@@ -117,6 +131,7 @@ fi
 %doc COPYING README
 %{_datadir}/kde4/apps/aurorae/*
 %{_datadir}/kde4/apps/kstyle/*
+%{_datadir}/kde4/apps/kwin/*
 %{_datadir}/kde4/apps/color-schemes/*.colors
 %{_datadir}/kde4/apps/desktoptheme/*
 %{_datadir}/emoticons/*
@@ -145,6 +160,10 @@ fi
 
 
 %changelog
+* Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+- nuvola-icon, sounds, wallpapers are noarch now.
+
 * Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
 - new upstream release
 

+ 66 - 34
k/kdebase-runtime/kdebase-runtime-vl.spec

@@ -3,7 +3,7 @@
 Name:          kdebase-runtime
 Summary:       KDE Runtime
 Summary(ja):   KDE ランタイム
-Version:       4.5.1
+Version:       4.6.0
 Release:       1%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -20,15 +20,13 @@ Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 Patch5:        kdebase-runtime-4.3.1-manpath.patch
 # add OnlyShowIn=KDE  to Desktop/Home.desktop (like trash.desktop)
 Patch6:        kdebase-runtime-4.3.3-home_onlyshowin_kde.patch
+Patch7:        kdebase-runtime-4.5.3-htsearch.patch
+# Launch compiz via compiz-manager so we get window decorations and
+# other such decadent luxuries (AdamW 2011/01)
+Patch8:        kdebase-runtime-4.5.95-compiz.patch
 
-## 4.5 Upstream patches
-# backport of 1160390, fixed: start call to cagibi only in next event loop, could be started
-# in on-demand load by a d-bus call ourself, so d-bus connection has a mutex locked already
-Patch100: kdebase-runtime-4.5.0-kioslave.patch
-Patch101: kdebase-runtime-4.4.0-virtuosoconverter.patch
+## 4.6 Upstream patches
 
-
-# when kdesu was removed, this is/should-be only temporary
 Provides:  kdebase4-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
@@ -38,23 +36,22 @@ Provides: desktop-notification-daemon
 Requires: kdepimlibs >= %{version}
 Requires: eject
 Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-flags = %{version}-%{release}
 # KHelpcenter requires htdig for building search indices
 Requires: htdig
 
-# ensure default/fallback icon theme present
-# beware of bootstrapping, there be dragons
-Requires: oxygen-icon-theme >= %{version}
-
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: alsa-lib-devel
 BuildRequires: attica-devel
 BuildRequires: bzip2-devel
+BuildRequires: chrpath
 BuildRequires: clucene-core-devel
 BuildRequires: exiv2-devel
-BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: libcanberra-devel 
 BuildRequires: libsmbclient-devel
+BuildRequires: libssh-devel >= 0.4.2
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openslp-devel
@@ -68,21 +65,29 @@ BuildRequires: soprano-devel >= 2.3.0
 BuildRequires: xine-lib-devel libxcb-devel
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
-%if %{?_dist_release} != "vl4" && %{?_dist_release} != "vl5" 
-BuildRequires: libssh-devel >= 0.4.2
 BuildRequires: xz-devel
-%endif
 BuildRequires: zlib-devel
 
-%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5" 
+%if %{?_dist_release} == "vl5" 
 Conflicts: kdebase3
 %endif
+# some items moved -workspace -> -runtime
+Conflicts: kdebase-workspace < 4.5.80
 
 %description
 Core runtime for KDE 4.
 
 %description -l ja
-KDE 4 の中心を構成するランタイム部分です.
+KDE 4 の中心となるランタイム部分です.
+
+%package devel
+Summary:  Developer files for %{name}
+Summary(ja): %{name} の開発用ファイル
+Group:    Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description devel
+%{summary}.
 
 %package libs
 Summary: Runtime libraries for %{name}
@@ -90,14 +95,12 @@ Summary(ja): %{name} のランタイムライブラリ
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-#Requires: %{name} = %{version}-%{release}
 # cagibi is runtime dep, a dbus service
 Requires: cagibi
 
 %description libs
 %{summary}.
 
-
 %package flags
 Summary: Geopolitical flags
 Group: User Interface/Desktops
@@ -113,11 +116,10 @@ Requires: %{name} = %{version}-%{release}
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
-#patch5 -p1 -b .manpath
 %patch6 -p1 -b .home_onlyshowin_kde
+%patch7 -p1 -b .htsearch
+%patch8 -p1 -b .config
 
-#patch100 -p1 -b .kioslave
-%patch101 -p1 -b .virtuosoconverter
 
 %build
 mkdir -p %{_target_platform}
@@ -152,15 +154,19 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
 # people/countries' flags :-(
 %{!?flags:rm -f $RPM_BUILD_ROOT%{_datadir}/locale/l10n/*/flag.png}
 
-# install this service for KDE 3 applications
-# NOTE: This is not a standard .desktop file, but an "almost standard" one
-#       installed into a KDE-3-specific directory, as usual for KDE 3 services,
-#       so we can't use desktop-file-install for it.
-install -p -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/services/khelpcenter.desktop
+# install this service for KDE 3 applications too
+mkdir $RPM_BUILD_ROOT%{_datadir}/services
+ln -s %{_datadir}/kde4/services/khelpcenter.desktop \
+      $RPM_BUILD_ROOT%{_datadir}/services/khelpcenter.desktop
 
 # FIXME: -devel type files, omit for now
 rm -vf  $RPM_BUILD_ROOT%{_libdir}/lib{kwalletbackend,molletnetwork}.so
 
+# rpaths
+# use chrpath hammer for now, find better patching solutions later -- Rex
+chrpath --list   $RPM_BUILD_ROOT%{_libdir}/kde4/plugins/phonon_platform/kde.so ||:
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/kde4/plugins/phonon_platform/kde.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -194,11 +200,11 @@ fi
 %{_sysconfdir}/xdg/menus/kde-information.menu
 %{_bindir}/*
 # omit ksvgtopng which kdelibs3 includes
-%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5" 
+%if %{?_dist_release} == "vl5" 
 %exclude %{_bindir}/ksvgtopng
 %endif
-# FIXME(?), currently contains cmake/modules -- Rex
 %{_datadir}/kde4/apps/*
+%exclude %{_datadir}/kde4/apps/cmake/
 %{_datadir}/config/*.knsrc
 %{_datadir}/autostart/nepomukserver.desktop
 %{_datadir}/config.kcfg/
@@ -215,34 +221,56 @@ fi
 %{_libdir}/libkdeinit4_*.so
 %{_libdir}/kde4/kcm_*.so
 %{_libdir}/kde4/kded_*.so
-%{_libexecdir}/kde4/*
-%{_libdir}/strigi/*
+%{_libexecdir}/kde4/drkonqi
+#{_libexecdir}/kde4/installdbgsymbols.sh
+%{_libexecdir}/kde4/kcmremotewidgetshelper
+%{_libexecdir}/kde4/kdeeject
+%{_libexecdir}/kde4/kdesu
+%attr(2755,root,nobody) %{_libexecdir}/kde4/kdesud
+%{_libexecdir}/kde4/kdontchangethehostname
+%{_libexecdir}/kde4/khc_docbookdig.pl
+%{_libexecdir}/kde4/khc_htdig.pl
+%{_libexecdir}/kde4/khc_htsearch.pl
+%{_libexecdir}/kde4/khc_indexbuilder
+%{_libexecdir}/kde4/khc_mansearch.pl
+%{_libexecdir}/kde4/kioexec
+%{_libexecdir}/kde4/knetattach
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_docdir}/HTML/en/*
 %{_datadir}/applications/kde4/Help.desktop
 %{_datadir}/applications/kde4/knetattach.desktop
+%{_datadir}/applications/kde4/nepomukbackup.desktop
 %{_datadir}/config/kshorturifilterrc
 %{_datadir}/desktop-directories/*.directory
 %{_datadir}/emoticons/kde4/
-%{_datadir}/locale/en_US/entry.desktop
 %{_datadir}/locale/l10n/
 %{_datadir}/locale/currency/
+%{_datadir}/ontology/kde/
 %{?flags:%exclude %{_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/libnepomuksync.so
+%{_datadir}/kde4/apps/cmake/modules/*.cmake
+
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/attica_kde.so
+%{_libdir}/libknotifyplugin.so
 %{_libdir}/libkwalletbackend.so.*
 %{_libdir}/libmolletnetwork.so.*
+%{_libdir}/libnepomukcommon.so
+%{_libdir}/libnepomuksync.so.*
 %{_libdir}/kde4/*.so
+%{_libdir}/kde4/imports/
 # FIXME: Is this a good idea? Won't multilib apps need KCMs, too?
 %exclude %{_libdir}/kde4/kcm_*.so
 %exclude %{_libdir}/kde4/kded_*.so
 %{_libdir}/kde4/plugins/phonon_platform/
-#{_libdir}/kde4/plugins/styles/
 
 %if 0%{?flags}
 %files flags
@@ -252,6 +280,10 @@ fi
 
 
 %changelog
+* Sat Feb 12 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.0-1
+- new upstream release
+- added devel subpackage
+
 * Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.1-1
 - new upstream release
 - updated summary

+ 115 - 85
k/kdebase-workspace/kdebase-workspace-vl.spec

@@ -1,72 +1,72 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(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.5.00
+%define kde4workspace_version 4.6.00
 
 Name: kdebase-workspace
 Summary: KDE Workspace
 Summary(ja): KDE ワークスペース
-Version: 4.5.1
-Release: 2%{?_dist_release}
+Version: 4.6.0
+Release: 1%{?_dist_release}
 
-Group: User Interface/Desktops
 License: GPLv2
+Group: User Interface/Desktops
 URL: http://www.kde.org/
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 
-Patch1: kdebase-workspace-4.4.80-redhat-startkde.patch
+# RH/Fedora-specific startkde changes
+Patch1: kdebase-workspace-4.5.80-redhat_startkde.patch
+# add konsole menuitem
 Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch
+# only show in KDE
 Patch3: kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch
-%if %{?_dist_release} != "vl4" && %{?_dist_release} !="vl5"
-Patch4: kdebase-workspace-4.3.95-ck-shutdown.patch
-%else
-# old version of the patch without the CanStop check for F11
-# CanStop was added with the PolicyKit1 port of ConsoleKit (0.4.x)
-Patch5: kdebase-workspace-4.2.85-ck-shutdown.patch
-%endif
 # 441062: packagekit tools do not show icons correctly on KDE
 Patch7: kdebase-workspace-4.0.3-krdb.patch
+# correct quoting
 Patch8: kdebase-workspace-4.2.85-klipper-url.patch
 # 434824: KDE4 System Settings - No Method To Enter Administrative Mode
 Patch9: kdebase-workspace-4.4.90-rootprivs.patch
+# drop useless kde font directories
 Patch11: kdebase-workspace-4.1.96-font.patch
-Patch13: kdebase-workspace-4.2.0-pykde4.patch
+# no klipper action on selection for Arora browser
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
+# kio_sysinfo based on OpenSUSE's patch
 Patch15: kdebase-workspace-4.3.75-kio_sysinfo.patch
 # show the remaining time in the battery plasmoid's popup (#515166)
-Patch16: kdebase-workspace-4.4.80-battery-plasmoid-showremainingtime.patch
+Patch16: kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime.patch
 # allow adding a "Leave..." button which brings up the complete shutdown dialog
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
-Patch17: kdebase-workspace-4.4.0-classicmenu-logout.patch 
-Patch18: kdebase-workspace-4.4.92-kdm_plymouth.patch
+Patch17: kdebase-workspace-4.5.80-classicmenu-logout.patch
 # kubuntu kudos! bulletproof-X bits ripped out
 Patch19: kdebase-workspace-4.4.92-kdm_plymouth081.patch
 Patch20: kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch 
 # support the widgetStyle4 hack in the Qt KDE platform plugin
 Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
-# fix the Games menu in the classic menu mixing up Name and Description
-Patch22: kdebase-workspace-4.4.0-classicmenu-games.patch
+# drop hard dep on xorg-x11-apps (for xmessage), http://bugzilla.redhat.com/537609
+Patch23: kdebase-workspace-4.5.2-startkde_zenity.patch 
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
 Patch50: kdebase-workspace-4.3.3-kde#171685.patch
-# "Adding "Enable networking" button to knetworkmanager"
-# https://bugzilla.redhat.com/598765 https://bugs.kde.org/238325
-Patch52: kdebase-workspace-4.4.85-kdebug238325.patch 
-# Display Settings are Lost on Logout, http://bugs.kde.org/183143 , http://bugzilla.redhat.com/607180
-Patch53: kdebase-workspace-4.4.4-kdebug183143.patch
 
-## 4.5 patches
-Patch100: kdebase-workspace-4.5.0-startkde-malloc.patch
+## 4.6 patches
+Patch100: kdebase-workspace-4.6.0-startkde_no_malloc_check.patch
+# https://bugs.kde.org/show_bug.cgi?id=265271
+# https://projects.kde.org/projects/kde/kdebase/kde-workspace/repository/revisions/375112824488df9a827a498b512eabeb5ce0deaf/diff/kstyles/oxygen/oxygenstyle.cpp?format=diff
+Patch101: kdebase-workspace-4.6.0-oxygen_qtoolbutton.patch
 
 # trunk
+# HALsectomy
+Patch200: kdebase-workspace-4.5.85-no_HAL.patch
+Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
+BuildRequires: dbusmenu-qt-devel >= 0.6
 BuildRequires: desktop-file-utils
 BuildRequires: glib2-devel
 BuildRequires: google-gadgets-devel >= 0.10.5
@@ -76,7 +76,7 @@ BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libboost-devel
 BuildRequires: libqalculate-devel
-BuildRequires: libusb-devel
+#BuildRequires: libusb-devel
 BuildRequires: libutempter-devel
 %if %{?_dist_release} !="vl5"
 BuildRequires: libuuid-devel
@@ -91,6 +91,7 @@ BuildRequires: libXtst-devel
 BuildRequires: lm-sensors-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
+BuildRequires: pciutils-devel
 BuildRequires: polkit-qt-devel
 BuildRequires: python-devel
 BuildRequires: qedje-devel >= 0.4.0
@@ -111,23 +112,30 @@ Requires: polkit-kde
 Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme >= 4.2.2 
 
+# for kcm_keyboard
+Requires: iso-codes
+
 # pkg-splits, upgrade path
-# Requires: kdm = %{version}-%{release}
-# Requires: ksysguardd = %{version}-%{release}
+#Requires: kdm = %{version}-%{release}
+Requires: kio_sysinfo
+Requires: ksysguardd = %{version}-%{release}
 
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
 Requires: coreutils
 Requires: dbus-x11
-Requires: xorg-x11-apps
 Requires: xorg-x11-utils
 Requires: xorg-x11-server-utils
 
 %define default_face_icon default1.png
-Requires: kio_sysinfo
+
+# Temporary solution until nepomukcontroller is merged back to kdebase-workspace
+Requires: nepomukcontroller
 
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
+Provides: plasma-dataengine-calendar = %{version}-%{release}
+
 %if %{?_dist_release} == "vl5"
 Conflicts: kdebase3
 %endif
@@ -149,7 +157,7 @@ This package contains:
 
 %package devel
 Summary:  Development files for %{name}
-Summary(ja): %{name} の開発用ファイル
+Summary(ja): %{name} の開発用ファイル
 Group:    Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -213,26 +221,43 @@ Group: User Interface/Desktops
 %description -n oxygen-cursor-themes
 %{summary}.
 
-%package googlegadgets
-Summary: Google Desktop Gadgets
+%package -n plasma-scriptengine-googlegadgets
+Summary: Plasma scriptengine for Google Desktop Gadgets
+Summary(ja): Google Desktop Gadgets 用 Plasma スクリプトエンジン
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
+Obsoletes: %{name}-googlegadgets < 4.5.80-7
+Provides:  %{name}-googlegadgets = %{version}-%{release}
 
-%description googlegadgets
+%description -n plasma-scriptengine-googlegadgets
 %{summary}.
 
-%package python-applet
-Summary: Plasma widget in Python
-Summary(ja): Python で記述された Plasma ウィジェット
+
+%package -n plasma-scriptengine-python 
+Summary: Plasma scriptengine for python
+Summary(ja): Python 用 Plasma スクリプトエンジン
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: PyKDE4 >= %{version}
+Obsoletes: %{name}-python-applet < 4.5.80-7
+Provides:  %{name}-python-applet = %{version}-%{release}
+
+%description -n plasma-scriptengine-python 
+%{summary}.
+
+%package -n plasma-scriptengine-ruby
+Summary: Plasma scriptengine for ruby 
+Summary(ja): Ruby 用 Plasma スクリプトエンジン
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: ruby 
 
-%description python-applet
+%description -n plasma-scriptengine-ruby
 %{summary}.
 
 %package akonadi
 Summary: Akonadi integration for KDE Workspace
+Summary(ja): KDE ワークスペースの Akonadi サポート
 Group: User Interface/Desktops
 Provides: plasma-dataengine-akonadi = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
@@ -245,38 +270,37 @@ Requires: akonadi
 %prep
 %setup -q
 
-# RH/Fedora-specific startkde changes
-%patch1 -p1 -b .redhat-startkde
+%patch1 -p1 -b .redhat_startkde
+# Well, I looked at doing this using the context menu plugin system and it
+# looked like a lot more work than this simple patch to me. -- Kevin
 %patch2 -p1 -b .plasma-konsole
-%patch3 -p1 -b .show_systemsettings
-%if %{?_dist_release} != "vl4" && %{?_dist_release} !="vl5"
-# ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
-%patch4 -p1 -b .ck-shutdown
-%else
-%patch5 -p1 -b .ck-shutdown
-%endif
+%patch3 -p1 -b .systemsettings_onlyshowin_kde
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-# kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
-%patch18 -p1 -b .kdm_plymouth
-#patch19 -p1 -b .kdm_plymouth081
+%patch19 -p1 -b .kdm_plymouth
 %patch20 -p1 -b .xsession_errors_O_APPEND
 %patch21 -p1 -b .platformplugin-widgetstyle4
-%patch22 -p1 -b .classicmenu-games
+%patch23 -p1 -b .startkde_zenity
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
-%patch52 -p1 -b .kdebug238325
-%patch53 -p1 -b .kdebug183143
 
-# 4.5 patches
-#patch100 -p1 -b .startkde-malloc
+# 4.6 patches
+%patch100 -p1 -b .startkde_no_malloc_check
+%patch101 -p1 -b .oxygen_qtoolbutton
 
+# trunk patches
+
+# Fedora patches
+#if 0%{?fedora} && 0%{?fedora} > 14
+%patch200 -p0 -b .no_HAL
+%patch210 -p1 -b .no_HAL2
+#endif
 
 %build
 mkdir -p %{_target_platform}
@@ -307,10 +331,13 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 # xsession support
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
-mv $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kdm/sessions/kde.desktop \
-   $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kdm/sessions/kde-safe.desktop \
+mv $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kdm/sessions/kde-plasma.desktop \
+   $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kdm/sessions/kde-plasma-safe.desktop \
    $RPM_BUILD_ROOT%{_datadir}/xsessions/
 
+# remove extraneous xsession files
+rm -rf $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kdm/sessions
+
 # nuke, use external kde-config-kdm
 rm -rf $RPM_BUILD_ROOT%{_datadir}/config/kdm
 
@@ -323,7 +350,7 @@ popd
 ## unpackaged files
 rm -fv $RPM_BUILD_ROOT%{_libdir}/kde4/libpolkitkdeprivate*.so
 
-%if %{?_dist_release} == "vl4" ||  %{?_dist_release} == "vl5"
+%if %{?_dist_release} == "vl5"
 # move devel symlinks (for Vine Linux 5)
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/devel
 pushd $RPM_BUILD_ROOT%{_libdir}
@@ -366,11 +393,11 @@ update-desktop-database -q &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-touch --no-create %{_datadir}/icons/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
-update-desktop-database -q &> /dev/null || :
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    touch --no-create %{_datadir}/icons/oxygen &> /dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
+    update-desktop-database -q &> /dev/null || :
 fi
 
 %post libs -p /sbin/ldconfig
@@ -381,14 +408,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-#config(noreplace) %{_sysconfdir}/X11/dm/Sessions/KDE.desktop
-#config(noreplace) %{_sysconfdir}/kde4rc
-#config(noreplace) %{_sysconfdir}/kderc
-#dir %{_sysconfdir}/kde
-#{_sysconfdir}/kde/env
-#{_sysconfdir}/kde/shutdown
-#{_sysconfdir}/pam.d/kcheckpass
-#{_sysconfdir}/pam.d/kscreensaver
 %{_bindir}/kaccess
 %{_bindir}/kapplymousetheme
 %{_bindir}/kblankscrn.kss
@@ -402,6 +421,7 @@ fi
 %{_bindir}/klipper
 %{_bindir}/kmenuedit
 %{_bindir}/krandom.kss
+%{_bindir}/krandrstartup
 %{_bindir}/krandrtray
 %{_bindir}/krdb
 %{_bindir}/krunner
@@ -423,9 +443,7 @@ fi
 %{_bindir}/plasmoidviewer
 %{_bindir}/plasmawallpaperviewer
 %{_bindir}/solid-action-desktop-gen
-%{_bindir}/solid-bluetooth
 %{_bindir}/solid-network
-%{_bindir}/solid-powermanagement
 %{_bindir}/startkde
 %{_bindir}/systemsettings
 
@@ -465,6 +483,7 @@ fi
 %{_datadir}/kde4/apps/solidfakenetbackend/
 %{_datadir}/kde4/apps/systemsettings/
 
+%{_datadir}/config/activities.knsrc
 %{_datadir}/config/aurorae.knsrc
 %{_datadir}/config/background.knsrc
 %{_datadir}/config/colorschemes.knsrc
@@ -511,12 +530,10 @@ fi
 %{_libdir}/kde4/kfontviewpart.so
 %{_libdir}/kde4/kio_fonts.so
 %{_libdir}/kde4/krunner_*.so
-%{_libdir}/kde4/kstyle_keramik_config.so
 %{_libdir}/kde4/kstyle_oxygen_config.so
 %{_libdir}/kde4/kwin*_*.so
 %{_libdir}/kde4/plasma_animator_default.so
 %{_libdir}/kde4/plasma_applet_*.so
-%{_libdir}/kde4/plasma_appletscript_qedje.so
 %{_libdir}/kde4/plasma_appletscriptengine_dashboard.so
 %{_libdir}/kde4/plasma_appletscriptengine_webapplet.so
 %{_libdir}/kde4/plasma_containment_*.so
@@ -525,16 +542,19 @@ fi
 %{_libdir}/kde4/plasma-geolocation-gps.so
 %{_libdir}/kde4/plasma-geolocation-ip.so
 %{_libdir}/kde4/plasma_package*_*.so
+%{_libdir}/kde4/plasma_toolbox_*.so
 %{_libdir}/kde4/plasma_wallpaper_*.so
+%{_libdir}/kde4/powerdevil*.so
 %{_libdir}/kde4/solid_*.so
 %{_libdir}/kde4/plugins/styles/oxygen.so
+%{_libexecdir}/kde4/backlighthelper
+%{_libexecdir}/kde4/fontinst
+%{_libexecdir}/kde4/fontinst_helper
+%{_libexecdir}/kde4/fontinst_x11
 %{_libexecdir}/kde4/kcheckpass
 %{_libexecdir}/kde4/kcmdatetimehelper
 %{_libexecdir}/kde4/kcmkdmhelper
 %{_libexecdir}/kde4/kfontprint
-%{_libexecdir}/kde4/fontinst
-%{_libexecdir}/kde4/fontinst_helper
-%{_libexecdir}/kde4/fontinst_x11
 %{_libexecdir}/kde4/krootimage
 %{_libexecdir}/kde4/kscreenlocker
 %{_libexecdir}/kde4/ksysguardprocesslist_helper
@@ -547,20 +567,22 @@ fi
 %{_libdir}/libkickoff.so
 %{_libdir}/libsystemsettingsview.so
 %{_libdir}/kconf_update_bin/*
-%{_mandir}/man1/plasmaengineexplorer.1*
+%{_mandir}/man1/plasm*
 
 # googlegadgets
 %exclude %{_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_libdir}/kde4/plasma_scriptengine_ggl.so
 %exclude %{_datadir}/kde4/services/*googlegadgets.desktop
-# python widget
+# python 
 %exclude %{_datadir}/kde4/services/plasma-scriptengine*python.desktop
-# akonadi
+# ruby
+%exclude %{_datadir}/kde4/services/plasma-scriptengine-*ruby*.desktop
+# akonadi
 %exclude %{_libdir}/kde4/plasma_engine_akonadi.so
 %exclude %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 # polkit-kde
-%if %{?_dist_release} != "vl4" && %{?_dist_release} !="vl5"
+%if %{?_dist_release} !="vl5"
 %{_datadir}/polkit-1/actions/*.policy
 %else
 %{_bindir}/polkit-kde-authorization
@@ -589,7 +611,7 @@ fi
 %endif
 %{_libdir}/lib*.so
 %{_datadir}/kde4/apps/cmake/modules/*.cmake
-%{_libdir}/cmake/KDE4Workspace-%{version}/
+%{_libdir}/cmake/KDE4Workspace-%{kde4workspace_version}/
 %exclude %{_libdir}/libkdeinit*.so
 %exclude %{_libdir}/libkickoff.so
 %exclude %{_libdir}/libplasma_applet-system-monitor.so
@@ -636,24 +658,32 @@ fi
 %{_datadir}/icons/Oxygen_Zion/
 %{_datadir}/icons/Oxygen_Zion_Big/
 
-%files googlegadgets
+%files -n plasma-scriptengine-googlegadgets
 %defattr(-,root,root,-)
 %{_libdir}/kde4/plasma_package_ggl.so
 %{_libdir}/kde4/plasma_scriptengine_ggl.so
 %{_datadir}/kde4/services/*googlegadgets.desktop
 
-%files python-applet
+%files -n plasma-scriptengine-python
 %defattr(-,root,root,-)
 %{python_sitearch}/PyKDE4/plasmascript.py*
 %{_datadir}/kde4/apps/plasma_scriptengine_python
 %{_datadir}/kde4/services/plasma-scriptengine*python.desktop
 
+%files -n plasma-scriptengine-ruby
+%defattr(-,root,root,-)
+%{_datadir}/kde4/apps/plasma_scriptengine_ruby/
+%{_datadir}/kde4/services/plasma-scriptengine-*ruby*.desktop
+
 %files akonadi
 %defattr(-,root,root,-)
 %{_libdir}/kde4/plasma_engine_akonadi.so
 %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
+* Sat Feb 12 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.0-1
+- new upstream release
+
 * Sat Sep 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.1-2
 - rebuilt with libqalculate-0.9.7
 

+ 50 - 26
k/kdebase/kdebase-vl.spec

@@ -1,47 +1,69 @@
 Name: kdebase
 Summary: KDE Core Applications
-Summary(ja): KDE の中心を構成するアプリケーション
-Version: 4.5.1
+Summary(ja): KDE の中心を構成するアプリケーション
+Version: 4.6.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
 
-Patch0:   kdebase-4.1.80-nsplugins-paths.patch
-Patch1:   kdebase-4.1.70-konsole-session.patch
-Patch2:   kdebase-4.2.1-home-icon.patch
+# search path for plugins
+Patch0: kdebase-4.1.80-nsplugins-paths.patch
 
-Provides:  dolphin = 1.0.2-1
-Provides:  kdebase4 = %{version}-%{release}
-Obsoletes: dolphin < 1.0.2-1
-Obsoletes: d3lphin
-Obsoletes: kdebase4 < %{version}-%{release}
-Obsoletes: %{name}-extras < %{version}-%{release}
+# backwards compatibility hack for a config option changed by our old
+Patch1: kdebase-4.4.3-konsole-activetabindex.patch
 
-Requires: %{name}-libs = %{version}-%{release}
-Requires: eject
+# make menuitem Home visible
+Patch2: kdebase-4.2.1-home-icon.patch
+
+# fix disabling automatic spell checking in the Konqueror UI (kde#228593)
+Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
+
+# Password & User account becomes non responding
+patch4: kdebase-4.3.4-bz#609039-chfn-parse.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # FIXME: remove BRs which are only needed for stuff now in -runtime
-BuildRequires: cmake >= 2.6.2
-BuildRequires: glib2-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: bzip2-devel
+BuildRequires: cyrus-sasl-devel
+BuildRequires: doxygen
+BuildRequires: fontconfig-devel
+BuildRequires: gettext
+BuildRequires: giflib-devel
+BuildRequires: libraw1394-devel
+BuildRequires: libsmbclient-devel
+BuildRequires: libusb-devel
+BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: phonon-devel
-BuildRequires: plasma-devel >= %{version}
+BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
+BuildRequires: pciutils-devel
+BuildRequires: pcre-devel
+BuildRequires: pkgconfig
+BuildRequires: plasma-devel >= %{version}
 BuildRequires: qimageblitz-devel
 BuildRequires: shared-desktop-ontologies-devel
-BuildRequires: soprano-devel >= 2.0.97
-BuildRequires: strigi-devel >= 0.5.7
-BuildRequires: zlib-devel
+BuildRequires: soprano-devel 
+
+Requires: %{name}-libs = %{version}-%{release}
+Requires: eject
 
 # Dolphin needs the ioslaves from kdebase-runtime (#438632)
 Requires: kdebase-runtime
 
+Obsoletes: dolphin < 1.0.2-1
+Obsoletes: d3lphin
+Obsoletes: kde-plasma-folderview < 4.3.1-1
+Obsoletes: kdebase4 < %{version}-%{release}
+Provides:  dolphin = 1.0.2-1
+Provides:  kde-plasma-folderview = %{version}-%{release} 
+Provides:  kdebase4 = %{version}-%{release}
+
 Conflicts: kdebase3
 
 %description
@@ -68,7 +90,7 @@ Summary(ja): %{name} の開発用ファイル
 Group:     Development/Libraries
 Requires:  %{name}-libs = %{version}-%{release}
 Requires:  kdelibs4-devel
-Requires:  kdepimlibs4-devel
+Requires:  kdepimlibs-devel
 Provides:  kdebase4-devel = %{version}-%{release}
 Obsoletes: kdebase4-devel < %{version}-%{release}
 
@@ -79,11 +101,10 @@ Obsoletes: kdebase4-devel < %{version}-%{release}
 %prep
 %setup -q -n kdebase-%{version}
 %patch0 -p1 -b .nsplugins-paths
-%patch1 -p1 -b .konsole-session
+%patch1 -p1 -b .konsole-activetabindex
 %patch2 -p1 -b .home-icon
-
-# fix incorrect assumption that we're building in a combined kdebase tree
-sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
+%patch3 -p1 -b .kde#228593
+%patch4 -p1 -b .bz#631481
 
 
 %build
@@ -179,6 +200,9 @@ fi
 %{_libdir}/kde4/devel/lib*.so
 
 %changelog
+* Sun Feb 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.0-1
+- new upstream release
+
 * Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.1-1
 - new upstream release
 

+ 87 - 28
k/kdeedu/kdeedu-vl.spec

@@ -1,8 +1,8 @@
 Name: kdeedu
 Summary: Educational/Edutainment applications for KDE
 Summary(ja): KDE 向け教育・教養アプリケーション集
-Version: 4.5.1
-Release: 2%{?_dist_release}
+Version: 4.6.0
+Release: 1%{?_dist_release}
 
 License: GPLv2
 Group: Applications/Edutainment
@@ -37,7 +37,7 @@ BuildRequires: ocaml
 BuildRequires: facile
 BuildRequires: python-devel python
 BuildRequires: readline-devel
-#BuildRequires: R-devel
+BuildRequires: R libRmath-devel
 BuildRequires: avogadro-devel
 
 Requires: %{name}-libs = %{version}-%{release}
@@ -54,8 +54,6 @@ Conflicts: kdeedu3
 %description
 Educational/Edutainment applications for KDE.
 
-What it is
-----------
 * blinken: Simon Says Game
 * kalzium: A periodic table of the elements
 * kanagram: Anagram game
@@ -71,15 +69,18 @@ What it is
 
 %package libs
 Summary: Runtime libraries for %{name}
+Summary(ja): %{name} のランタイムライブラリ
 Group:   System Environment/Libraries
 
 %description libs
 %{summary}.
 
 %package devel
-Summary: Development files for kdeedu
+Summary: Development files for %{name}
+Summary(ja): %{name} の開発用ファイル
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-kstars-libs = %{version}-%{release}
 Requires: %{name}-marble-libs = %{version}-%{release}
 Requires: %{name}-math-libs = %{version}-%{release}
 Requires:  kdelibs4-devel
@@ -91,6 +92,7 @@ Header files for developing applications using kdeedu.
 
 %package kstars
 Summary: Desktop Planetarium
+Summary(ja): デスクトッププラネタリウム
 Group: Applications/Edutainment
 Requires: %{name}-libs = %{version}-%{release}
 Provides: kdeedu4-kstars = %{version}-%{release}
@@ -98,8 +100,18 @@ Provides: kdeedu4-kstars = %{version}-%{release}
 %description kstars
 %{summary}.
 
+%package kstars-libs
+Summary: Runtime libraries for kstars 
+Summary(ja): kstars のランタイムライブラリ 
+Group:   System Environment/Libraries
+Requires: %{name}-kstars = %{version}-%{release}
+%description kstars-libs
+%{summary}.
+
+
 %package marble
 Summary: A World Atlas
+Summary(ja): デスクトップ地球儀
 Group: Applications/Edutainment
 Requires: %{name}-marble-libs = %{version}-%{release}
 Conflicts: kdeedu < 4.2.0
@@ -111,7 +123,8 @@ Provides:  marble = 0.7-%{release}
 %{summary}.
 
 %package marble-libs
-Summary: Runtime libraries for marble 
+Summary: Runtime libraries for marble
+Summary(ja): marble のランタイムライブラリ 
 Group:   System Environment/Libraries
 #Requires: %{name}-marble = %{version}-%{release}
 
@@ -120,6 +133,7 @@ Group:   System Environment/Libraries
 
 %package math
 Summary: Math applications
+Summary(ja): KDE 数学アプリケーション集
 Group: Applications/Edutainment
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 0.7-7
@@ -138,14 +152,16 @@ Educational/Edutainment Math applications:
 
 %package math-cantor-R
 Summary: R backend for Cantor
+Summary(ja): Cantor の R バックエンド
 Group: Applications/Edutainment
-Requires: %{name}-math%{?_isa} = %{version}-%{release}
+Requires: %{name}-math = %{version}-%{release}
 
 %description math-cantor-R
 %{summary}, which is part of kdeedu-math.
 
 %package math-libs
 Summary: Runtime libraries for %{name}-math
+Summary(ja): %{name}-math のランタイムライブラリ
 Group:   System Environment/Libraries
 
 %description math-libs
@@ -204,25 +220,31 @@ done
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
-touch --no-create %{_datadir}/icons/oxygen &> /dev/null ||:
 
 %posttrans
 update-desktop-database -q &> /dev/null ||:
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
-gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null ||:
 
 %postun
 if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
-  touch --no-create %{_datadir}/icons/oxygen &> /dev/null ||:
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
-  gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null ||:
 fi
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
 
-%postun libs -p /sbin/ldconfig
+%posttrans libs
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+
+%postun libs
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+fi
 
 %post kstars
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
@@ -236,6 +258,11 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
 fi
 
+%post kstars-libs -p /sbin/ldconfig
+
+%postun kstars-libs -p /sbin/ldconfig
+
+
 %post marble
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
@@ -312,6 +339,7 @@ fi
 %{_datadir}/kde4/apps/parley
 %{_datadir}/kde4/apps/step
 %{_datadir}/kde4/services/*Calculator.desktop
+%{_datadir}/kde4/services/plasma-applet-Molmasscalculator.desktop
 %{_datadir}/kde4/services/plasma-dataengine-parley.desktop
 %{_datadir}/kde4/services/plasma_parley.desktop
 %{_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
@@ -374,7 +402,7 @@ fi
 %{_datadir}/icons/hicolor/*/*/kwordquiz.*
 %{_datadir}/icons/hicolor/*/*/parley*.*
 %{_datadir}/icons/hicolor/*/*/step.*
-%{_datadir}/icons/oxygen/*/*/*
+#{_datadir}/icons/oxygen/*/*/*
 %{_mandir}/man1/kalzium.*
 %{_mandir}/man1/ktouch.*
 %{_mandir}/man6/khangman.*
@@ -391,6 +419,23 @@ fi
 %{_libdir}/libscience.so.*
 # needed here for multilib'd runtime
 #{_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
+%{_datadir}/icons/hicolor/*/*/coords.*
+%{_datadir}/icons/hicolor/*/*/deriv_func.*
+%{_datadir}/icons/hicolor/*/*/editconstants.*
+%{_datadir}/icons/hicolor/*/*/editplots.*
+%{_datadir}/icons/hicolor/*/*/func.*
+%{_datadir}/icons/hicolor/*/*/functionhelp.*
+%{_datadir}/icons/hicolor/*/*/integral_func.*
+%{_datadir}/icons/hicolor/*/*/lessen.*
+%{_datadir}/icons/hicolor/*/*/magnify.*
+%{_datadir}/icons/hicolor/*/*/maximum.*
+%{_datadir}/icons/hicolor/*/*/minimum.*
+%{_datadir}/icons/hicolor/*/*/newdifferential.*
+%{_datadir}/icons/hicolor/*/*/newfunction.*
+%{_datadir}/icons/hicolor/*/*/newimplicit.*
+%{_datadir}/icons/hicolor/*/*/newparametric.*
+%{_datadir}/icons/hicolor/*/*/newpolar.*
+%{_datadir}/icons/hicolor/*/*/resetview.*
 
 %files devel
 %defattr(-,root,root)
@@ -415,19 +460,22 @@ fi
 %doc %{_docdir}/HTML/en/kstars
 %{_datadir}/kde4/apps/kstars
 %{_datadir}/icons/hicolor/*/*/kstars.*
+
+%files kstars-libs
+%defattr(-,root,root,-)
 %{_libdir}/libSatLib.so.*
 
 %files marble
 %defattr(-,root,root,-)
-%{_bindir}/marble
 %{_bindir}/geodatatest
+%{_bindir}/marble
+%{_bindir}/routing-instructions
 %{_datadir}/kde4/apps/marble
 %{_datadir}/kde4/apps/marble_part
 %{_datadir}/applications/kde4/marble.desktop
 %{_datadir}/config.kcfg/marble.kcfg
 %{_datadir}/kde4/services/marble_part.desktop
 %doc %{_docdir}/HTML/en/marble/
-%{_libdir}/kde4/plugins/marble
 %{_datadir}/icons/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
 %{_libdir}/kde4/plasma_applet_worldclock.so
@@ -437,6 +485,7 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libmarble*.so.*
 %{_libdir}/kde4/libmarble_part.so
+%{_libdir}/kde4/plugins/marble/
 
 %files math
 %defattr(-,root,root,-)
@@ -444,12 +493,14 @@ fi
 %{_bindir}/calgebra
 %{_bindir}/cantor
 %{_bindir}/kalgebra
+%{_bindir}/kalgebramobile
 %{_bindir}/kbruch
 %{_bindir}/kig
 %{_bindir}/kmplot
 %{_bindir}/pykig.*
 %{_bindir}/rocs
 %{_libdir}/kde4/cantor_*.so
+%exclude %{_libdir}/kde4/cantor_rbackend.so
 %{_libdir}/kde4/libcantorpart.so
 %{_libdir}/kde4/kigpart.*
 %{_libdir}/kde4/libkmplotpart.*
@@ -457,6 +508,7 @@ fi
 %{_libdir}/kde4/rocs_*.so
 %{_datadir}/applications/kde4/cantor.desktop
 %{_datadir}/applications/kde4/kalgebra.desktop
+%{_datadir}/applications/kde4/kalgebramobile.desktop
 %{_datadir}/applications/kde4/kbruch.desktop
 %{_datadir}/applications/kde4/kig.desktop
 %{_datadir}/applications/kde4/kmplot.desktop
@@ -466,13 +518,14 @@ fi
 %{_datadir}/config.kcfg/kbruch.kcfg
 %{_datadir}/config.kcfg/kmplot.kcfg
 %{_datadir}/config.kcfg/maximabackend.kcfg
+%{_datadir}/config.kcfg/octavebackend.kcfg
 %{_datadir}/config.kcfg/rocs.kcfg
 %{_datadir}/config.kcfg/sagebackend.kcfg
 %{_datadir}/config/cantor.knsrc
-#{_datadir}/config/cantor_r.knsrc
 %{_datadir}/config/cantor_kalgebra.knsrc
 %{_datadir}/config/cantor_maxima.knsrc
 %{_datadir}/config/cantor_sage.knsrc
+%{_datadir}/config/rocs.knsrc
 %{_datadir}/dbus-1/interfaces/org.kde.kmplot.*
 %doc %{_docdir}/HTML/en/cantor/
 %doc %{_docdir}/HTML/en/kalgebra/
@@ -486,36 +539,38 @@ fi
 %{_datadir}/icons/hicolor/*/*/kig.*
 %{_datadir}/icons/hicolor/*/*/kmplot.*
 %{_datadir}/icons/hicolor/*/*/maximabackend.*
-%{_datadir}/icons/hicolor/*/*/rocs*.*
+%{_datadir}/icons/hicolor/*/*/octavebackend.*
 %{_datadir}/icons/hicolor/*/*/sagebackend.*
 %{_datadir}/icons/hicolor/*/*/application-x-kig.*
 %{_datadir}/kde4/apps/cantor
 %{_datadir}/kde4/apps/cantorpart
+%{_datadir}/kde4/apps/kalgebra/
 %{_datadir}/kde4/apps/katepart/syntax/*.xml
 %{_datadir}/kde4/apps/kbruch
 %{_datadir}/kde4/apps/kig
 %{_datadir}/kde4/apps/kmplot
 %{_datadir}/kde4/apps/rocs
 %{_datadir}/kde4/services/cantor
-#{_datadir}/kde4/services/cantor_part.desktop
-%{_datadir}/kde4/services/kalgebraplasmoid.desktop
+%exclude %{_datadir}/kde4/services/cantor/rbackend.desktop
+%{_datadir}/kde4/services/kalgebra*.desktop
 %{_datadir}/kde4/services/kig_part.desktop
 %{_datadir}/kde4/services/kmplot_part.desktop
 %{_datadir}/kde4/services/rocs_*.desktop
 %{_datadir}/kde4/servicetypes/cantor_*.desktop
+%{_datadir}/kde4/servicetypes/kalgebrascript.desktop
 %{_datadir}/kde4/servicetypes/Rocs*.desktop
 %{_mandir}/man1/kbruch.*
 %{_mandir}/man1/kig.*
 %{_mandir}/man1/kmplot.*
 
-#%files math-cantor-R
-#%defattr(-,root,root,-)
-#%{_bindir}/cantor_rserver
-#%{_libdir}/kde4/cantor_rbackend.so
-#%{_datadir}/config.kcfg/rserver.kcfg
-#{_datadir}/config/cantor_r.knsrc
+%files math-cantor-R
+%defattr(-,root,root,-)
+%{_bindir}/cantor_rserver
+%{_libdir}/kde4/cantor_rbackend.so
+%{_datadir}/config.kcfg/rserver.kcfg
+%{_datadir}/config/cantor_r.knsrc
 %{_datadir}/icons/hicolor/*/*/rbackend.*
-#%{_datadir}/kde4/services/cantor/rbackend.desktop
+%{_datadir}/kde4/services/cantor/rbackend.desktop
 
 %files math-libs
 %defattr(-,root,root,-)
@@ -528,6 +583,10 @@ fi
 
 
 %changelog
+* Fri Feb 25 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+- added kstars-libs, math-cantor-r subpackages
+
 * Tue Jan 18 2011 Shu KONNO <owa@bg.wakwak.com> 4.5.1-2
 - rebuilt with libboost-1.45.0
 

+ 22 - 11
k/kdegames/kdegames-vl.spec

@@ -1,29 +1,32 @@
 Name: kdegames
-Summary: K Desktop Environment - Games
-Summary(ja): K デスクトップ環境 - ゲーム集
-Version: 4.5.0
+Summary: KDE Games
+Summary(ja): KDE ゲーム集
+Version: 4.6.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
 Group: Applications/Games
 URL: http://www.kde.org/
+
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: desktop-file-utils
 BuildRequires: ggz-client-libs-devel
 BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: libsndfile-devel
+BuildRequires: openal-soft-devel
 BuildRequires: qca2-devel
+BuildRequires: qhull-devel
 
 Requires: %{name}-libs = %{version}-%{release}
+Requires: PyKDE4
+Requires: python-twisted
 Requires(post): ggz-client-libs
 Requires(post): desktop-file-utils
 Requires(preun): ggz-client-libs
 Requires(postun): desktop-file-utils
 
-# KSnakeDuel moved here from kdegames3
-Conflicts: kdegames3 < 3.5.10-6
-
 Obsoletes: kdegames4 < %{version}-%{release}
 Provides:  kdegames4 = %{version}-%{release}
 
@@ -50,6 +53,7 @@ Games for the K Desktop Environment 4, including:
 * kiriki
 * kjumpingcube
 * klines
+* klickety
 * kmahjongg
 * kmines
 * knetwalk
@@ -62,7 +66,6 @@ Games for the K Desktop Environment 4, including:
 * kshisen
 * ksinkships
 * ksirk
-* ksnakeduel / ksnake
 * kspaceduel
 * ksquares
 * ksudoku
@@ -72,14 +75,15 @@ Games for the K Desktop Environment 4, including:
 
 %package libs
 Summary: Runtime libraries for %{name}
+Summary(ja): %{name} のランタイムライブラリ
 Group:   System Environment/Libraries
 
 %description libs
 %{summary}.
 
 %package devel
-Summary: Development files for kdegames
-Summary(ja): kdegames の開発用ファイル
+Summary: Development files for %{name}
+Summary(ja): %{name} の開発用ファイル
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -106,6 +110,7 @@ unset QTDIR || : ; . /etc/profile.d/qt4.sh
     -DLIB_INSTALL_DIR:PATH=%{_libdir} \
     -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
     -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
+    -DINSTALL_KAJONGG=TRUE \
     -DSKIP_GGZCONFIG=1 \
     ..
 popd
@@ -124,8 +129,8 @@ install -m644 -p -D ./ksquares/src/module.dsc \
     $RPM_BUILD_ROOT%{_datadir}/ggz/ksquares.dsc
 
 # move devel symlinks
-mkdir -p %{buildroot}%{_libdir}/kde4/devel
-pushd %{buildroot}%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/devel
+pushd $RPM_BUILD_ROOT%{_libdir}
 for i in lib*.so
 do
   case "$i" in
@@ -207,6 +212,7 @@ fi
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/icons/oxygen/*/*/*
+%{_libdir}/libkcardgame.so
 %{_libdir}/kde4/pala*.so
 %{_datadir}/mime/packages/palapeli-mimetypes.xml
 %{_datadir}/ggz/kbattleship.dsc
@@ -223,12 +229,17 @@ fi
 %defattr(-,root,root)
 %{_includedir}/kde4/*
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkcardgame.so
 %{_libdir}/kde4/devel/lib*.so
 %{_datadir}/kde4/apps/cmake/modules/*
 %dir %{_libdir}/libpala/
 %{_libdir}/libpala/*.cmake
 
 %changelog
+* Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+- added BR: openal-soft-devel, qhull-devel
+
 * Sat Aug 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
 - new upstream release
 

+ 15 - 3
k/kdegraphics/kdegraphics-vl.spec

@@ -1,8 +1,8 @@
 Name: kdegraphics
 Summary: KDE Graphics Applications
 Summary(ja): KDE グラフィックアプリケーション集
-Version: 4.5.1
-Release: 2%{?_dist_release}
+Version: 4.6.0
+Release: 1%{?_dist_release}
 
 Group: Applications/Graphics
 License: GPLv2
@@ -10,6 +10,12 @@ URL: http://www.kde.org/
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
 
+## upstreamable patches
+# okular.desktop : Categories=-Office,+VectorGraphics (http://bugzilla.redhat.com/591089)
+Patch50: kdegraphics-4.5.1-okular_dt.patch
+# don't hardcode paths in OkularConfig.cmake
+Patch51: kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch
+
 # Security fix
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -117,6 +123,8 @@ Group: System Environment/Libraries
 
 %prep
 %setup -q -n kdegraphics-%{version}
+%patch50 -p1 -b .okular_dt
+%patch51 -p1 -b .OkularConfig
 
 # security fix
 
@@ -241,8 +249,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde4/libksane
 %{_includedir}/kde4/okular
 %{_libdir}/lib*.so
+%{_libdir}/cmake/Okular/OkularConfig*.cmake
 %{_datadir}/kde4/apps/cmake/modules/FindKSane.cmake
-%{_datadir}/kde4/apps/cmake/modules/FindOkular.cmake
 %{_libdir}/pkgconfig/*.pc
 
 %files -n kio_msits
@@ -251,6 +259,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/msits.protocol
 
 %changelog
+* Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+- added Patch50 and 51 from Fedora
+
 * Sun Sep 26 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.1-2
 - rebuilt with rpm-4.8.1 for pkg-config 
 

+ 86 - 62
k/kdelibs/kdelibs-vl.spec

@@ -1,44 +1,37 @@
-%define attica_ver 0.1.4
+%define attica_ver 0.2.0
 %define dbusmenu_qt_ver 0.5.2
 %define phonon_ver 4.4.0
-%define soprano_ver 2.4.631
+%define soprano_ver 2.5.60
 %define strigi_ver 0.7
 
 Summary: KDE Libraries
 Summary(ja): KDE ライブラリ
 Name: kdelibs
-Version: 4.5.1
-Release: 1%{?_dist_release}
+Version: 4.6.0
+Release: 2%{?_dist_release}
 
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.kde.org/
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-# These scripts are in kde-settings now.
-#Source1: kde4.sh
-#Source2: kde4.csh
 
-# make -devel packages parallel-installable
-Patch0: kdelibs-4.4.85-parallel_devel.patch
+# make kdelibs-devel parallel-installable with kdelibs3-devel
+Patch0: kdelibs-4.5.80-parallel_devel.patch
 # fix kde#149705
 Patch2: kdelibs-4.2.85-kde149705.patch
 # install all .css files and Doxyfile.global in kdelibs-common to build
 # kdepimlibs-apidocs against
 Patch8: kdelibs-4.3.90-install_all_css.patch
-# add Fedora/V-R to KHTML UA string
-Patch9: kdelibs-4.0.2-branding.patch
 # don't cache kdeglobals paths because they change after profile directories
 # are loaded from kde4rc
 Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
-# workaround for policykit
-Patch11: kdelibs-4.4.80-policykit-workaround.patch
 # COMMENT ME PLEASE 
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
-Patch14: kdelibs-4.4.80-libexecdir.patch
+Patch14: kdelibs-4.5.80-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
-Patch18: kdelibs-4.1.72-kstandarddirs.patch
+Patch18: kdelibs-4.5.80-kstandarddirs.patch
 # COMMENT ME PLEASE
 Patch20: kdelibs-4.1.70-cmake.patch
 # disable drkonqi by default, RHEL prefers/wants abrt
@@ -47,18 +40,17 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # this extra hassle (even though cmake is *supposed* to not add standard
 # paths (like /usr/lib64) already! With this, we can drop
 # -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
-Patch27: kdelibs-4.4.80-no_rpath.patch
+Patch27: kdelibs-4.5.80-no_rpath.patch
 
 # upstreamable
 
-# 4.4 upstream
+# trunk (4.6) upstream
 
 # security fix
 ## Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt4-devel >= 4.6.0
 BuildRequires: alsa-lib-devel
 BuildRequires: aspell-devel
 BuildRequires: attica-devel >= %{attica_ver} 
@@ -73,6 +65,7 @@ BuildRequires: enchant-devel
 BuildRequires: gamin-devel
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
+BuildRequires: grantlee-devel
 BuildRequires: jasper-devel
 BuildRequires: krb5-devel
 BuildRequires: libacl-devel libattr-devel
@@ -80,20 +73,20 @@ BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: libudev-devel
 BuildRequires: libutempter-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
 BuildRequires: phonon-devel >= %{phonon_ver}
-BuildRequires: polkit-qt-devel
+BuildRequires: polkit-qt-devel >= 0.98.1
 BuildRequires: qca2-devel
+BuildRequires: qt4-devel >= 4.6.0
 BuildRequires: shared-desktop-ontologies-devel >= 0.4
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver}
 BuildRequires: strigi-devel >= %{strigi_ver}
-%if %{?_dist_release} != "vl4" && %{?_dist_release} != "vl5" 
 BuildRequires: xz-devel
-%endif
 BuildRequires: zlib-devel
 BuildRequires: dbusmenu-qt-devel
 
@@ -131,6 +124,14 @@ Provides: kross(qtscript) = %{version}-%{release}
 Obsoletes: kdelibs-experimental < 4.3.75 
 Provides: kdelibs-experimental = %{version}-%{release} 
 
+# force upgrade of apps using the discontinued KatePart Smart* interfaces to
+# versions using the new Moving* interfaces instead
+Conflicts: kdevplatform < 1.1.80
+Conflicts: kdevelop < 4.1.80
+# 2.1-0.9.b4.fc15 is the first build with the fix from beta 5 backported
+Conflicts: kile < 2.1-0.9
+Conflicts: rkward < 0.5.4
+
 # because kjscmd
 Conflicts: kdebindings3
 
@@ -149,10 +150,12 @@ Group: System Environment/Libraries
 %description common
 This package includes the common files for the KDE 3 and KDE 4 libraries.
 
+%description common -l ja
+KDE 3 ライブラリと KDE 4 ライブラリとの間で共用するファイルが含まれています.
 
 %package devel
-Summary: Header files for compiling KDE 4 applications.
-Summary(ja): KDE 4 アプリケーションをコンパイルするためのヘッダーファイル
+Summary: Header files for compiling KDE applications.
+Summary(ja): KDE アプリケーションをコンパイルするためのヘッダーファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: attica-devel >= %{attica_ver} 
@@ -193,7 +196,7 @@ This package includes the KDE 4 API documentation in HTML
 format for easy browsing.
 
 %description -l ja apidocs
-このパッケージは、読みやすい HTML フォーマットによるKDE 4 の 
+このパッケージは、読みやすい HTML フォーマットによるKDE 4 の 
 API ドキュメントを含んでいます.
 
 
@@ -202,8 +205,8 @@ API ドキュメントを含んでいます.
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
 %patch8 -p1 -b .install_all_css
-%patch9 -p1 -b .branding
-%patch11 -p1 -b .policykit-workaround
+#patch9 -p1 -b .branding
+#sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
@@ -221,8 +224,6 @@ API ドキュメントを含んでいます.
 
 
 %build
-# add release version
-sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -258,6 +259,14 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications.menu \
 # create/own, see http://bugzilla.redhat.com/483318
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/kconf_update_bin
 
+## use ca-certificates' ca-bundle.crt, symlink as what most other
+## distros do these days (http://bugzilla.redhat.com/521902)
+if [  -f %{buildroot}%{_datadir}/kde4/apps/kssl/ca-bundle.crt -a \
+      -f /usr/share/ssl/certs/ca-bundle.crt ]; then
+  ln -sf /usr/share/ssl/certs/ca-bundle.crt \
+         %{buildroot}%{_datadir}/kde4/apps/kssl/ca-bundle.crt 
+fi
+
 # move devel symlinks
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/devel
 pushd $RPM_BUILD_ROOT%{_libdir}
@@ -289,8 +298,11 @@ install -p -D doc/api/doxygen.sh $RPM_BUILD_ROOT%{_bindir}/kde4-doxygen.sh
 
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en
 cp -prf kdelibs-%{version}-apidocs $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdelibs4-apidocs
-rm -vf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdelibs4-apidocs/*.tmp
 
+find   $RPM_BUILD_ROOT%{_docdir}/HTML/en/ -name 'installdox' -exec rm -fv {} ';'
+rm -vf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \
+       $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdelibs4-apidocs/index.qhp \
+       $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdelibs4-apidocs/*/html/index.qhp
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -317,27 +329,16 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %files
 %defattr(-,root,root)
 %doc AUTHORS README TODO COPYING.LIB
-#config(noreplace) %{_sysconfdir}/profile.d/*
-%config %{_sysconfdir}/xdg/menus/*.menu
 %{_sysconfdir}/dbus-1/system.d/*
+%{_sysconfdir}/xdg/menus/*.menu
 %{_bindir}/*
-%exclude %{_bindir}/kconfig_compiler4
 %dir %{_datadir}/kde4/apps
 %{_datadir}/kde4/apps/*
-# kdewidgets
-%exclude %{_bindir}/makekdewidgets4
-%exclude %{_bindir}/kde4-doxygen.sh
-%exclude %{_datadir}/kde4/apps/kdewidgets
-%exclude %{_datadir}/kde4/apps/cmake
 %{_datadir}/config/*
 %{_datadir}/dbus-1/interfaces/*
-#{_datadir}/dbus-1/system-services/*
+%{_datadir}/applications/kde4/kmailservice.desktop
+%{_datadir}/applications/kde4/ktelnetservice.desktop
 %{_datadir}/mime/packages/kde.xml
-%if %{?_dist_release} != "vl4" && %{?_dist_release} != "vl5" 
-#{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
-%else
-%{_datadir}/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
-%endif
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
 %{_datadir}/icons/hicolor/*/*/*
@@ -345,38 +346,56 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %{_docdir}/HTML/en/kioslave
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit4_*.so
-%{_libdir}/kconf_update_bin
-%dir %{_libdir}/kde4
+%{_libdir}/kconf_update_bin/
+%dir %{_libdir}/kde4/
 %{_libdir}/kde4/*.so
-%{_libexecdir}/kde4
-%{_libdir}/kde4/plugins
+%{_libexecdir}/kde4/filesharelist
+%{_libexecdir}/kde4/fileshareset
+%{_libexecdir}/kde4/kauth-policy-gen
+%{_libexecdir}/kde4/kconf_update
+%{_libexecdir}/kde4/kdesu_stub
+%{_libexecdir}/kde4/kio_http_cache_cleaner
+%{_libexecdir}/kde4/kioslave
+%{_libexecdir}/kde4/klauncher
+%{_libexecdir}/kde4/kmailservice
+# see kio/misc/kpac/README.wpad 
+%attr(4755,root,root) %{_libexecdir}/kde4/kpac_dhcp_helper
+%{_libexecdir}/kde4/ksendbugmail
+%{_libexecdir}/kde4/ktelnetservice
+%{_libexecdir}/kde4/lnusertemp
+%{_libexecdir}/kde4/start_kdeinit
+%{_libexecdir}/kde4/start_kdeinit_wrapper
+%{_libdir}/kde4/plugins/
 %{_mandir}/man*/*
+# common
 %exclude %{_datadir}/config/kdebug.areas
 %exclude %{_datadir}/config/kdebugrc
 %exclude %{_datadir}/config/ui/ui_standards.rc
 %exclude %{_datadir}/kde4/apps/kdeui
-%exclude %{_datadir}/config/colors/40.colors
-%exclude %{_datadir}/config/colors/Rainbow.colors
-%exclude %{_datadir}/config/colors/Royal.colors
-%exclude %{_datadir}/config/colors/Web.colors
+%exclude %{_datadir}/config/colors/
 %exclude %{_datadir}/config/ksslcalist
 %exclude %{_bindir}/preparetips
+# devel
+%exclude %{_bindir}/kconfig_compiler4
+%exclude %{_bindir}/makekdewidgets4
+%exclude %{_bindir}/kde4-doxygen.sh
+%exclude %{_datadir}/kde4/apps/kdewidgets/
+%exclude %{_datadir}/kde4/apps/cmake/
+%exclude %{_mandir}/man1/kdecmake.1*
+%exclude %{_mandir}/man1/makekdewidgets.1*
 
 %files common
 %defattr(-,root,root,-)
-%{_datadir}/config/colors/40.colors
-%{_datadir}/config/colors/Rainbow.colors
-%{_datadir}/config/colors/Royal.colors
-%{_datadir}/config/colors/Web.colors
-%{_datadir}/config/ksslcalist
 %{_bindir}/preparetips
+%{_datadir}/config/colors/
+%{_datadir}/config/ksslcalist
 %{_datadir}/config/kdebug.areas
 %{_datadir}/config/kdebugrc
-%dir %{_datadir}/config/ui
-%{_datadir}/config/ui/ui_standards.rc
-%{_datadir}/kde4/apps/kdeui
+%{_datadir}/config/ui/
+%{_datadir}/kde4/apps/kdeui/
 %doc %{_docdir}/HTML/en/common
 %{_datadir}/locale/all_languages/
+%{_datadir}/locale/en_US/entry.desktop
 
 %files devel
 %defattr(-,root,root)
@@ -387,9 +406,8 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %{_includedir}/*
 %dir %{_libdir}/kde4/devel
 %{_libdir}/kde4/devel/lib*.so
-#exclude %{_libdir}/libkdeinit4_*.so
-%{_datadir}/kde4/apps/cmake
-%{_datadir}/kde4/apps/kdewidgets
+%{_datadir}/kde4/apps/cmake/
+%{_datadir}/kde4/apps/kdewidgets/
 %{_mandir}/man1/kdecmake.1*
 %{_mandir}/man1/makekdewidgets.1*
 
@@ -398,6 +416,12 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %doc %{_docdir}/HTML/en/kdelibs4-apidocs
 
 %changelog
+* Sat Feb 26 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-2
+- fixed Conflicts tag
+
+* Fri Feb  4 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+
 * Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.1-1
 - new upstream release
 - updated summary

+ 11 - 12
k/kdemultimedia/kdemultimedia-vl.spec

@@ -1,19 +1,16 @@
 Name: kdemultimedia
-Summary: Multimedia applications for the K Desktop Environment (KDE).
-Summary(ja): K デスクトップ環境 - マルチメディアアプリケーション集
-Version: 4.5.0
-Release: 2%{?_dist_release}
+Summary: KDE multimedia applications
+Summary(ja): KDE マルチメディアアプリケーション集
+Version: 4.6.0
+Release: 1%{?_dist_release}
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
-Patch1: kdemultimedia-4.3.75-nomplayerthumbs.patch
-# FIXME
-Patch2: kdemultimedia-4.3.75-kscd_doc.patch
 
 # Vine Patches
 # build with taglib < 1.6
 Patch700: kdemultimedia-4.4.5-juk_taglib.patch
 # not build with ffmpeg
-Patch701: kdemultimedia-4.5.0-noffmpeg.patch
+Patch701: kdemultimedia-4.6.0-noffmpeg.patch
 
 URL: http://www.kde.org/
 Group: Applications/Multimedia
@@ -32,7 +29,7 @@ BuildRequires: kdelibs4-devel
 BuildRequires: libtheora-devel
 ## needed to build Kscd, keep for now -- Kevin
 #BuildRequires: libtunepimp-devel
-BuildRequires: libmusicbrainz-devel
+BuildRequires: libmusicbrainz3-devel
 BuildRequires: libvorbis-devel
 # KMix PulseAudio integration is not anywhere near shippable.
 # Almost everything is commented out, it basically does nothing.
@@ -90,9 +87,7 @@ Obsoletes: kdemultimedia4-devel < %{version}-%{release}
 
 %prep
 %setup -q -n kdemultimedia-%{version}
-#patch1 -p1 -b .nomplayerthumbs
-#patch2 -p1 -b .kscd_doc
-%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+%if %{?_dist_release} == "vl5"
 %patch700 -p1 -b .taglib
 %endif
 %patch701 -p1 -b .ffmpeg
@@ -187,6 +182,10 @@ fi
 %exclude %{_libdir}/libkdeinit*.so
 
 %changelog
+* Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+- updated Patch701
+
 * Tue Aug 24 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-2
 - added Provides: kdemultimedia4
 - added Provides: kdemultimedia4-devel to devel package

+ 43 - 23
k/kdenetwork/kdenetwork-vl.spec

@@ -1,7 +1,7 @@
 Name: kdenetwork
 Summary: KDE Network Applications
 Summary(ja): KDE ネットワークアプリケーション集
-Version: 4.5.1
+Version: 4.6.0
 Release: 1%{?_dist_release}
 
 Group: Applications/Internet
@@ -10,7 +10,8 @@ URL: http://www.kde.org/
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdenetwork-%{version}.tar.bz2
 Source1: krdc-icons.tar.bz2
-Source2: kppp.pamd
+Source2: kppp.console 
+Source3: kppp.pamd
 
 ## upstream me!  -- Rex :)
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
@@ -18,17 +19,19 @@ Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
 
 ## security patches
-# rhbz#591966 -  CVE-2010-1000 CVE-2010-1511 kdenetwork: improper sanitization 
-# of metalink attribute for downloading files
-#Patch100: kdenetwork-4.4.3-cve-2010-1000_1511.patch
 
 # Vine patches
-Patch1000: kdenetwork-3.5.8-kopete-fs.patch
+# Don't build with xmms-devel
+Patch1000: kdenetwork-4.6.0-noxmms.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: alsa-lib-devel
 BuildRequires: expat-devel
+BuildRequires: giflib-devel
 BuildRequires: glib2-devel
+BuildRequires: gmp-devel
+BuildRequires: gpgme-devel
+BuildRequires: kdebase-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -37,7 +40,7 @@ BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libktorrent-devel
-BuildRequires: libmsn-devel >= 4.0-0.beta2
+BuildRequires: libmsn-devel >= 4.1
 BuildRequires: libotr-devel
 BuildRequires: libv4l-devel
 BuildRequires: libvncserver-devel
@@ -52,11 +55,20 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite3-devel
 BuildRequires: strigi-devel
-BuildRequires: xmms-devel
 
-Requires: kdepimlibs >= %{version}
+Requires: kdebase-runtime >= 4.6
 Requires: %{name}-libs = %{version}-%{release}
 
+# kopete/yahoo
+Requires: jasper
+# kopete/jabber
+Requires: qca-ossl
+## krdc
+Requires: rdesktop
+
+# consolehelper
+Requires: usermode-gtk
+
 Obsoletes: kdenetwork4 < %{version}-%{release}
 Provides: kdenetwork4 = %{version}-%{release}
 
@@ -66,7 +78,8 @@ Provides: kopete
 Conflicts: kdenetwork3
 
 %description
-Networking applications for KDE 4, including:
+Networking applications, including:
+
 * kget: downloader manager
 * kopete: chat client
 * krdc: a client for Desktop Sharing and other VNC servers
@@ -90,7 +103,7 @@ Development files for kdenetwork. Install kdenetwork-devel if you wish
 to develop or compile KDE networking applications.
 
 %package -n kppp
-Summary: Modem dialer and ppp frontend for KDE 4
+Summary: Modem dialer and ppp frontend for KDE
 Summary(ja): KDE 用 ダイアルアップアプリケーション
 Group: Applications/Internet
 Requires: %{name}-libs = %{version}-%{release}
@@ -112,10 +125,9 @@ track of the time spent online for you.
 %setup -q -n kdenetwork-%{version} -a 1
 %patch1 -p1 -b .icon
 %patch2 -p1 -b .resolv-conf-path
-#patch100 -p0 -b .cve-2010-1000_1511
 
 # Vine patches
-%patch1000 -p1 -b .kopete
+%patch1000 -p1 -b .noxmms
 
 %build
 mkdir -p %{_target_platform}
@@ -135,6 +147,7 @@ unset QTDIR || : ; . /etc/profile.d/qt4.sh
     ..
 popd
 
+make -C %{_target_platform}/doc
 make %{?_smp_mflags} -C %{_target_platform}
 
 
@@ -142,19 +155,18 @@ make %{?_smp_mflags} -C %{_target_platform}
 rm -rf $RPM_BUILD_ROOT
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-cp %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/kppp
-
 # Run kppp through consolehelper
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_sbindir} \
+         $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \
+         $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+
+chmod 0755 $RPM_BUILD_ROOT%{_bindir}/kppp
 mv $RPM_BUILD_ROOT%{_bindir}/kppp $RPM_BUILD_ROOT%{_sbindir}
 ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/kppp
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
-cat >$RPM_BUILD_ROOT/etc/security/console.apps/kppp <<EOF
-USER=root
-PROGRAM=%{_sbindir}/kppp
-SESSION=true
-EOF
+
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/kppp
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kppp
+
 
 # move devel symlinks
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/devel
@@ -203,13 +215,17 @@ fi
 %defattr(-,root,root)
 %{_bindir}/*
 %exclude %{_bindir}/kppp*
+%{_datadir}/kde4/apps/dolphinpart/kpartplugins/kget_plug_in.desktop
 %{_datadir}/kde4/apps/dolphinpart/kpartplugins/kget_plug_in.rc
 %{_datadir}/kde4/apps/kconf_update/*
 %{_datadir}/kde4/apps/kget
+%{_datadir}/kde4/apps/khtml/kpartplugins/kget_plug_in.desktop
 %{_datadir}/kde4/apps/khtml/kpartplugins/kget_plug_in.rc
 %{_datadir}/kde4/apps/kopete*
 %{_datadir}/kde4/apps/krfb
 %{_datadir}/kde4/apps/krdc
+%{_datadir}/kde4/apps/kwebkitpart/kpartplugins/kget_plug_in.desktop
+%{_datadir}/kde4/apps/kwebkitpart/kpartplugins/kget_plug_in.rc
 %{_datadir}/kde4/apps/remoteview
 #{_datadir}/kde4/apps/desktoptheme/default/widgets/kget.svg
 %{_datadir}/config/kopeterc
@@ -254,6 +270,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/kppp*
 
 %changelog
+* Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+- added Patch1000, build without xmms-devel
+
 * Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
 - new upstream release
 

+ 12 - 9
k/kdepimlibs/kdepimlibs-vl.spec

@@ -1,11 +1,11 @@
 %define akonadi_subpkg 1
-%define akonadi_version 1.4.0
+%define akonadi_version 1.5.0
 
 Name: kdepimlibs
 Summary: KDE PIM Libraries
 Summary(ja): KDE PIM ライブラリ
-Version: 4.5.1
-Release: 2%{?_dist_release}
+Version: 4.6.0
+Release: 1%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -24,6 +24,7 @@ BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
 BuildRequires: libical-devel >= 0.33
+BuildRequires: shared-desktop-ontologies-devel >= 0.4
 BuildRequires: shared-mime-info
 BuildRequires: doxygen
 BuildRequires: graphviz
@@ -39,8 +40,7 @@ Requires: kdelibs4 >= %{version}
 Conflicts: kdepim < 4.2.90
 
 %description
-Personal Information Management (PIM) libraries for the
-K Desktop Environment 4.
+Personal Information Management (PIM) libraries for KDE.
 
 %package devel
 Summary:  Development files for %{name}
@@ -61,7 +61,7 @@ Header files for developing applications using %{name}.
 
 %package akonadi
 Summary: Akonadi runtime support for %{name}
-Summary(ja): %{name} の Akonadi サポート
+Summary(ja): KDE PIM ライブラリの Akonadi サポート
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: akonadi >= %{akonadi_version}
@@ -168,6 +168,7 @@ rm -rf %{buildroot}
 %{_datadir}/kde4/servicetypes/*
 %{_libdir}/lib*.so.*
 %{_libdir}/kde4/*.so
+%{_libdir}/kde4/plugins/designer/kholidayswidgets.so
 %{_docdir}/HTML/en/kcontrol/
 %{_docdir}/HTML/en/kioslave/
 %{_datadir}/kde4/apps/libkholidays/
@@ -190,13 +191,15 @@ rm -rf %{buildroot}
 %{_libdir}/cmake/KdepimLibs*
 %{_libdir}/gpgmepp/
 
-#if 0%{?apidocs}
 %files apidocs
 %defattr(-,root,root,-)
-%{_docdir}/HTML/en/kdepimlibs-apidocs/
-#endif
+%{_docdir}/HTML/en/kdepimlibs-apidocs/.
+
 
 %changelog
+* Sat Feb  5 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.0-1
+- new upstream release
+
 * Tue Jan 18 2011 Shu KONNO <owa@bg.wakwak.com> - 4.5.1-2
 - rebuilt with libboost-1.45.0
 

+ 4 - 2
k/kdeplasma-addons/kdeplasma-addons-vl.spec

@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Summary:        Additional plasmoids for KDE
-Version:        4.5.1
+Version:        4.6.0
 Release:        1%{?_dist_release}
 
 Group:          User Interface/Desktops
@@ -52,6 +52,7 @@ Additional plasmoids for KDE.
 
 %package libs
 Summary: Runtime libraries for %{name}
+Summary(ja): %{name} のランタイムライブラリ
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4 >= %{version}
@@ -148,7 +149,7 @@ rm -rf %{buildroot}
 %{_datadir}/kde4/services/ServiceMenus/*.desktop
 %{_datadir}/kde4/servicetypes/*.desktop
 %{_datadir}/mime/packages/lancelotpart-mime.xml
-%{_datadir}/dbus-1/services/org.kde.lancelot.service
+#{_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_datadir}/dbus-1/interfaces/org.kde.impanel.xml
 %{_datadir}/icons/hicolor/*/*/*
 
@@ -157,6 +158,7 @@ rm -rf %{buildroot}
 %{_libdir}/libkimpanelruntime.so.*
 %{_libdir}/liblancelot.so.*
 %{_libdir}/liblancelot-datamodels.so.*
+%{_libdir}/libplasma_groupingcontainment.so.*
 %{_libdir}/libplasmapotdprovidercore.so.*
 %{_libdir}/libplasmacomicprovidercore.so.*
 %{_libdir}/libplasmaweather.so.*

+ 32 - 12
k/kdesdk/kdesdk-vl.spec

@@ -1,7 +1,7 @@
 Name: kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Summary(ja): KDE ソフトウェア開発キット
-Version: 4.5.1
+Version: 4.6.0
 Release: 1%{?_dist_release}
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -33,28 +33,37 @@ BuildRequires: antlr-C++
 
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
+Requires(post): shared-mime-info, desktop-file-utils
+Requires(postun): shared-mime-info, desktop-file-utils
 
-Provides:      kaider = %{version}-%{release}
-Obsoletes:     kaider < %{version}-%{release}
+Obsoletes: kaider < %{version}-%{release}
+Provides: kaider = %{version}-%{release}
+
+Obsoletes: kdesdk4 < %{version}-%{release}
+Provides: kdesdk4 = %{version}-%{release}
 
 %description
 This is a collection of applications and tools used by KDE developers.
 It also has example code for use in learning KDE programming or starting
 a new KDE application.
 
-* cervisia: a CVS frontend
-* kate: advanced text editor
-* kbugbuster: a tool to manage the KDE bug report system
-* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
-* kompare: diff tool
-* kuiviewer: displays designer's UI files
-* lokalize: computer-aided translation system focusing on productivity and performance
-* umbrello: UML modeller and UML diagram tool
+  * cervisia: a CVS frontend
+  * kate: advanced text editor
+  * kcachegrind: a browser for data produced by profiling tools 
+    (e.g. cachegrind)
+  * kompare: diff tool
+  * kuiviewer: displays designer's UI files
+  * lokalize: computer-aided translation system focusing on productivity 
+    and performance
+  * okteta: binary/hex editor
+  * umbrello: UML modeller and UML diagram tool
 
 #'
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+Obsoletes: kdesdk4-libs < %{version}-%{release}
+Provides: kdesdk4-libs = %{version}-%{release}
 
 %description libs
 %{summary}.
@@ -64,6 +73,8 @@ Summary: Development files for kdesdk.
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdepimlibs-devel
+Obsoletes: kdesdk4-devel < %{version}-%{release}
+Provides: kdesdk4-devel = %{version}-%{release}
 
 %description devel
 Development files (headers) for kdesdk.
@@ -71,6 +82,8 @@ Development files (headers) for kdesdk.
 %package utils
 Summary: Text utilities from %{name}
 Group:   Applications/Text
+Obsoletes: kdesdk4-utils < %{version}-%{release}
+Provides: kdesdk4-utils = %{version}-%{release}
 
 %description utils
 %{summary}, including:
@@ -175,7 +188,7 @@ fi
 %{_datadir}/kde4/apps/katepart
 %{_datadir}/kde4/apps/kate
 %{_datadir}/kde4/apps/katexmltools
-%{_datadir}/kde4/apps/kbugbuster
+#{_datadir}/kde4/apps/kbugbuster
 %{_datadir}/kde4/apps/kcachegrind
 %{_datadir}/kde4/apps/kconf_update
 %{_datadir}/kde4/apps/kio_perldoc
@@ -187,6 +200,8 @@ fi
 %{_datadir}/kde4/apps/kuiviewer
 %{_datadir}/kde4/apps/kuiviewerpart
 %{_datadir}/kde4/apps/lokalize
+%{_datadir}/kde4/apps/okteta
+%{_datadir}/kde4/apps/oktetapart
 %{_datadir}/kde4/apps/umbrello
 %{_datadir}/applications/kde4/*
 %{_datadir}/config.kcfg/*
@@ -194,6 +209,7 @@ fi
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
 %{_datadir}/mime/packages/ktesnippets.xml
+%{_datadir}/mime/packages/okteta.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/icons/oxygen/*/*/*
@@ -204,6 +220,7 @@ fi
 %{_libdir}/strigi/*.so
 %{_datadir}/strigi/fieldproperties/
 %{_libdir}/kde4/*.so
+%{_libdir}/kde4/plugins/designer/*.so
 # -devel
 %exclude %{_libdir}/kde4/devel/
 
@@ -230,6 +247,9 @@ fi
 #{_libdir}/libantlr.so.*
 
 %changelog
+* Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+
 * Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.1-1
 - new upstream release
 - added BR: antlr-C++

+ 9 - 6
k/kdetoys/kdetoys-vl.spec

@@ -1,13 +1,13 @@
 Name: kdetoys
-Summary: K Desktop Environment - Toys and Amusements
-Summary(ja): K デスクトップ環境 - 小さなアプリケーション集
-Version: 4.5.0
+Summary: KDE Toys and Amusements
+Summary(ja): KDE のおもちゃ
+Version: 4.6.0
 Release: 1%{?_dist_release}
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdetoys-%{version}.tar.bz2
 
-URL: http://www.kde.org/
-Group: Applications/Accessories
 License: GPLv2
+Group: Applications/Accessories
+URL: http://www.kde.org/
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: kdebase-workspace-devel >= %{version}
@@ -15,7 +15,7 @@ BuildRequires: kdebase-workspace-devel >= %{version}
 Conflicts: kdetoys3
 
 %description
-Toys for the K Desktop Environment.
+Toys for KDE
 
 What it is
 ----------
@@ -77,6 +77,9 @@ fi
 %{_mandir}/man6/amor.6*
 
 %changelog
+* Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+
 * Fri Aug 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
 - new upstream release
 

+ 22 - 19
k/kdeutils/kdeutils-vl.spec

@@ -1,7 +1,7 @@
 Name: kdeutils
 Summary: KDE Utilities
 Summary(ja): KDE ユーティリティ集
-Version: 4.5.1
+Version: 4.6.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -10,29 +10,30 @@ URL: http://www.kde.org/
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeutils-%{version}.tar.bz2
 
+Requires: kdebase-runtime >= 4.6
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: desktop-file-utils
 BuildRequires: gmp-devel
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: plasma-devel >= %{version}
 BuildRequires: libarchive-devel 
 BuildRequires: libzip-devel
+BuildRequires: plasma-devel >= %{version}
 BuildRequires: python-devel python
 BuildRequires: qca2-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: qjson-devel >= 0.5
 BuildRequires: system-config-printer
-%if %{?_dist_release} != "vl4" && %{?_dist_release} != "vl5" 
 BuildRequires: xz-devel
-%endif
 
-Requires(post): shared-mime-info, desktop-file-utils
-Requires(preun): shared-mime-info, desktop-file-utils
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
-Provides:      okteta = 0.1.0-1
-Obsoletes:     okteta < 0.1.0-1
+# filelight moved here
+Obsoletes: filelight < 1:1.9
+Provides:  filelight = 1:1.9
 
 Obsoletes: kdeutils-extras < 4.0.0
 Obsoletes: kdeutils-devel < 4.0.0
@@ -60,7 +61,6 @@ Includes:
   * kgpg: gpg gui
   * ktimer: task scheduler
   * kwalletmanager: kde wallet management tool
-  * okteta: binary/hex editor
   * superkaramba: desktop widgets
   * sweeper: clean unwanted traces the user leaves on the system
 
@@ -74,9 +74,9 @@ Requires: kdelibs4 >= %{version}
 %{summary}.
 
 %package printer-applet
-Summary:  KDE printer applet
+Summary: KDE printer applet
 Summary(ja): KDE プリンタアプレット
-Group:    Applications/System
+Group: Applications/System
 Requires: PyKDE4 
 Requires: hal-cups-utils
 Requires: system-config-printer-libs
@@ -110,7 +110,7 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 # nothing should build against these
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkasten{controllers,core,gui}.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/libokteta{core,gui,kastencontrollers,kastencore,kastengui}.so
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libokteta{core,gui,kastencontrollers,kastencore,kastengui}.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkdelirc_shared.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkerfuffle.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkmilo.so
@@ -138,7 +138,6 @@ touch --no-create %{_datadir}/icons/oxygen &> /dev/null ||:
 update-desktop-database -q &> /dev/null ||:
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
 gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -147,7 +146,6 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null ||:
   update-desktop-database -q &> /dev/null ||:
-  update-mime-database %{_datadir}/mime &> /dev/null
 fi
 
 %post libs -p /sbin/ldconfig
@@ -159,6 +157,7 @@ fi
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
 %{_bindir}/ark
+%{_bindir}/filelight
 %{_bindir}/kcalc
 %{_bindir}/kcharselect
 %{_bindir}/kdf
@@ -168,10 +167,11 @@ fi
 %{_bindir}/ktimer
 %{_bindir}/kwalletmanager
 %{_bindir}/kwikdisk
-%{_bindir}/okteta
 %{_bindir}/superkaramba
 %{_bindir}/sweeper
 %{_datadir}/kde4/apps/ark/
+%{_datadir}/kde4/apps/filelight/
+%{_datadir}/kde4/apps/filelightpart/
 %{_datadir}/kde4/apps/kcalc/
 %{_datadir}/kde4/apps/kcharselect/
 %{_datadir}/kde4/apps/kconf_update/*
@@ -180,8 +180,8 @@ fi
 %{_datadir}/kde4/apps/kremotecontrol/
 %{_datadir}/kde4/apps/kremotecontroldaemon/
 %{_datadir}/kde4/apps/kwalletmanager/
-%{_datadir}/kde4/apps/okteta/
-%{_datadir}/kde4/apps/oktetapart/
+#{_datadir}/kde4/apps/okteta/
+#{_datadir}/kde4/apps/oktetapart/
 %{_datadir}/kde4/apps/superkaramba/
 %{_datadir}/kde4/apps/sweeper/
 %{_datadir}/kde4/services/*
@@ -194,10 +194,10 @@ fi
 %{_datadir}/config.kcfg/*
 %{_datadir}/autostart/kgpg.desktop
 %{_datadir}/config/*
-%{_datadir}/mime/packages/*
+#{_datadir}/mime/packages/*
 %{_libdir}/libkdeinit*.so
 %{_libdir}/kde4/*.so
-%{_libdir}/kde4/plugins/designer/*.so
+#{_libdir}/kde4/plugins/designer/*.so
 %{_mandir}/man1/*
 
 %files libs
@@ -211,6 +211,9 @@ fi
 %{_datadir}/kde4/apps/printer-applet
 
 %changelog
+* Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
+- new upstream release
+
 * Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.1-1
 - new upstream release
 - updated summary

+ 66 - 0
n/nepomukcontroller/nepomukcontroller-vl.spec

@@ -0,0 +1,66 @@
+Name:           nepomukcontroller
+Summary:        Applet to control the Nepomuk file indexer
+Version:        0.2
+Release:        3%{?_dist_release}
+
+Group:          Applications/System
+License:        LGPLv2
+URL:            http://kde-apps.org/content/show.php?content=137088
+
+Source0:        http://kde-apps.org/CONTENT/content-files/137088-%{name}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  kdelibs-devel >= 4.5.80
+BuildRequires:  kdebase-runtime
+
+#{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+
+%description
+Nepomukcontroller is a small systray applet that allows you to 
+suspend and resume the Nepomuk file indexer.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+    -DCMAKE_BUILD_TYPE=release \
+    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+    -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
+    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
+    -DLIB_INSTALL_DIR:PATH=%{_libdir} \
+    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
+    -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
+    ..
+popd
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf %{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/kde4/nepomukcontroller.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/nepomukcontroller
+%{_datadir}/applications/kde4/nepomukcontroller.desktop
+
+
+%changelog
+* Sun Feb 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.2-3
+- initial package for Vine
+
+* Tue Jan 18 2011 Jaroslav Reznik <jreznik@redhat.com> - 0.2-2
+- fix license to LGPLv2 only
+
+* Thu Jan 06 2011 Jaroslav Reznik <jreznik@redhat.com> - 0.2-1
+- initial package

+ 153 - 0
o/openal-soft/openal-soft-vl.spec

@@ -0,0 +1,153 @@
+Name:		openal-soft
+Summary:	Open Audio Library
+Version:	1.13
+Release:	1%{?_dist_release}
+
+Group:		System Environment/Libraries
+License:	LGPLv2+
+URL:		http://kcat.strangesoft.net/openal.html
+
+Source0:	http://kcat.strangesoft.net/openal-releases/openal-soft-%{version}.tar.bz2
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	alsa-lib-devel
+BuildRequires:	pulseaudio-libs-devel
+BuildRequires:	portaudio-devel
+BuildRequires:	cmake
+Obsoletes:	openal <= 1:0.0.10
+Provides:	openal = 1:%{version}-%{release}
+
+%description
+OpenAL Soft is a cross-platform software implementation of the OpenAL 3D
+audio API. It's built off of the open-sourced Windows version available
+originally from the SVN repository at openal.org. OpenAL provides
+capabilities for playing audio in a virtual 3d environment. Distance
+attenuation, doppler shift, and directional sound emitters are among
+the features handled by the API. More advanced effects, including air
+absorption, low-pass filters, and reverb, are available through the
+EFX extension. It also facilitates streaming audio, multi-channel buffers,
+and audio capture.
+
+%package	devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	openal-devel <= 1:0.0.10
+Provides:	openal-devel = 1:%{version}-%{release}
+
+%description	devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%setup -q
+
+%build
+%cmake .
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+install -Dpm644 alsoftrc.sample %{buildroot}%{_sysconfdir}/openal/alsoft.conf
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_bindir}/openal-info
+%{_libdir}/libopenal.so.*
+%dir %{_sysconfdir}/openal
+%config(noreplace) %{_sysconfdir}/openal/alsoft.conf
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/libopenal.so
+%{_libdir}/pkgconfig/openal.pc
+
+%changelog
+* Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.13-1
+- Initial build for Vine Linux
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.854-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Apr 01 2010 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.12.854-1
+- New upstream release
+
+* Mon Mar 01 2010 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.11.753-3.20100225
+- Fixed Version Number
+
+* Sun Feb 28 2010 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.11.753-2.a9e0e57797c6f4321d5776e1f29bf1e75b11e6a1
+- Fixed Bug 567870
+
+* Mon Jan 18 2010 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.11.753-1
+- New Upstream Release
+
+* Wed Jan 13 2010 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.10.622-7.931f5875cdc4ce0ac61a5110f11e962426e53d99
+- Newer git version that fix more problems with pulseaudio.
+
+* Mon Jan 04 2010 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.10.622-6.0ceaa01c3de75c946ff2e7591e7f69b28ec00409
+- Newer git version with more Pulseaudio fixes. Have fun.
+
+* Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.10.622-5.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Fixed small spec verion info.
+
+* Mon Dec 28 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.10.622-4.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Fixed broken upgrade paths.
+
+* Sat Dec 26 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.10.622-3.3793919892e6d61e5fec3abeaaeebc3f2332be13
+- Updatet to an newer git version because of some pulseaudio fixes.
+
+* Tue Nov 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.10.622-2
+- add default config
+
+* Mon Nov 09 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.10.622-1
+- New upstream release
+
+* Sat Nov 07 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.9.563-2.c1b161b44bbf60420de2e1ba886e957d9fcd495e
+- Updatet to an newer git version because of some pulseaudio fixes.
+- I hope it fix bug 533501
+
+* Fri Oct  09 2009 Hans de Goede <hdegoede@redhat.com> - 1.9.563-1.d6e439244ae00a1750f0dc8b249f47efb4967a23git
+- Update to 1.9.563 + some fixes from git
+- This fixes:
+  - Not having any sound in chromium-bsu 
+  - Various openal using programs hanging on exit
+
+* Fri Aug 21 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.8.466-9.487f0dde7593144ceabd817306500465caf7602agit
+- Fixed version info
+
+* Fri Aug 21 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.8.466-8.487f0dde7593144ceabd817306500465caf7602agit
+- Fixed bug 517973
+
+* Sun Aug 16 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.8.466-7
+- Fixed bug 517721. Added upstream.patch
+
+* Sat Aug 08 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.8.466-6
+- Fixed license and pkgconfig problem thx goes to Christoph Wickert
+
+* Wed Aug 05 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.8.466-5
+- Fixed Obsoletes: and Provides: sections
+
+* Tue Aug 04 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.8.466-4
+- Added Obsoletes: openal <= 0.0.9 and remove Conflicts: openal-devel
+
+* Fri Jun 26 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.8.466-3
+- Fixed all warnings of rpmlint
+
+* Fri Jun 20 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.8.466-2
+- Updatet the SPEC and SRPM file because openal-soft-devel conflicts with
+openal-devel
+
+* Fri Jun 20 2009 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 1.8.466-1
+- Initial release for Fedora

+ 14 - 16
p/polkit-kde/polkit-kde-vl.spec

@@ -1,20 +1,17 @@
 Name:           polkit-kde
-Version:        0.95.1
-Release:        5%{?_dist_release}
 Summary:        PolicyKit integration for KDE Desktop
+Version:        0.99.0
+Release:        1%{?_dist_release}
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.kde.org/
 
-Source0:        polkit-kde-1-0.95.1.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-
-## upstreamable patches
-Patch50: polkit-kde-1-0.95.1-ImplicitDSOLinking.patch
+Source0:        ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/polkit-kde-agent-1-%{version}.tar.bz2
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  kdelibs4-devel
-BuildRequires:  polkit-qt-devel >= 0.95
+BuildRequires:  polkit-qt-devel >= 0.99.0
 BuildRequires:  cmake
 BuildRequires:  gettext
 
@@ -27,10 +24,7 @@ Obsoletes: PolicyKit-kde < 4.5
 Provides Policy Kit Authentication Agent that nicely fits to KDE.
 
 %prep
-%setup -q -n polkit-kde-1-%{version}
-
-%patch50 -p1 -b .ImplicitDSOLinking
-
+%setup -q -n polkit-kde-agent-1-%{version}
 
 %build
 mkdir -p %{_target_platform}
@@ -54,9 +48,9 @@ make %{?_smp_mflags}  -C %{_target_platform} VERBOSE=1
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-desktop-file-install --delete-original \
-  --dir %{buildroot}%{_sysconfdir}/xdg/autostart \
-  %{buildroot}%{_sysconfdir}/xdg/autostart/polkit-kde-authentication-agent-1.desktop
+#desktop-file-install --delete-original \
+#  --dir %{buildroot}%{_sysconfdir}/xdg/autostart \
+#  %{buildroot}%{_sysconfdir}/xdg/autostart/polkit-kde-authentication-agent-1.desktop
 
 %find_lang polkit-kde-authentication-agent-1
 
@@ -68,10 +62,14 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libexecdir}/kde4/polkit-kde-authentication-agent-1
-%{_sysconfdir}/xdg/autostart/*
+%{_datadir}/autostart/polkit-kde-authentication-agent-1.desktop
+%{_datadir}/kde4/apps/policykit1-kde/policykit1-kde.notifyrc
 
 
 %changelog
+* Sun Feb  6 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.99.0-1
+- new upstream release
+
 * Sun Feb 28 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.95.1-5
 - initial build for Vine Linux
 

+ 9 - 6
p/polkit-qt/polkit-qt-vl.spec

@@ -1,8 +1,8 @@
 Name:		polkit-qt
 Summary:	Qt bindings for PolicyKit
 Summary(ja):	PolicyKit の Qt バインディング
-Version:	0.96.1
-Release:	2%{?_dist_release}
+Version:	0.99.0
+Release:	1%{?_dist_release}
 
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -13,8 +13,9 @@ Source0:	ftp://ftp.kde.org/pub/kde/stable/polkit-qt-1/polkit-qt-1-%{version}.tar
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:  automoc4
 BuildRequires:  cmake
-BuildRequires:  qt4-devel
+BuildRequires:  glib2-devel
 BuildRequires:  polkit-devel
+BuildRequires:  qt4-devel
 
 %description
 Polkit-qt is a library that lets developers use the PolicyKit API through a nice
@@ -23,6 +24,7 @@ lets you integrate those two component easily with PolicyKit.
 
 %package devel
 Summary: Development files for %{name}
+Summary(ja): %{name} の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: polkit-devel
@@ -56,16 +58,13 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -81,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/polkit-qt-1/
 %{_libdir}/libpolkit-qt*.so
 %{_libdir}/pkgconfig/polkit-qt*.pc
+%{_libdir}/cmake/*
 
 #%files examples
 #%defattr(-,root,root,-)
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.99.0-1
+- new upstream release
+
 * Mon Sep 27 2010 Shu KONNO <owa@bg.wakwak.com> 0.96.1-2
 - rebuilt with rpm-4.8.1 for pkg-config