update: KDE SC 4.7.0

added : kate, konsole


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

c/cagibi/cagibi-vl.spec

@@ -1,7 +1,7 @@
 Name:           cagibi
 Summary:        SSDP (UPnP discovery) cache/proxy daemon
-Version:        0.1.1
+Version:        0.2.0
-Release:        3%{?_dist_release}
+Release:        1%{?_dist_release}
 
 Group:          System Environment/Base
 License:        GPLv2+ and LGPLv2+
@@ -22,7 +22,6 @@ Cagibi is a cache/proxy daemon for SSDP (the discovery part of UPnP).
 %prep
 %setup -q
 
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -47,11 +46,17 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LIB
+%{_sysconfdir}/cagibid.conf
+%{_sysconfdir}/dbus-1/system.d/org.kde.Cagibi.conf
 %{_bindir}/cagibid
-%{_datadir}/dbus-1/services/org.kde.Cagibi.service
+%{_datadir}/dbus-1/interfaces/org.kde.Cagibi.*.xml
+%{_datadir}/dbus-1/system-services/org.kde.Cagibi.service
 
 
 %changelog
+* Sat Jul 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.2.0-1
+- new upstream release
+
 * Sun Aug 15 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.1-3
 - initial build for Vine Linux
 

k/kate/kate-vl.spec

@@ -0,0 +1,216 @@
+Name:    kate
+Summary: Advanced Text Editor 
+Summary(ja): 高機能なテキストエディタ
+Version: 4.7.0
+Release: 2%{?_dist_release}
+
+# kwrite LGPLv2+
+# kate: app LGPLv2, plugins, LGPLv2 and LGPLv2+ and GPLv2+
+# ktexteditor: LGPLv2
+# katepart: LGPLv2
+License: LGPLv2 and LGPLv2+ and GPLv2+ 
+Group:   Applications/Editors
+URL:     https://projects.kde.org/projects/kde/kdebase/kate 
+
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: soprano-devel
+
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: %{name}-part = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+
+%description
+%{summary}.
+
+%package devel
+Summary:  Development files for %{name}
+Summary(ja): %{name} の開発用ファイル
+Group:    Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-part = %{version}-%{release}
+Requires: kdelibs4-devel
+
+%description devel
+%{summary}.
+
+%package libs 
+Summary:  Runtime files for %{name}
+Summary(ja): %{name} のランタイムライブラリ
+Group:    System Environment/Libraries
+# when split occurred
+Conflicts: kdesdk4-libs < 4.6.95-10
+#Requires: %{name} = %{version}-%{release}
+
+%description libs 
+%{summary}.
+
+%package part 
+Summary: Kate kpart plugin 
+Summary(ja): Kate kpart プラグイン
+License: LGPLv2
+Group:   Applications/Editors
+# when split occurred
+Conflicts: kdelibs4 < 4.6.95-10
+
+%description part 
+%{summary}.
+
+%package -n kwrite
+Summary: Text Editor
+Summary(ja): テキストエディタ
+License: LGPLv2+
+Group:   Applications/Editors
+# when split occurred
+Conflicts: kdebase4 < 4.6.95-10
+Requires: %{name}-part = %{version}-%{release} 
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+
+%description -n kwrite
+%{summary}.
+
+
+%prep
+%setup -q
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+unset QTDIR || : ; . /etc/profile.d/qt4.sh
+%cmake \
+    -DCMAKE_BUILD_TYPE=release \
+    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+    -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
+    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
+    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
+    -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
+    ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
+# move devel symlinks (that would otherwise conflict with kdelibs3-devel)
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/devel
+pushd $RPM_BUILD_ROOT%{_libdir}
+for i in lib*.so
+do
+    case "$i" in
+	libkate*interfaces.so)
+	    linktarget=`readlink "$i"`
+	    rm -f "$i"
+	    ln -sf "../../$linktarget" "kde4/devel/$i"
+	    ;;
+    esac
+done
+popd
+
+## unpackaged files
+# playground artsticomment -devel bits
+rm -fv $RPM_BUILD_ROOT%{_includedir}/kde4/artisticcomment.h
+rm -fv $RPM_BUILD_ROOT%{_libdir}/libacomment.a
+
+
+%check
+for f in $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
+%post
+touch --no-create %{_datadir}icons/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-mime-database %{_datadir}/mime >& /dev/null
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+    update-mime-database %{_datadir}/mime >& /dev/null
+fi
+
+%post part -p /sbin/ldconfig
+%postun part -p /sbin/ldconfig
+
+
+%files 
+%doc kate/AUTHORS kate/ChangeLog kate/COPYING.LIB kate/NEWS kate/README kate/TODO
+%{_bindir}/kate
+%{_libdir}/libkdeinit4_kate.so
+%{_datadir}/applications/kde4/kate.desktop
+%{_datadir}/kde4/apps/kate/
+%{_datadir}/kde4/apps/katexmltools/
+%{_datadir}/kde4/apps/kconf_update/kate*.upd
+%{_datadir}/icons/hicolor/*/*/*
+%{_mandir}/man1/kate.1.gz
+%{_datadir}/config/katerc
+%{_datadir}/config/katefiletemplates.knsrc
+%{_datadir}/kde4/services/kate*.desktop
+%{_libdir}/kde4/kate*plugin.so
+%{_libdir}/kde4/katefiletemplates.so
+%{_datadir}/kde4/apps/katepart/
+%{_datadir}/kde4/apps/ktexteditor_*/
+%{_datadir}/kde4/services/ktexteditor_*.desktop
+%{_libdir}/kde4/ktexteditor_*.so
+%{_datadir}/kde4/services/plasma-applet-katesession.desktop
+%{_datadir}/kde4/servicetypes/kateplugin.desktop
+%{_libdir}/kde4/plasma_applet_katesession.so
+%{_libdir}/kde4/kate_kttsd.so
+# snippets plugin
+%{_bindir}/ktesnippets_editor
+%{_datadir}/applications/kde4/ktesnippets_editor.desktop
+%{_datadir}/config/ktexteditor_codesnippets_core.knsrc
+# these should *probably* be moved to hicolor -- rex
+%{_datadir}/icons/oxygen/*/actions/*
+%{_datadir}/mime/packages/ktesnippets.xml
+%{_datadir}/doc/HTML/en/kate/
+
+%files libs
+%{_libdir}/libkateinterfaces.so.4*
+%{_libdir}/libktexteditor_codesnippets_core.so.0*
+
+%files devel
+%{_libdir}/kde4/devel/libkateinterfaces.so
+%{_libdir}/kde4/devel/libkatepartinterfaces.so
+%{_libdir}/libktexteditor_codesnippets_core.so
+%{_includedir}/kde4/kate_export.h
+%{_includedir}/kde4/kate/
+%{_includedir}/kde4/ktexteditor_codesnippets_core/
+
+%files part
+%doc part/AUTHORS part/ChangeLog part/COPYING.LIB
+%doc part/INDENTATION part/NEWS part/README* part/TODO*
+%{_libdir}/kde4/katepart.so
+%{_libdir}/libkatepartinterfaces.so.4*
+%{_datadir}/config/katemoderc
+%{_datadir}/config/katepartpluginsrc
+%{_datadir}/kde4/services/katepart.desktop
+
+%files -n kwrite 
+%{_bindir}/kwrite
+%{_datadir}/kde4/apps/kwrite
+%{_libdir}/libkdeinit4_kwrite.so
+%{_datadir}/applications/kde4/kwrite.desktop
+%{_datadir}/doc/HTML/en/kwrite/
+
+%changelog
+* Mon Aug  1 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-2
+- Initial build for Vine Linux
+
+* Tue Jul 26 2011 Jaroslav Reznik <jreznik@redhat.com> 4.7.0-1
+- 4.7.0
+
+* Mon Jul 18 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.95-1
+- first try
+

k/kde-l10n/kde-l10n-vl.spec

@@ -1,7 +1,7 @@
 Name: kde-l10n
 Summary: Internationalization support for KDE
 Summary(ja): KDE の国際化サポートパッケージ
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
 Group: User Interface/Desktops
@@ -26,9 +26,9 @@ Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.
 #Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
 Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ga-%{version}.tar.bz2
 Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-gl-%{version}.tar.bz2
-Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-gu-%{version}.tar.bz2
+#Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-gu-%{version}.tar.bz2
 Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-he-%{version}.tar.bz2
-Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hi-%{version}.tar.bz2
+#Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hi-%{version}.tar.bz2
 Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hr-%{version}.tar.bz2
 Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hu-%{version}.tar.bz2
 Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ia-%{version}.tar.bz2
@@ -42,7 +42,7 @@ Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kn-%{version}.
 Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
 Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
 Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2
-Source34: ftp://ftp.kde.org/pub/src/stable/%{version}/src/%{name}-mai-%{version}.tar.bz2
+#Source34: ftp://ftp.kde.org/pub/src/stable/%{version}/src/%{name}-mai-%{version}.tar.bz2
 #Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ml-%{version}.tar.bz2
 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
 Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2
@@ -60,10 +60,11 @@ Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.
 Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
 Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2
 Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
-Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
+Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ug-%{version}.tar.bz2
-Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
+Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
-Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
+Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
-Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
+Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
+Source55: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
 Source1000: subdirs-kde-l10n
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -120,9 +121,9 @@ Provides: %{name}-fr = %{version}-%{release}
 #Provides: %{name}-fy = %{version}-%{release}
 Provides: %{name}-ga = %{version}-%{release}
 Provides: %{name}-gl = %{version}-%{release}
-Provides: %{name}-gu = %{version}-%{release}
+#Provides: %{name}-gu = %{version}-%{release}
 Provides: %{name}-he = %{version}-%{release}
-Provides: %{name}-hi = %{version}-%{release}
+#Provides: %{name}-hi = %{version}-%{release}
 Provides: %{name}-hr = %{version}-%{release}
 Provides: %{name}-hu = %{version}-%{release}
 Provides: %{name}-ia = %{version}-%{release}
@@ -135,7 +136,7 @@ Provides: %{name}-kn = %{version}-%{release}
 Provides: %{name}-ko = %{version}-%{release}
 Provides: %{name}-lt = %{version}-%{release}
 Provides: %{name}-lv = %{version}-%{release}
-Provides: %{name}-mai = %{version}-%{release}
+#Provides: %{name}-mai = %{version}-%{release}
 #Provides: %{name}-ml = %{version}-%{release}
 Provides: %{name}-nb = %{version}-%{release}
 Provides: %{name}-nds = %{version}-%{release}
@@ -154,6 +155,7 @@ Provides: %{name}-sr = %{version}-%{release}
 Provides: %{name}-sv = %{version}-%{release}
 Provides: %{name}-th = %{version}-%{release}
 Provides: %{name}-tr = %{version}-%{release}
+Provides: %{name}-ug = %{version}-%{release}
 Provides: %{name}-uk = %{version}-%{release}
 Provides: %{name}-wa = %{version}-%{release}
 Provides: %{name}-zh_CN = %{version}-%{release}
@@ -384,16 +386,16 @@ rm -rf %{buildroot}
 %lang(gl) %{_docdir}/HTML/gl
 %lang(gl) %{_mandir}/gl
 # Gujarati
-%lang(gu) %{_datadir}/locale/gu/LC_MESSAGES/*
+#lang(gu) %{_datadir}/locale/gu/LC_MESSAGES/*
-%lang(gu) %{_datadir}/locale/gu/entry.desktop
+#lang(gu) %{_datadir}/locale/gu/entry.desktop
 # Hebrew
 %lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 %lang(he) %{_datadir}/locale/he/entry.desktop
 %lang(he) %{_datadir}/kde4/apps/klettres/he
 %lang(he) %{_docdir}/HTML/he
 # Hindi
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
+#lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-%lang(hi) %{_datadir}/locale/hi/entry.desktop
+#lang(hi) %{_datadir}/locale/hi/entry.desktop
 # Croatian
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
 %lang(hr) %{_datadir}/locale/hr/LC_SCRIPTS/*
@@ -448,8 +450,8 @@ rm -rf %{buildroot}
 %lang(lv) %{_datadir}/locale/lv/entry.desktop
 %lang(lv) %{_datadir}/locale/lv/LC_SCRIPTS
 # Maithili
-%lang(mai) %{_datadir}/locale/mai/LC_MESSAGES/*
+#lang(mai) %{_datadir}/locale/mai/LC_MESSAGES/*
-%lang(mai) %{_datadir}/locale/mai/entry.desktop
+#lang(mai) %{_datadir}/locale/mai/entry.desktop
 # Malayalam
 #lang(ml) %{_datadir}/locale/ml/LC_MESSAGES/*
 #lang(ml) %{_datadir}/locale/ml/LC_SCRIPTS/
@@ -538,8 +540,6 @@ rm -rf %{buildroot}
 %lang(ru) %{_datadir}/kde4/apps/katepart/syntax/logohighlightstyle.ru.xml
 %lang(ru) %{_datadir}/kde4/apps/klettres/ru
 %lang(ru) %{_datadir}/kde4/apps/ktuberling/sounds/ru*
-%lang(ru) %{_datadir}/kde4/apps/kturtle/data/logokeywords.ru.xml
-%lang(ru) %{_datadir}/kde4/apps/kturtle/examples/ru/*.logo
 %lang(ru) %{_mandir}/ru
 # Slovak
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
@@ -550,9 +550,6 @@ rm -rf %{buildroot}
 %lang(sl) %{_datadir}/kde4/apps/ktuberling/sounds/sl*
 %lang(sl) %{_datadir}/kde4/apps/khangman/sl.txt
 %lang(sl) %{_datadir}/kde4/apps/kvtml/sl
-%lang(sl) %{_datadir}/kde4/apps/katepart/syntax/logohighlightstyle.sl.xml
-%lang(sl) %{_datadir}/kde4/apps/kturtle/data/logokeywords.sl.xml
-%lang(sl) %{_datadir}/kde4/apps/kturtle/examples/sl/*.logo
 %lang(sl) %{_docdir}/HTML/sl
 # Serbian
 %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
@@ -605,6 +602,9 @@ rm -rf %{buildroot}
 %lang(tr) %{_datadir}/kde4/apps/khangman/tr.txt
 %lang(tr) %{_datadir}/kde4/apps/kvtml/tr
 %lang(tr) %{_docdir}/HTML/tr
+# Uyghur
+%lang(ug) %{_datadir}/locale/ug/LC_MESSAGES/*
+%lang(ug) %{_datadir}/locale/ug/entry.desktop
 # Ukrainian
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 %lang(uk) %{_datadir}/locale/uk/LC_SCRIPTS/
@@ -635,6 +635,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jul 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.7.0-1
+- new upstream release
+
 * Mon Jun 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.4-1
 - new upstream release
 

k/kdeaccessibility/kdeaccessibility-vl.spec

@@ -1,21 +1,18 @@
 Name: kdeaccessibility
 Summary: KDE Accessibility
 Summary(ja): KDE アクセシビリティパッケージ
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
-URL: http://www.kde.org/
-Group: Applications/Accessories
 License: GPLv2
+Group: Applications/Accessories
+URL: http://www.kde.org/
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeaccessibility-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
-#BuildRequires: festival
 BuildRequires: speech-dispatcher-devel
-BuildRequires: flite-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
 BuildRequires: soprano-devel
@@ -44,15 +41,6 @@ Provides: kdeaccessibility4-libs = %{version}-%{release}
 %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 
@@ -116,18 +104,6 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
-%post -n mono-icon-theme
-touch --no-create %{_datadir}/icons/mono &> /dev/null || :
-
-%posttrans -n mono-icon-theme
-gtk-update-icon-cache %{_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
-
 
 %files
 %defattr(-,root,root)
@@ -138,7 +114,7 @@ fi
 %{_datadir}/kde4/apps/kmousetool/
 %{_datadir}/kde4/apps/kmouth/
 %{_datadir}/kde4/apps/kttsd/
-%{_datadir}/kde4/apps/color-schemes/*.colors
+#{_datadir}/kde4/apps/color-schemes/*.colors
 %config %{_datadir}/config/*
 %{_datadir}/applications/kde4/*.desktop
 %{_datadir}/kde4/services/*
@@ -158,11 +134,11 @@ fi
 %{_libdir}/libkttsd.so.*
 %{_libdir}/kde4/plugins/accessiblebridge/
 
-%files -n mono-icon-theme
-%defattr(-,root,root,-)
-%{_datadir}/icons/mono/
-
 %changelog
+* Thu Aug  4 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+- mono-icon-theme package was moved to kdeartwork
+
 * Sun Jun 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

k/kdeadmin/kdeadmin-vl.spec

@@ -1,11 +1,11 @@
 Name: kdeadmin
 Summary: KDE Administrative tools
 Summary(ja): KDE 向けシステム管理ツール集
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
-Group: Applications/Administration
 License: GPLv2
+Group: Applications/Administration
 URL: http://www.kde.org/
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeadmin-%{version}.tar.bz2
@@ -14,7 +14,7 @@ Source6: kuser.pam
 Source7: kuser.pamd
 
 # FIXME/TODO: upstream this! -- Rex
-Patch0: kdeadmin-4.5.80-printing.patch
+#Patch0: kdeadmin-4.5.80-printing.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: kdelibs4-devel >= %{version}
@@ -48,7 +48,7 @@ a CUPS print server.
 
 %prep
 %setup -q -n kdeadmin-%{version}
-%patch0 -p1 -b .printing
+#patch0 -p1 -b .printing
 
 %build
 mkdir -p %{_target_platform}
@@ -62,6 +62,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_SYSTEM_CONFIG_PRINTER=TRUE \
     ..
 popd
 
@@ -138,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/apps/system-config-printer-kde/
 
 %changelog
+* Thu Aug  4 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+
 * Sun Jun 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

k/kdeartwork/kdeartwork-vl.spec

@@ -1,7 +1,7 @@
 Name: kdeartwork
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 Summary(ja): KDE 追加テーマ
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: eigen2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: kdegraphics4-devel >= %{version}
+BuildRequires: libkexiv2-devel >= %{version}
 BuildRequires: soprano-devel
 BuildRequires: xscreensaver-extras
 Requires: kdebase-workspace >= %{version}
@@ -22,14 +22,8 @@ Requires: kdebase-workspace >= %{version}
 Obsoletes: kdeartwork4 < %{version}-%{release}
 Provides:  kdeartwork4 = %{version}-%{release}
 
-%if %{name} != kdeartwork
-Conflicts: kdeartwork3
-Conflicts: kdeartwork-locolor
-Conflicts: kdeartwork-kworldclock
-%else
 Obsoletes: kdeartwork-locolor
 Obsoletes: kdeartwork-kworldclock
-%endif
 
 %description
 Additional artwork (themes, sound themes, ...) for KDE
@@ -48,6 +42,17 @@ Requires(postun): gtk2
 %description -n nuvola-icon-theme
 %{summary}.
 
+%package -n mono-icon-theme
+Summary: KDE monochrome icon theme
+Summary(ja): KDE のモノクロアイコン集
+Group: User Interface/Desktops
+BuildArch: noarch
+Requires(post): gtk2
+Requires(postun): gtk2
+
+%description -n mono-icon-theme
+%{summary}.
+
 %package screensavers
 Summary: Additional screensavers for KDE
 Summary(ja): KDE 用追加スクリーンセーバー
@@ -55,9 +60,6 @@ Group: User Interface/Desktops
 Requires: xscreensaver-base
 Requires: xscreensaver-extras
 Requires: kdebase-workspace >= %{version}
-%if %{name} != kdeartwork
-Conflicts: kdeartwork-screensavers
-%endif
 
 %description screensavers
 Additional screensavers for KDE.
@@ -127,6 +129,18 @@ if [ $1 -eq 0 ] ; then
     gtk-update-icon-cache %{_datadir}/icons/nuvola &> /dev/null || :
 fi
 
+%post -n mono-icon-theme
+touch --no-create %{_datadir}/icons/mono &> /dev/null || :
+
+%posttrans -n mono-icon-theme
+gtk-update-icon-cache %{_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
+
 %files
 %defattr(-,root,root)
 %doc COPYING README
@@ -143,6 +157,10 @@ fi
 %defattr(-,root,root,-)
 %{_datadir}/icons/nuvola
 
+%files -n mono-icon-theme
+%defattr(-,root,root,-)
+%{_datadir}/icons/mono/
+
 %files screensavers
 %defattr(-,root,root)
 %{_bindir}/*.kss
@@ -161,6 +179,10 @@ fi
 
 
 %changelog
+* Thu Aug  4 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+- added mono-icon-theme from kdeaccessiblity 
+
 * Wed Jun 15 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

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

@@ -3,7 +3,7 @@
 Name:          kdebase-runtime
 Summary:       KDE Runtime
 Summary(ja):   KDE ランタイム
-Version:       4.6.4
+Version:       4.7.0
 Release:       1%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -11,49 +11,57 @@ License:       LGPLv2+
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 
-Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
+Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-runtime-%{version}.tar.bz2
-Source1:       khelpcenter.desktop
 
+# add shortcuts for search provider
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
-Patch2:        kdebase-runtime-4.2.85-knetattach.patch
+
-Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
+# make icontheme inherit working, https://bugs.kde.org/59901
-Patch5:        kdebase-runtime-4.3.1-manpath.patch
+Patch3:        kdebase-runtime-4.6.90-iconthemes-inherit.patch
+
 # add OnlyShowIn=KDE  to Desktop/Home.desktop (like trash.desktop)
 Patch6:        kdebase-runtime-4.3.3-home_onlyshowin_kde.patch
+
+# correct path for htsearch
 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.6 Upstream patches
+# add overrides in default manpath
+Patch9:        kdebase-runtime-4.3.4-man-overrides.patch
+
+## upstream patches
 
 Provides:  kdebase4-runtime = %{version}-%{release}
+Provides:  kde-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
+Obsoletes: nepomukcontroller
+Provides:  nepomukcontroller = 0.2-5%{?_dist_release}
+
 # knotify4 provides dbus service org.freedesktop.Notifications too 
 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
-
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: alsa-lib-devel
 BuildRequires: attica-devel >= 0.1.4
 BuildRequires: bzip2-devel
 BuildRequires: chrpath
 BuildRequires: clucene-core-devel
-BuildRequires: exiv2-devel
+BuildRequires: doxygen
+BuildRequires: exiv2-devel >= 0.12
+BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcanberra-devel 
+BuildRequires: libqzeitgeist-devel 
 BuildRequires: libsmbclient-devel
 BuildRequires: libssh-devel >= 0.4.2
 BuildRequires: libXpm-devel
 BuildRequires: libXScrnSaver-devel
+BuildRequires: NetworkManager-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openslp-devel
 BuildRequires: openssl-devel
@@ -61,17 +69,24 @@ BuildRequires: pkgconfig
 BuildRequires: polkit-qt-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
-BuildRequires: shared-desktop-ontologies-devel >= 0.5.0
+BuildRequires: shared-mime-info >= 0.40
-BuildRequires: soprano-devel >= 2.5.63
+BuildRequires: shared-desktop-ontologies-devel >= 0.6.50
+BuildRequires: soprano-devel >= 2.6.50
 BuildRequires: xine-lib-devel libxcb-devel
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
-%if %{?_dist_release} == "vl5" 
+Requires: eject
-Conflicts: kdebase3
+Requires: %{name}-libs = %{version}-%{release}
-%endif
+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}
+
 # some items moved -workspace -> -runtime
 Conflicts: kdebase-workspace < 4.5.80
 
@@ -112,21 +127,21 @@ Requires: cagibi
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name}-libs = %{version}-%{release}
+BuildArch: noarch
 
 %description flags
 %{summary}.
 
 
 %prep
-%setup -q -n kdebase-runtime-%{version}
+%setup -q -n kde-runtime-%{version}
 
 %patch1 -p1 -b .searchproviders-shortcuts
-%patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch6 -p1 -b .home_onlyshowin_kde
 %patch7 -p1 -b .htsearch
 %patch8 -p1 -b .config
-
+%patch9 -p1 -b .man-overrides
 
 %build
 mkdir -p %{_target_platform}
@@ -213,6 +228,7 @@ fi
 %{_datadir}/kde4/apps/*
 %exclude %{_datadir}/kde4/apps/cmake/
 %{_datadir}/config/*.knsrc
+%{_datadir}/autostart/nepomukcontroller.desktop
 %{_datadir}/autostart/nepomukserver.desktop
 %{_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
@@ -249,6 +265,7 @@ fi
 %{_datadir}/applications/kde4/Help.desktop
 %{_datadir}/applications/kde4/knetattach.desktop
 %{_datadir}/applications/kde4/nepomukbackup.desktop
+%{_datadir}/applications/kde4/nepomukcontroller.desktop
 %{_datadir}/config/kshorturifilterrc
 %{_datadir}/desktop-directories/*.directory
 %{_datadir}/emoticons/kde4/
@@ -271,6 +288,7 @@ fi
 %{_libdir}/libkwalletbackend.so.*
 %{_libdir}/libmolletnetwork.so.*
 %{_libdir}/libnepomukcommon.so
+%{_libdir}/libnepomukdatamanagement.so
 %{_libdir}/libnepomuksync.so.*
 %{_libdir}/kde4/*.so
 %{_libdir}/kde4/imports/
@@ -285,6 +303,10 @@ fi
 
 
 %changelog
+* Sun Jul 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+- built with exiv2-0.21.1
+
 * Tue Jun 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

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

@@ -1,57 +1,73 @@
 %{!?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.6.4
-
 Name: kdebase-workspace
 Summary: KDE Workspace
 Summary(ja): KDE ワークスペース
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
 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
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-workspace-%{version}.tar.bz2
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-wallpapers-%{version}.tar.bz2
 
 # RH/Fedora-specific startkde changes
-Patch1: kdebase-workspace-4.5.80-redhat_startkde.patch
+Patch1: kdebase-workspace-4.6.95-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
+
 # 441062: packagekit tools do not show icons correctly on KDE
-Patch7: kdebase-workspace-4.0.3-krdb.patch
+Patch7: kdebase-workspace-4.6.80-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
+Patch11: kdebase-workspace-4.6.90-font.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.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.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
+
 # 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:
+# multilib QT_PLUGIN_PATH, http://bugzilla.redhat.com/704840
+Patch24: kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
+
+## upstreamable patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
-Patch50: kdebase-workspace-4.3.3-kde#171685.patch
+Patch50: kdebase-workspace-4.6.80-kde#171685.patch
 
-## 4.6 patches
+# fix for "lightdm integration breaks gdm integration" (4.7 regression)
+# https://bugs.kde.org/show_bug.cgi?id=278206 (patch by Alex Fiestas)
+Patch51: kdebase-workspace-4.7.0-kde#278206.patch
 
 # trunk
 # HALsectomy
@@ -73,55 +89,48 @@ BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: gpsd-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: libcaptury-devel
+#BuildRequires: libcaptury-devel
-BuildRequires: libboost-devel
+#BuildRequires: libboost-devel
 BuildRequires: libdmtx-devel
 BuildRequires: libqalculate-devel
 BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
 BuildRequires: libutempter-devel
-%if %{?_dist_release} !="vl5"
 BuildRequires: libuuid-devel
-%else
-BuildRequires: e2fsprogs-devel
-%endif
 BuildRequires: libxklavier-devel >= 3.0
 BuildRequires: libxml2-devel
+BuildRequires: libXau-devel
+BuildRequires: libXdmcp-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXres-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: libXtst-devel
 BuildRequires: libxkbfile-devel
 BuildRequires: lm-sensors-devel
-BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-devel NetworkManager-glib-devel
 BuildRequires: pam-devel
 BuildRequires: pciutils-devel
 BuildRequires: polkit-qt-devel
+BuildRequires: prison-devel
 BuildRequires: python-devel
-BuildRequires: qedje-devel >= 0.4.0
+#BuildRequires: qedje-devel >= 0.4.0
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 # dropt by Patch700
 #BuildRequires: xmms-devel
-%if %{?_dist_release} !="vl5"
 BuildRequires: xz-devel
-%endif
 
-Requires: %{name}-libs = %{version}-%{release}
-%if %{?_dist_release} != "vl5"
 Requires: polkit-kde
-%endif
+
+Requires: %{name}-libs = %{version}-%{release}
+Requires: kdebase-runtime >= %{version}
 
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
-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: kio_sysinfo
 Requires: ksysguardd = %{version}-%{release}
 
@@ -137,13 +146,15 @@ Requires: xorg-x11-server-utils
 Requires: nepomukcontroller
 
 # moving to non-multilib hack
-Obsoletes: kdebase-workspace < 4.3.0-2
+Obsoletes: kdebase-workspace < 4.6.3-5
 
 Provides: plasma-dataengine-calendar = %{version}-%{release}
+Provides: kde-workspace = %{version}-%{release}
 
-%if %{?_dist_release} == "vl5"
+# kinfocenter moved kdebase-4.4 -> kdebase-workspace-4.5
-Conflicts: kdebase3
+Conflicts: kdebase4 < 4.4.80
-%endif
+# kgreet_* plugins moved here
+Conflicts: kdm < 4.6.90-4
 
 %description
 The KDE Workspace consists of what is the desktop of the
@@ -166,7 +177,6 @@ Summary(ja): %{name} の開発用ファイル
 Group:    Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
-Obsoletes: PolicyKit-kde-devel < 4.3.0
 Provides: solid-bluetooth-devel = %{version}-%{release}
 
 %description devel
@@ -189,10 +199,21 @@ Provides: solid-bluetooth = %{version}-%{release}
 %description -l ja libs
 %{name} のランタイムライブラリです．
 
+%package ksplash-themes
+Summary: KDE ksplash themes
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description ksplash-themes
+%{summary}, including Default (Air and Horos).
+
 %package wallpapers
 Summary: KDE wallpapers
 Summary(ja): KDE ワークスペース用のデスクトップ壁紙集
 Group: User Interface/Desktops
+Provides: kde-wallpapers = %{version}-%{release}
+BuildArch: noarch
 
 %description wallpapers
 %{summary}.
@@ -205,9 +226,6 @@ Provides: kdebase-kdm = %{version}-%{release}
 Provides: service(graphical-login) = kdm
 Requires: kdelibs4 >= %{version}
 Requires: kde-settings-kdm
-%if %{?_dist_release} == "vl5"
-Conflicts: kdebase3
-%endif
 
 %description -n kdm
 KDM provides the graphical login screen, shown shortly after boot up,
@@ -217,9 +235,6 @@ log out, and when user switching.
 Summary: Performance monitor daemon
 Summary(ja): パフォーマンス監視デーモン
 Group: Applications/Services
-%if %{?_dist_release} == "vl5"
-Conflicts: kdebase3
-%endif
 
 %description -n ksysguardd
 %{summary}.
@@ -228,6 +243,7 @@ Conflicts: kdebase3
 Summary: Oxygen cursor themes
 Summary(ja): Oxygen カーソルテーマ
 Group: User Interface/Desktops
+BuildArch: noarch
 
 %description -n oxygen-cursor-themes
 %{summary}.
@@ -279,14 +295,20 @@ Requires: akonadi
 
 
 %prep
-%setup -q
+%setup -q -T -c -a 0
+%setup -q -T -D -a 1
+
+# mimic old kdebase-workspace behaviour to match package name
+mv kde-workspace-%{version} %{name}-%{version}
+
+pushd %{name}-%{version}
 
 %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 .systemsettings_onlyshowin_kde
-%patch7 -p0 -b .krdb
+%patch7 -p1 -b .krdb
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
@@ -297,49 +319,70 @@ Requires: akonadi
 %patch20 -p1 -b .xsession_errors_O_APPEND
 %patch21 -p1 -b .platformplugin-widgetstyle4
 %patch23 -p1 -b .startkde_zenity
+%patch24 -p1 -b .multilib_qt_plugin_path
 
-# upstream patches
+# upstreamable patches
 %patch50 -p1 -b .kde#171685
+%patch51 -p1 -b .kde#278206
 
-# 4.6 patches
+# upstream patches
-
-# trunk patches
 
 # Fedora patches
-#if 0%{?fedora} && 0%{?fedora} > 14
 %patch200 -p0 -b .no_HAL
 %patch210 -p1 -b .no_HAL2
-#endif
 
 # Vine patches
 %patch700 -p1 -b .noxmms
+popd
+
 
 %build
-mkdir -p %{_target_platform}
+pushd %{name}-%{version}
-pushd %{_target_platform}
+    mkdir -p %{_target_platform}
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
+    pushd %{_target_platform}
-%cmake \
+        unset QTDIR || : ; . /etc/profile.d/qt4.sh
-    -DCMAKE_BUILD_TYPE=release \
+	%cmake \
-    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+	    -DCMAKE_BUILD_TYPE=release \
-    -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
+	    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
+	    -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
-    -DLIB_INSTALL_DIR:PATH=%{_libdir} \
+	    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
-    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
+	    -DLIB_INSTALL_DIR:PATH=%{_libdir} \
-    -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
+	    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
-    -DKDE4_KDM_PAM_SERVICE=kdm \
+	    -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
-    -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
+	    -DKDE4_KDM_PAM_SERVICE=kdm \
-    -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
+	    -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
-    ..
+	    -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
+	    ..
+    popd
+
+    make -C %{_target_platform}
+ 
 popd
 
-# FIXME: not smp-safe?
+pushd kde-wallpapers-%{version}
-make -C %{_target_platform}
+    mkdir -p %{_target_platform}
+    pushd %{_target_platform}
+        unset QTDIR || : ; . /etc/profile.d/qt4.sh
+	%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} 
 
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{name}-%{version}/%{_target_platform}
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C kde-wallpapers-%{version}/%{_target_platform}
 
 # xsession support
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
@@ -360,35 +403,10 @@ ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
 ## unpackaged files
-rm -fv $RPM_BUILD_ROOT%{_libdir}/kde4/libpolkitkdeprivate*.so
-
-%if %{?_dist_release} == "vl5"
-# move devel symlinks (for Vine Linux 5)
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/devel
-pushd $RPM_BUILD_ROOT%{_libdir}
-for i in lib*.so
-do
-  case "$i" in
-# conflicts with kdelibs3
-    libkscreensaver.so)
-      linktarget=`readlink "$i"`
-      rm -f "$i"
-      ln -sf "../../$linktarget" "kde4/devel/$i"
-      ;;
-# conflicts with kdebase3
-    libkdecorations.so | libkfontinst.so | libksgrd.so | libtaskmanager.so)
-      linktarget=`readlink "$i"`
-      rm -f "$i"
-      ln -sf "../../$linktarget" "kde4/devel/$i"
-      ;;
-  esac
-done
-popd
-%endif
 
 %check
 for f in $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*.desktop ; do
-  desktop-file-validate $f
+    desktop-file-validate $f
 done
 
 %clean
@@ -419,7 +437,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+#doc COPYING README
 %{_bindir}/kaccess
 %{_bindir}/kapplymousetheme
 %{_bindir}/kblankscrn.kss
@@ -447,6 +465,7 @@ fi
 %{_bindir}/kwin*
 %{_bindir}/oxygen-demo
 %{_bindir}/oxygen-settings
+%{_bindir}/oxygen-shadow-demo
 %{_bindir}/plasma-desktop
 %{_bindir}/plasma-netbook
 %{_bindir}/plasma-overlay
@@ -454,6 +473,7 @@ fi
 %{_bindir}/plasmaengineexplorer
 %{_bindir}/plasmoidviewer
 %{_bindir}/plasmawallpaperviewer
+%{_bindir}/remote-widgets-browser
 %{_bindir}/solid-action-desktop-gen
 %{_bindir}/solid-network
 %{_bindir}/startkde
@@ -465,6 +485,7 @@ fi
 %{_datadir}/kde4/apps/kaccess/
 %{_datadir}/kde4/apps/katepart/syntax/plasma-desktop-js.xml
 %{_datadir}/kde4/apps/kcminput/
+%{_datadir}/kde4/apps/kcmkeyboard/
 %{_datadir}/kde4/apps/kcmkeys/
 %{_datadir}/kde4/apps/kcmsolidactions/
 %{_datadir}/kde4/apps/kcmusb/
@@ -504,6 +525,7 @@ fi
 %{_datadir}/config/plasma-overlayrc
 %{_datadir}/config/plasma-themes.knsrc
 %{_datadir}/config/wallpaper.knsrc
+%{_datadir}/config/xcursor.knsrc
 
 %{_datadir}/kde4/services/*
 %exclude %{_datadir}/kde4/services/kdm.desktop
@@ -624,7 +646,7 @@ fi
 %endif
 %{_libdir}/lib*.so
 %{_datadir}/kde4/apps/cmake/modules/*.cmake
-%{_libdir}/cmake/KDE4Workspace-%{kde4workspace_version}/
+%{_libdir}/cmake/KDE4Workspace/*
 %exclude %{_libdir}/libkdeinit*.so
 %exclude %{_libdir}/libkickoff.so
 %exclude %{_libdir}/libpowerdevilui.so
@@ -695,6 +717,9 @@ fi
 %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
+* Sun Jul 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.7.0-1
+- new upstream release
+
 * Tue Jun 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.4-1
 - new upstream release
 

k/kdebase/kdebase-vl.spec

@@ -1,14 +1,14 @@
 Name: kdebase
 Summary: KDE Core Applications
 Summary(ja): KDE の中心を構成するアプリケーション集
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-baseapps-%{version}.tar.bz2
 
 # search path for plugins
 Patch0: kdebase-4.1.80-nsplugins-paths.patch
@@ -26,46 +26,68 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
 patch4: kdebase-4.3.4-bz#609039-chfn-parse.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
+BuildRequires: cyrus-sasl-devel
 BuildRequires: doxygen
 BuildRequires: fontconfig-devel
 BuildRequires: gettext
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
-BuildRequires: libXpm-devel
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: libsmbclient-devel
+BuildRequires: libtidy-devel
+BuildRequires: libXpm-devel
+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 
 BuildRequires: zlib-devel
 
 Requires: %{name}-libs = %{version}-%{release}
-Requires: eject
-
 # Dolphin needs the ioslaves from kdebase-runtime (#438632)
-Requires: kdebase-runtime
+Requires: kdebase-runtime >= 4.7.0
+# for upgrade path, when konsole, kwrite were split out
+Requires: konsole
+Requires: kwrite
 
+Provides:  dolphin = 1.0.2-1
+Provides:  kdebase4 = %{version}-%{release}
+Provides:  kde-baseapps = %{version}-%{release}
 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} 
+Obsoletes: kde-plasma-folderview < 4.3.1-1
-Provides:  kdebase4 = %{version}-%{release}
+Provides:  kde-plasma-folderview = %{?epoch:%{epoch}:}%{version}-%{release} 
+
+Obsoletes: konq-plugins < 4.6.80-1
+Provides:  konq-plugins = %{version}-%{release}
+
+Provides: konqueror = %{version}-%{release}
 
 #Conflicts: kdebase3
 
 %description
-Core applications for KDE 4.
+Core applications for KDE 4, including:
+dolphin : File manager
+kdepasswd : Changes a UNIX password.
+kdialog : Nice dialog boxes from shell scripts
+keditbookmarks : Bookmark oranizer and editor
+kfind : File find utility
+kfmclient : Tool for opening URLs from the command line
+konqueror : Web browser, file manager and document viewer
 
 %description -l ja
 KDE 4 の中心となるアプリケーション集です．
 
-
 %package libs
 Summary: Runtime libraries for %{name}
 Summary(ja): %{name} のランタイムライブラリ
@@ -96,9 +118,9 @@ Obsoletes: kdebase4-devel < %{version}-%{release}
 %{name} の開発用ファイルです．
 
 %prep
-%setup -q -n kdebase-%{version}
+%setup -q -n kde-baseapps-%{version}
+
 %patch0 -p2 -b .nsplugins-paths
-%patch1 -p2 -b .konsole-activetabindex
 %patch2 -p2 -b .home-icon
 %patch3 -p2 -b .kde#228593
 %patch4 -p2 -b .bz#631481
@@ -122,42 +144,56 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
+# konquerorsu only show in KDE
+echo 'OnlyShowIn=KDE;' >> $RPM_BUILD_ROOT%{_datadir}//applications/kde4/konquerorsu.desktop
+
+# create/own some dirs 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde4/apps/konqueror/{kpartplugins,icons,opensearch}
+
+## unpackaged files
+# libs for which there is no (public) api
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib{dolphin,kbookmarkmodel_,konqueror}private.so
 
 # move devel symlinks
-mkdir -p %{buildroot}%{_libdir}/kde4/devel
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/devel
-pushd %{buildroot}%{_libdir}
+pushd $RPM_BUILD_ROOT%{_libdir}
 for i in lib*.so
 do
   case "$i" in
-    libkdeinit4_*.so|libkonsoleprivate.so)
+    libkonq.so|libkonqsidebarplugin.so)
-      ;;
-    *)
       linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
+    *)
+      ;;
   esac
 done
 popd
-# konquerorsu only show in KDE
+
-echo 'OnlyShowIn=KDE;' >> %{buildroot}%{_datadir}/applications/kde4/konquerorsu.desktop
+%find_lang %{name} --all-name --with-kde --without-mo
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+touch --no-create %{_datadir}/icons/oxygen &> /dev/null ||:
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null ||:
 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 ||:
 fi
 
@@ -172,7 +208,8 @@ fi
 %{_datadir}/kde4/apps/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
-#{_datadir}/icons/oxygen/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
 %{_docdir}/HTML/en/*
@@ -183,9 +220,7 @@ fi
 %{_datadir}/config/*
 %{_datadir}/templates/*
 %{_datadir}/templates/.source/*
-%{_datadir}/icons/hicolor/*/*/*
 %{_libdir}/libkdeinit4_*.so
-%{_libdir}/libkonsoleprivate.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -197,6 +232,9 @@ fi
 %{_libdir}/kde4/devel/lib*.so
 
 %changelog
+* Sun Jul 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.7.0-1
+- new upstream release
+
 * Tue Jun 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.4-1
 - new upstream release
 

k/kdegames/kdegames-vl.spec

@@ -1,7 +1,7 @@
 Name: kdegames
 Summary: KDE Games
 Summary(ja): KDE ゲーム集
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -237,6 +237,9 @@ fi
 %{_libdir}/libpala/*.cmake
 
 %changelog
+* Thu Aug  4 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+
 * Sun Jun 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

k/kdelibs/kdelibs-vl.spec

@@ -1,14 +1,20 @@
+%define _qt4_ver 4.7.2
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_version})
+%define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/lib)
+%define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
+
 %define attica_ver 0.2.0
 %define dbusmenu_qt_ver 0.5.2
-%define phonon_ver 4.4.0
+%define phonon_ver 4.5.0
-%define soprano_ver 2.5.60
+%define soprano_ver 2.6.0
 %define strigi_ver 0.7
 
 Summary: KDE Libraries
 Summary(ja): KDE ライブラリ
 Name: kdelibs
-Version: 4.6.4
+Version: 4.7.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -18,38 +24,66 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.
 
 # 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.6.80-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
-# COMMENT ME PLEASE 
+
+# adds the Administration menu from redhat-menus which equals System + Settings
+# This prevents the stuff getting listed twice, under both System and Settings.
 Patch12: kdelibs-4.1.0-xdg-menu.patch
+
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.5.80-libexecdir.patch
+
 # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
-Patch18: kdelibs-4.5.80-kstandarddirs.patch
+Patch18: kdelibs-4.6.90-kstandarddirs.patch
-# COMMENT ME PLEASE
+
+# set build type
 Patch20: kdelibs-4.1.70-cmake.patch
+
 # disable drkonqi by default, RHEL prefers/wants abrt
 Patch24: kdelibs-4.3.1-drkonq.patch
+
 # die rpath die, since we're using standard paths, we can avoid
 # 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.5.80-no_rpath.patch
 
-# upstreamable
+## upstreamable
-
+# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
-# trunk (4.6) upstream
+# reverting to our past gnupg2-only setup.
-
+# TODO: try to use either gpg or gpg2, whichever is available
-# security fix
+Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
-## Not Upstreamed? why not ? -- Rex
+# https://bugs.kde.org/show_bug.cgi?id=269045
+# https://git.reviewboard.kde.org/r/101231/
+Patch51: kdelibs-4.6.2-uri_mimetypes.patch
+# Fix for KHTML form completion regression (kde#277457) from bugs.kde.org
+# attachment (patch by Andrea Iacovitti)
+# https://bugs.kde.org/show_bug.cgi?id=277457#c2
+Patch52: kdelibs-4.6.95-khtml-kde#277457.patch
+
+## upstream
+
+## security fix
+# Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
+## Fedora specific patches
+# make forcefully hal-free build
+Patch300: kdelibs-4.6.80-halectomy.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: alsa-lib-devel
 BuildRequires: aspell-devel
@@ -67,6 +101,7 @@ BuildRequires: gamin-devel
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
 BuildRequires: grantlee-devel
+BuildRequires: herqq-devel
 BuildRequires: jasper-devel
 BuildRequires: krb5-devel
 BuildRequires: libacl-devel libattr-devel
@@ -83,7 +118,7 @@ BuildRequires: phonon-devel >= %{phonon_ver}
 BuildRequires: polkit-qt-devel >= 0.98.1
 BuildRequires: qca2-devel
 BuildRequires: qt4-devel >= 4.6.0
-BuildRequires: shared-desktop-ontologies-devel >= 0.5
+BuildRequires: shared-desktop-ontologies-devel >= 0.7
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver}
 BuildRequires: strigi-devel >= %{strigi_ver}
@@ -113,6 +148,8 @@ Requires: soprano >= %{soprano_ver}
 Requires: strigi-libs >= %{strigi_ver} 
 Requires: docbook-dtds docbook-style-xsl
 Requires: kde-l10n-ja
+Requires: upower udisks
+
 Requires(post): shared-mime-info, desktop-file-utils, coreutils, gtk2
 Requires(postun): shared-mime-info, desktop-file-utils, coreutils, gtk2
 
@@ -157,7 +194,7 @@ KDE 3 ライブラリと KDE 4 ライブラリとの間で共用するファイ
 
 %package devel
 Summary: Header files for compiling KDE applications.
-Summary(ja): KDE アプリケーションをコンパイルするためのヘッダーファイル
+Summary(ja): KDE アプリケーションをコンパイルするためのヘッダファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: attica-devel >= %{attica_ver} 
@@ -166,7 +203,7 @@ Requires: cmake >= 2.6.2-3
 Requires: openssl-devel
 Requires: phonon-devel
 # considered part of nepomuk-devel
-Requires: shared-desktop-ontologies-devel >= 0.5
+Requires: shared-desktop-ontologies-devel >= 0.7
 Requires: qt4-devel
 # do we really still need all these below? -- Rex
 Requires: strigi-devel
@@ -218,13 +255,18 @@ API ドキュメントを含んでいます．
 %patch27 -p1 -b .no_rpath
 
 # upstreamable patches
+%patch50 -p1 -b .knewstuff_gpg2
+%patch51 -p1 -b .uri_mimetypes
+%patch52 -p1 -b .khtml-kde#277457
 
 # upstream patches
 
 # security fix
-## Not Upstreamed? why not ? -- Rex
 %patch200 -p1 -b .CVE-2009-2702
 
+# Fedora patches
+%patch300 -p1 -b .halectomy
+
 
 %build
 
@@ -240,6 +282,8 @@ PATH=$PATH:%{_prefix}/kerberos/bin \
     -DLIB_INSTALL_DIR:PATH=%{_libdir} \
     -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
     -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
+    -DHUPNP_INCLUDE_DIR:PATH=%{_qt4_headerdir} \
+    -DHUPNP_LIBS=%{_qt4_libdir}/libHUpnp.so \
     -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Vine" \
     ..
 popd
@@ -261,13 +305,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
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/plugins/{gui_platform,styles}
 
 ## 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 \
+if [  -f $RPM_BUILD_ROOT%{_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 
+         $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kssl/ca-bundle.crt 
 fi
 
 # move devel symlinks
@@ -288,8 +333,6 @@ do
 done
 popd
 
-#install -p -m 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde4.sh
-#install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde4.csh
 
 # fix Sonnet documentation multilib conflict
 bunzip2 $RPM_BUILD_ROOT%{_docdir}/HTML/en/sonnet/index.cache.bz2
@@ -300,7 +343,7 @@ bzip2 -9 $RPM_BUILD_ROOT%{_docdir}/HTML/en/sonnet/index.cache
 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
+cp -a kdelibs-%{version}-apidocs $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdelibs4-apidocs
 
 find   $RPM_BUILD_ROOT%{_docdir}/HTML/en/ -name 'installdox' -exec rm -fv {} ';'
 rm -vf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \
@@ -419,6 +462,13 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %doc %{_docdir}/HTML/en/kdelibs4-apidocs
 
 %changelog
+* Sat Aug 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-2
+- rebuilt with soprano-2.7.0-2 and akonadi-1.6.0-2
+
+* Sun Jul 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+- added BR: herqq-devel
+
 * Sat Jun 11 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 - added R: kde-l10n-ja

k/kdemultimedia/kdemultimedia-vl.spec

@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Summary: KDE multimedia applications
 Summary(ja): KDE マルチメディアアプリケーション集
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
@@ -12,9 +12,9 @@ Patch700: kdemultimedia-4.4.5-juk_taglib.patch
 # not build with ffmpeg
 Patch701: kdemultimedia-4.6.0-noffmpeg.patch
 
-URL: http://www.kde.org/
-Group: Applications/Multimedia
 License: GPLv2+
+Group: Applications/Multimedia
+URL: http://www.kde.org/
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -149,6 +149,7 @@ fi
 %{_datadir}/kde4/apps/kconf_update/*
 %{_datadir}/kde4/apps/konqsidebartng
 %{_datadir}/kde4/apps/kscd
+%{_datadir}/kde4/apps/plasma/services/mixer.operations
 %{_datadir}/kde4/apps/solid/actions/dragonplayer-opendvd.desktop
 %{_datadir}/kde4/apps/solid/actions/kscd-play-audiocd.desktop
 %{_datadir}/kde4/apps/solid/actions/solid_audiocd.desktop
@@ -183,6 +184,9 @@ fi
 %exclude %{_libdir}/libkdeinit*.so
 
 %changelog
+* Thu Aug  4 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+
 * Sun Jun 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

k/kdenetwork/kdenetwork-vl.spec

@@ -1,11 +1,11 @@
 Name: kdenetwork
 Summary: KDE Network Applications
 Summary(ja): KDE ネットワークアプリケーション集
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
-Group: Applications/Internet
 License: GPLv2
+Group: Applications/Internet
 URL: http://www.kde.org/
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdenetwork-%{version}.tar.bz2
@@ -274,6 +274,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/kppp*
 
 %changelog
+* Fri Aug  5 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+
 * Sun Jun 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

k/kdepim-runtime/kdepim-runtime-vl.spec

@@ -3,11 +3,11 @@
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Summary(ja): KDE PIM ランタイム環境
-Version: 4.6.0
+Version: 4.7.0
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 
-Group: Applications/Productivity
 License: GPLv2
+Group: Applications/Productivity
 URL: http://www.kde.org/
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -21,7 +21,8 @@ BuildRequires: libboost-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
 BuildRequires: openssl-devel
-BuildRequires: shared-desktop-ontologies-devel
+BuildRequires: shared-desktop-ontologies-devel >= 0.6.51
+BuildRequires: shared-mime-info >= 0.30
 BuildRequires: soprano-devel
 BuildRequires: strigi-devel
 BuildRequires: zlib-devel
@@ -134,6 +135,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/config/*rc
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/kde4/services/*
+%{_datadir}/kde4/servicetypes/*
 %{_datadir}/mime/packages/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/kde4/apps/*
@@ -142,15 +144,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/lib*.so.*
-#{_datadir}/locale/*/LC_MESSAGES/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc COPYING.LIB
-#{_includedir}/kde4/akonadi/xml
 %{_libdir}/lib*.so
 
 %changelog
+* Fri Aug  5 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.7.0-1
+- new upstream release
+
 * Sat Jul  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.0-2
 - dropt locale files
 

k/kdepim/kdepim-vl.spec

@@ -1,11 +1,11 @@
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Summary(ja): KDE の個人情報管理(PIM)アプリケーション集
-Version: 4.6.0
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
-Group: Applications/Productivity
 License: GPLv2
+Group: Applications/Productivity
 URL: http://pim.kde.org/
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
@@ -23,12 +23,12 @@ BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: libboost-devel
 BuildRequires: cyrus-sasl-devel
+BuildRequires: dblatex
 BuildRequires: desktop-file-utils
 BuildRequires: grantlee-devel
 BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
-#BuildRequires: kdelibs-experimental-devel
 BuildRequires: libassuan-devel
 BuildRequires: libical-devel
 BuildRequires: libindicate-qt-devel
@@ -39,6 +39,7 @@ BuildRequires: libxslt-devel
 # libmal currently not used, recheck with kdepim-4.3
 BuildRequires: pilot-link-devel >= 0.12.4
 BuildRequires: python-devel
+BuildRequires: shared-desktop-ontologies-devel >= 0.6.51
 BuildRequires: soprano-devel
 BuildRequires: qca2-devel
 BuildRequires: zlib-devel
@@ -155,12 +156,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%config %{_sysconfdir}/dbus-1/system.d/org.kde.kalarmrtcwake.conf
 %{_bindir}/*
-#{_libdir}/libkpilot_*.so
 %{_libdir}/kde4/*.so
 %{_libdir}/kde4/imports/*
 %{_libdir}/strigi/*.so
 %{_libdir}/akonadi/*
+%{_libexecdir}/kde4/kalarm_helper
 %{_datadir}/akonadi/*
 %{_datadir}/applications/kde4/*.desktop
 %{_datadir}/kde4/apps/akregator
@@ -200,6 +202,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/apps/notes-mobile
 %{_datadir}/kde4/apps/tasks-mobile
 %{_datadir}/dbus-1/interfaces/*.xml
+%{_datadir}/dbus-1/system-services/*
 %{_datadir}/autostart/*
 #{_datadir}/akonadi/*
 %{_datadir}/config/*
@@ -208,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/oxygen/*/*/*
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
+%{_datadir}/polkit-1/actions/*.policy
 %doc %{_docdir}/HTML/*/*
 %{_mandir}/man1/*
 
@@ -215,7 +219,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_libdir}/lib*.so.*
 %{_libdir}/kde4/plugins/designer/*.so
-%{_datadir}/locale/*/LC_MESSAGES/*
+#{_datadir}/locale/*/LC_MESSAGES/*
 
 %files devel
 %defattr(-,root,root)
@@ -224,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
 #exclude %{_libdir}/libkpilot_*.so
 
 %changelog
+* Sat Aug  6 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+
 * Wed Jun 22 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.0-1
 - new upstream release
 - added BR: grantlee-devel

k/kdetoys/kdetoys-vl.spec

@@ -1,8 +1,9 @@
 Name: kdetoys
 Summary: KDE Toys and Amusements
 Summary(ja): KDE のおもちゃ
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
+
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdetoys-%{version}.tar.bz2
 
 License: GPLv2
@@ -14,7 +15,7 @@ BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel
 
-Conflicts: kdetoys3
+Obsoletes: kdetoys4 < %{version}-%{release}
 
 %description
 Toys for KDE
@@ -79,6 +80,9 @@ fi
 %{_mandir}/man6/amor.6*
 
 %changelog
+* Fri Aug  5 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+
 * Sun Jun 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

k/kdeutils/kdeutils-vl.spec

@@ -1,7 +1,7 @@
 Name: kdeutils
 Summary: KDE Utilities
 Summary(ja): KDE ユーティリティ集
-Version: 4.6.4
+Version: 4.7.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -18,6 +18,7 @@ BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libarchive-devel 
 BuildRequires: libXpm-devel
+BuildRequires: libXtst-devel
 BuildRequires: libzip-devel
 BuildRequires: plasma-devel >= %{version}
 BuildRequires: python-devel python
@@ -40,12 +41,10 @@ Obsoletes: kdeutils-devel < 4.0.0
 Obsoletes: kdeutils4 < %{version}-%{release}
 Provides:  kdeutils4 = %{version}-%{release}
 
-Requires: kdebase-runtime >= 4.6
+Requires: kdebase-runtime >= 4.7
 Requires: %{name}-libs = %{version}-%{release}
 #Requires: %{name}-printer-applet = %{version}-%{release}
 
-Conflicts: kdeutils3
-
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: inagaki
@@ -212,6 +211,10 @@ fi
 %{_datadir}/kde4/apps/printer-applet
 
 %changelog
+* Sat Aug  6 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+- added BR: libXtst-devel
+
 * Sun Jun 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

k/konsole/konsole-vl.spec

@@ -0,0 +1,91 @@
+Name:    konsole
+Summary: KDE Terminal emulator
+Summary(ja): KDE 端末エミュレータ
+Version: 4.7.0
+Release: 2%{?_dist_release}
+
+# sources: MIT and LGPLv2 and LGPLv2+ and GPLv2+
+License: GPLv2 
+Group:   User Interface/Desktops
+URL:     http://konsole.kde.org/ 
+
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: soprano-devel
+BuildRequires: libX11-devel
+BuildRequires: libXrender-devel
+
+Requires: kdelibs4%{?_kde4_version: >= %{_kde4_version}}
+# when split occurred
+Conflicts: kdebase4 < 4.6.95-10
+
+%description
+%{summary}.
+
+%prep
+%setup -q
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+unset QTDIR || : ; . /etc/profile.d/qt4.sh
+%cmake \
+    -DCMAKE_BUILD_TYPE=release \
+    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+    -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
+    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
+    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
+    -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
+    ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
+
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/konsole.desktop
+
+
+%files 
+%doc COPYING* README
+%{_bindir}/konsole
+%{_bindir}/konsoleprofile
+%{_datadir}/applications/kde4/konsole.desktop
+%{_libdir}/kde4/libkonsolepart.so
+%{_libdir}/libkdeinit4_konsole.so
+%{_libdir}/libkonsoleprivate.so
+%{_datadir}/kde4/apps/konsole/
+%{_datadir}/kde4/services/ServiceMenus/konsolehere.desktop
+%{_datadir}/kde4/services/konsolepart.desktop
+%{_datadir}/kde4/servicetypes/terminalemulator.desktop
+%{_datadir}/doc/HTML/en/konsole/
+
+%changelog
+* Mon Aug  1 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-2
+- Initial build for Vine Linux
+
+* Tue Jul 26 2011 Jaroslav Reznik <jreznik@redhat.com> 4.7.0-1
+- 4.7.0
+
+* Thu Jul 21 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.95-4
+- fix Conflicts: kdebase (wrong epoch)
+
+* Thu Jul 21 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.95-3
+- License: GPLv2 (per FAQ)
+
+* Thu Jul 21 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.95-2
+- fix URL
+- drop Requires: kdebase-runtime (overkill)
+- License: +LGPLv2 
+
+* Mon Jul 18 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.95-1
+- first try