update: KDE 4.5.0, digikam

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

d/digikam/digikam-vl.spec

@@ -1,7 +1,7 @@
 Name:	 digikam
 Summary: A digital camera accessing & photo management application
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 
 Group:	 Applications/Multimedia
 License: GPLv2+
@@ -64,7 +64,11 @@ to use them.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 #Requires: %{name} = %{version}-%{release}
+%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+Requires: kdeedu4-marble-libs >= 4.3.0
+%else
 Requires: kdeedu-marble-libs >= 4.3.0
+%endif
 
 %description libs
 %{summary}.
@@ -146,6 +150,7 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/kde4/*.so
+%{_libexecdir}/kde4/digikamdatabaseserver
 %{_datadir}/kde4/apps/digikam/
 %{_datadir}/kde4/apps/showfoto/
 %{_datadir}/kde4/apps/solid/actions/*.desktop
@@ -170,6 +175,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.3.0-1
+- new upstream release
+
+* Fri Jul 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.2.0-3
+- R: kdeedu4-marble-libs
+
 * Fri Jul 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.2.0-2
 - Initial build for Vine Linux
 

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

@@ -1,90 +1,82 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.4.3
-Release: 1%{?_dist_release}
-URL: http://www.kde.org
 Summary: Internationalization support for KDE
 Summary(ja): KDE の国際化サポート
+Version: 4.5.0
+Release: 1%{?_dist_release}
+
 Group: User Interface/Desktops
 License: LGPLv2
+URL: http://www.kde.org
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
-#Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2
-Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
-Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
+Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca@valencia-%{version}.tar.bz2
 Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-csb-%{version}.tar.bz2
-Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.tar.bz2
-Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-de-%{version}.tar.bz2
-Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-el-%{version}.tar.bz2
-Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-en_GB-%{version}.tar.bz2
-Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
-Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2
-Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2
-Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
-Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2
-Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.tar.bz2
+Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-de-%{version}.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-el-%{version}.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-en_GB-%{version}.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
+Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2
+Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2
+Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2
+Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2
+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}-hi-%{version}.tar.bz2
-Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hu-%{version}.tar.bz2
-Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-it-%{version}.tar.bz2
-Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ja-%{version}.tar.bz2
-Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-km-%{version}.tar.bz2
-Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
-#Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ku-%{version}.tar.bz2
-Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2
-Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
-Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mk-%{version}.tar.bz2
-Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ml-%{version}.tar.bz2
-Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
-Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2
-#Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ne-%{version}.tar.bz2
-Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
-Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
-Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
-Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
-Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
-Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
-Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
-#Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-se-%{version}.tar.bz2
-Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
-Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
-Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
-#Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
-#Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-th-%{version}.tar.bz2
-Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
-Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
-Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
-Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
-Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
-Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
-Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
-Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
-Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-%{version}.tar.bz2
-#Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-bn_IN-%{version}.tar.bz2
-Source55: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-gu-%{version}.tar.bz2
-Source56: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-is-%{version}.tar.bz2
-Source57: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-kn-%{version}.tar.bz2
-Source58: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mai-%{version}.tar.bz2
-#Source59: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-mr-%{version}.tar.bz2
-Source60: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-ro-%{version}.tar.bz2
-Source61: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-tg-%{version}.tar.bz2
-Source62: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-hr-%{version}.tar.bz2
-#Source63: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-hne-%{version}.tar.bz2
-Source64: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-ca@valencia-%{version}.tar.bz2
-Source65: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-si-%{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
+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
+Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-id-%{version}.tar.bz2
+Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-is-%{version}.tar.bz2
+Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-it-%{version}.tar.bz2
+Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ja-%{version}.tar.bz2
+Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2
+Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-km-%{version}.tar.bz2
+Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kn-%{version}.tar.bz2
+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/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
+Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
+Source38: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
+Source39: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
+Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
+Source41: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
+Source42: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
+Source43: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ro-%{version}.tar.bz2
+Source44: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
+Source45: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
+Source46: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
+Source47: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
+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
+Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-wa-%{version}.tar.bz2
+Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
+Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2
+# copy from kde-l10n-4.4.5, it only contains kdepim translations
+Source500: kde-l10n-kdepim-4.4.5.tar.bz2
 Source1000: subdirs-kde-l10n
 
+Patch0: kde-l10n-nl-4.5.0-dtd.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 BuildRequires: kdelibs4-devel >= 4.4
 BuildRequires: findutils
 BuildRequires: gettext
-#BuildRequires: kde-filesystem >= 4
 BuildRequires: cmake
-#Requires: kde-filesystem
 
 Provides: %{name}-ja = %{version}-%{release}
 
@@ -101,19 +93,18 @@ Summary: Internationalization support for KDE (except Japanese)
 Summary(ja): KDE の国際化サポート (日本語以外) 
 Group: User Interface/Desktops
 Provides: %{name}-ar = %{version}-%{release}
-#Provides: %{name}-bn_IN = %{version}-%{release}
-#Obsoletes: %{name}-Bengali
 Provides: %{name}-bg = %{version}-%{release}
 Provides: %{name}-ca = %{version}-%{release}
+Provides: %{name}-ca@valencia = %{version}-%{release}
 Provides: %{name}-cs = %{version}-%{release}
-Provides: %{name}-csb = %{version}-%{release}
 Provides: %{name}-da = %{version}-%{release}
 Provides: %{name}-de = %{version}-%{release}
 Provides: %{name}-el = %{version}-%{release}
 Provides: %{name}-en_GB = %{version}-%{release}
+Provides: %{name}-eo = %{version}-%{release}
 Provides: %{name}-es = %{version}-%{release}
-Provides: %{name}-eu = %{version}-%{release}
 Provides: %{name}-et = %{version}-%{release}
+Provides: %{name}-eu = %{version}-%{release}
 Provides: %{name}-fi = %{version}-%{release}
 Provides: %{name}-fr = %{version}-%{release}
 Provides: %{name}-fy = %{version}-%{release}
@@ -122,29 +113,26 @@ Provides: %{name}-gl = %{version}-%{release}
 Provides: %{name}-gu = %{version}-%{release}
 Provides: %{name}-he = %{version}-%{release}
 Provides: %{name}-hi = %{version}-%{release}
-#Provides: %{name}-hne = %{version}-%{release}
 Provides: %{name}-hr = %{version}-%{release}
 Provides: %{name}-hu = %{version}-%{release}
+Provides: %{name}-ia = %{version}-%{release}
+Provides: %{name}-id = %{version}-%{release}
 Provides: %{name}-is = %{version}-%{release}
 Provides: %{name}-it = %{version}-%{release}
-Provides: %{name}-kn = %{version}-%{release}
 Provides: %{name}-kk = %{version}-%{release}
 Provides: %{name}-km = %{version}-%{release}
+Provides: %{name}-kn = %{version}-%{release}
 Provides: %{name}-ko = %{version}-%{release}
-#Provides: %{name}-ku = %{version}-%{release}
 Provides: %{name}-lt = %{version}-%{release}
-Provides: %{name}-nds = %{version}-%{release}
 Provides: %{name}-lv = %{version}-%{release}
-Provides: %{name}-mk = %{version}-%{release}
-Provides: %{name}-mai = %{version}-%{release}
 Provides: %{name}-ml = %{version}-%{release}
-#Provides: %{name}-mr = %{version}-%{release}
+Provides: %{name}-nb = %{version}-%{release}
+Provides: %{name}-nds = %{version}-%{release}
 Provides: %{name}-nl = %{version}-%{release}
-Provides: %{name}-no = %{version}-%{release}
 Provides: %{name}-nn = %{version}-%{release}
+Provides: %{name}-pa = %{version}-%{release}
 Provides: %{name}-pl = %{version}-%{release}
 Provides: %{name}-pt = %{version}-%{release}
-Provides: %{name}-pa = %{version}-%{release}
 Provides: %{name}-pt_BR = %{version}-%{release}
 Provides: %{name}-ro = %{version}-%{release}
 Provides: %{name}-ru = %{version}-%{release}
@@ -152,36 +140,12 @@ Provides: %{name}-sk = %{version}-%{release}
 Provides: %{name}-sl = %{version}-%{release}
 Provides: %{name}-sr = %{version}-%{release}
 Provides: %{name}-sv = %{version}-%{release}
-Provides: %{name}-tg = %{version}-%{release}
-#Provides: %{name}-th = %{version}-%{release}
+Provides: %{name}-th = %{version}-%{release}
 Provides: %{name}-tr = %{version}-%{release}
 Provides: %{name}-uk = %{version}-%{release}
 Provides: %{name}-wa = %{version}-%{release}
 Provides: %{name}-zh_CN = %{version}-%{release}
 Provides: %{name}-zh_TW = %{version}-%{release}
-%if %{buildall}
-Provides: %{name}-af = %{version}-%{release}
-Provides: %{name}-az = %{version}-%{release}
-Provides: %{name}-be = %{version}-%{release}
-Provides: %{name}-bo = %{version}-%{release}
-Provides: %{name}-br = %{version}-%{release}
-Provides: %{name}-bs = %{version}-%{release}
-Provides: %{name}-cy = %{version}-%{release}
-Provides: %{name}-eo = %{version}-%{release}
-Provides: %{name}-fa = %{version}-%{release}
-Provides: %{name}-fo = %{version}-%{release}
-Provides: %{name}-id = %{version}-%{release}
-Provides: %{name}-lo = %{version}-%{release}
-Provides: %{name}-mi = %{version}-%{release}
-Provides: %{name}-mt = %{version}-%{release}
-Provides: %{name}-ne = %{version}-%{release}
-Provides: %{name}-se = %{version}-%{release}
-Provides: %{name}-oc = %{version}-%{release}
-Provides: %{name}-ta = %{version}-%{release}
-Provides: %{name}-ven = %{version}-%{release}
-Provides: %{name}-vi = %{version}-%{release}
-Provides: %{name}-xh = %{version}-%{release}
-%endif
 
 %description extra
 Internationalization support for KDE
@@ -195,7 +159,11 @@ for i in $(cat %{SOURCE1000}) ; do
   bzip2 -dc %{_sourcedir}/%{name}-$i-%{version}.tar.bz2 | tar -xf -
 done
 
+%patch0 -p0 -b .dtd
+
 # upstream patches
+bzip2 -dc %{SOURCE500} | tar -xf -
+
 
 %build
 for i in $(cat %{SOURCE1000}) ; do
@@ -223,6 +191,10 @@ for i in $(cat %{SOURCE1000}) ; do
       if [ -e $j/docs/kdepim/CMakeLists.txt ] ; then
         sed -i -e 's/add_subdirectory( *kpilot *)/#add_subdirectory(kpilot)/g' $j/docs/kdepim/CMakeLists.txt
       fi
+      # kdepim ad-hoc fix
+      if [ -e $j/messages/kdepim ] ; then
+        echo "add_subdirectory( kdepim )" >> $j/messages/CMakeLists.txt
+      fi
     fi
   done
   mkdir -p %{_target_platform}
@@ -235,6 +207,7 @@ for i in $(cat %{SOURCE1000}) ; do
     -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
     -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} ..
   popd
+  make -C %{_target_platform} 
   popd
   fi
 done
@@ -275,43 +248,15 @@ rm -rf %{buildroot}
 
 %files extra
 %defattr(-,root,root)
-
-%if %{buildall} 
-# Afrikaans
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-%lang(af) %{_datadir}/locale/af/entry.desktop
-%endif
 # Arabic
 %lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
 %lang(ar) %{_datadir}/locale/ar/entry.desktop
 %lang(ar) %{_datadir}/locale/ar/LC_SCRIPTS/
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
-%if %{buildall}
-# Azerbaijani
-%lang(az) %{_datadir}/locale/az/LC_MESSAGES/*
-%lang(az) %{_datadir}/locale/az/entry.desktop
-# Belarusian
-%lang(be) %{_datadir}/locale/be/LC_MESSAGES/*
-%lang(be) %{_datadir}/locale/be/entry.desktop
-%endif
 # Bulgarian
 %lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 %lang(bg) %{_datadir}/locale/bg/entry.desktop
 %lang(bg) %{_datadir}/kde4/apps/kvtml/bg
-# Bengali-India
-#lang(bn_IN) %{_datadir}/locale/bn_IN/LC_MESSAGES/*
-#lang(bn_IN) %{_datadir}/locale/bn_IN/entry.desktop
-%if %{buildall}
-# Tibetan
-%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/*
-%lang(bo) %{_datadir}/locale/bo/entry.desktop
-# Breton
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
-%lang(br) %{_datadir}/locale/br/entry.desktop
-# Bosnian
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
-%lang(bs) %{_datadir}/locale/bs/entry.desktop
-%endif
 # Catalan
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_datadir}/locale/ca/LC_SCRIPTS/
@@ -321,7 +266,7 @@ rm -rf %{buildroot}
 %lang(ca) %{_datadir}/kde4/apps/kvtml/ca
 %lang(ca) %{_datadir}/kde4/apps/kvtml/latinCatalan*
 %lang(ca) %{_docdir}/HTML/ca
-%lang(ca) %{_mandir}/ca/*/*
+%lang(ca) %{_mandir}/ca
 # Catalan-Valencian
 %lang(ca@valencia) %{_datadir}/locale/ca@valencia/LC_MESSAGES/*
 %lang(ca@valencia) %{_datadir}/locale/ca@valencia/entry.desktop
@@ -332,11 +277,6 @@ rm -rf %{buildroot}
 %lang(cs) %{_datadir}/kde4/apps/klettres/cs
 %lang(cs) %{_datadir}/kde4/apps/kvtml/cs
 %lang(cs) %{_docdir}/HTML/cs
-%if %{buildall}
-# Welsh
-%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
-%lang(cy) %{_datadir}/locale/cy/entry.desktop
-%endif
 # Danish
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
 %lang(da) %{_datadir}/locale/da/entry.desktop
@@ -345,7 +285,7 @@ rm -rf %{buildroot}
 %lang(da) %{_datadir}/kde4/apps/klettres/da
 %lang(da) %{_datadir}/kde4/apps/kvtml/da
 %lang(da) %{_docdir}/HTML/da
-%lang(da) %{_mandir}/da/*/*
+%lang(da) %{_mandir}/da
 # German
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
 %lang(de) %{_datadir}/locale/de/LC_SCRIPTS/
@@ -356,14 +296,11 @@ rm -rf %{buildroot}
 %lang(de) %{_datadir}/kde4/apps/kvtml/de
 %lang(de) %{_datadir}/kde4/apps/step/objinfo/l10n/de/
 %lang(de) %{_docdir}/HTML/de
-%lang(de) %{_mandir}/de/*/*
+%lang(de) %{_mandir}/de
 # Greek
 %lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
 %lang(el) %{_datadir}/locale/el/entry.desktop
 %lang(el) %{_datadir}/kde4/apps/kvtml/el
-# Gujarati
-%lang(gu) %{_datadir}/locale/gu/LC_MESSAGES/*
-%lang(gu) %{_datadir}/locale/gu/entry.desktop
 # British
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/locale/en_GB/entry.desktop
@@ -385,34 +322,24 @@ rm -rf %{buildroot}
 %lang(es) %{_datadir}/kde4/apps/klettres/es
 %lang(es) %{_datadir}/kde4/apps/kvtml/es
 %lang(es) %{_docdir}/HTML/es
-%lang(es) %{_mandir}/es/*/*
+%lang(es) %{_mandir}/es
 # Estonian
 %lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
 %lang(et) %{_datadir}/locale/et/entry.desktop
 %lang(et) %{_datadir}/kde4/apps/khangman/et.txt
 %lang(et) %{_datadir}/kde4/apps/kvtml/et
 %lang(et) %{_docdir}/HTML/et
-%lang(et) %{_mandir}/et/*/*
+%lang(et) %{_mandir}/et
 # Basque
 %lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
 %lang(eu) %{_datadir}/locale/eu/entry.desktop
 %lang(eu) %{_docdir}/HTML/eu
-%if %{buildall}
-# Farsi
-%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
-%lang(fa) %{_datadir}/locale/fa/entry.desktop
-%endif
 # Finnish
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
 %lang(fi) %{_datadir}/locale/fi/entry.desktop
 %lang(fi) %{_datadir}/kde4/apps/khangman/fi.txt
 %lang(fi) %{_datadir}/kde4/apps/ktuberling/sounds/fi*
 %lang(fi) %{_datadir}/kde4/apps/kvtml/fi
-%if %{buildall}
-# Faroese
-%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/*
-%lang(fo) %{_datadir}/locale/fo/entry.desktop
-%endif
 # French
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
 %lang(fr) %{_datadir}/locale/fr/entry.desktop
@@ -420,12 +347,10 @@ rm -rf %{buildroot}
 %lang(fr) %{_datadir}/kde4/apps/khangman/fr.txt
 %lang(fr) %{_datadir}/kde4/apps/kvtml/fr
 %lang(fr) %{_docdir}/HTML/fr
-%lang(fr) %{_mandir}/fr/*/*
-
+%lang(fr) %{_mandir}/fr
 # Frisian
 %lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
 %lang(fy) %{_datadir}/locale/fy/entry.desktop
-
 # Irish
 %lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
 %lang(ga) %{_datadir}/locale/ga/LC_SCRIPTS/
@@ -440,26 +365,22 @@ rm -rf %{buildroot}
 %lang(gl) %{_datadir}/kde4/apps/ktuberling/sounds/gl.soundtheme
 %lang(gl) %{_datadir}/kde4/apps/ktuberling/sounds/gl/
 %lang(gl) %{_docdir}/HTML/gl
-%lang(gl) %{_mandir}/gl/*/*
+%lang(gl) %{_mandir}/gl
+# Gujarati
+%lang(gu) %{_datadir}/locale/gu/LC_MESSAGES/*
+%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/entry.desktop
-
-# Chhattisgarhi
-#lang(hne) %{_datadir}/locale/hne/LC_MESSAGES/*
-#lang(hne) %{_datadir}/locale/hne/entry.desktop
-
 # Croatian
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
 %lang(hr) %{_datadir}/locale/hr/LC_SCRIPTS/*
 %lang(hr) %{_datadir}/locale/hr/entry.desktop
-
 # Hungarian
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(hu) %{_datadir}/locale/hu/entry.desktop
@@ -467,11 +388,12 @@ rm -rf %{buildroot}
 %lang(hu) %{_datadir}/kde4/apps/kvtml/hu
 %lang(hu) %{_datadir}/kde4/apps/klettres/hu
 %lang(hu) %{_docdir}/HTML/hu
-%if %{buildall}
+# Interlingua
+%lang(ia) %{_datadir}/locale/ia/LC_MESSAGES/*
+%lang(ia) %{_datadir}/locale/ia/entry.desktop
 # Indonesian
 %lang(id) %{_datadir}/locale/id/LC_MESSAGES/*
 %lang(id) %{_datadir}/locale/id/entry.desktop
-%endif
 # Icelandic
 %lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
 %lang(is) %{_datadir}/locale/is/entry.desktop
@@ -483,36 +405,47 @@ rm -rf %{buildroot}
 %lang(it) %{_datadir}/kde4/apps/kvtml/it
 %lang(it) %{_docdir}/HTML/it
 %lang(it) %{_datadir}/kde4/apps/step/objinfo/l10n/it/
-%lang(it) %{_mandir}/it/*/*
-# Kannada
-%lang(kn) %{_datadir}/locale/kn/LC_MESSAGES/*
-%lang(kn) %{_datadir}/locale/kn/entry.desktop
-# Kashubian
-%lang(csb) %{_datadir}/locale/csb/LC_MESSAGES/*
-%lang(csb) %{_datadir}/locale/csb/entry.desktop
+%lang(it) %{_mandir}/it
 # Kazakh
 %lang(kk) %{_datadir}/locale/kk/LC_MESSAGES/*
 %lang(kk) %{_datadir}/locale/kk/entry.desktop
 # Khmer
 %lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
 %lang(km) %{_datadir}/locale/km/entry.desktop
+# Kannada
+%lang(kn) %{_datadir}/locale/kn/LC_MESSAGES/*
+%lang(kn) %{_datadir}/locale/kn/entry.desktop
 # Korean
 %lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/*
 %lang(ko) %{_datadir}/locale/ko/LC_SCRIPTS/
 %lang(ko) %{_datadir}/locale/ko/entry.desktop
 %lang(ko) %{_docdir}/HTML/ko/
-# Kurdish
-#lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
-#lang(ku) %{_datadir}/locale/ku/entry.desktop
-%if %{buildall}
-# Lao
-%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
-%lang(lo) %{_datadir}/locale/lo/entry.desktop
-%endif
 # Lithuanian
 %lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
 %lang(lt) %{_datadir}/locale/lt/entry.desktop
 %lang(lt) %{_docdir}/HTML/lt/
+%lang(lt) %{_mandir}/lt
+# Latvian
+%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
+%lang(lv) %{_datadir}/locale/lv/entry.desktop
+%lang(lv) %{_datadir}/locale/lv/LC_SCRIPTS
+# Malayalam
+%lang(ml) %{_datadir}/locale/ml/LC_MESSAGES/*
+%lang(ml) %{_datadir}/locale/ml/LC_SCRIPTS/
+%lang(ml) %{_datadir}/locale/ml/entry.desktop
+%lang(ml) %{_datadir}/kde4/apps/klettres/ml/
+# Norwegian
+%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
+%lang(nb) %{_datadir}/locale/nb/LC_SCRIPTS/
+%lang(nb) %{_datadir}/locale/nb/entry.desktop
+%lang(nb) %{_datadir}/kde4/apps/khangman/nb.txt
+%lang(nb) %{_datadir}/kde4/apps/kvtml/nb/
+%lang(nb) %{_docdir}/HTML/nb/
+%lang(nb) %{_datadir}/kde4/apps/klettres/nb
+%lang(nb) %{_datadir}/kde4/apps/katepart/syntax/logohighlightstyle.nb.xml
+%lang(nb) %{_datadir}/kde4/apps/kturtle/data/logokeywords.nb.xml
+%lang(nb) %{_datadir}/kde4/apps/kturtle/examples/nb/*.logo
+%lang(nb) %{_mandir}/nb
 # LowSaxon
 %lang(nds) %{_datadir}/locale/nds/LC_MESSAGES/*
 %lang(nds) %{_datadir}/locale/nds/entry.desktop
@@ -523,37 +456,6 @@ rm -rf %{buildroot}
 %lang(nds) %{_datadir}/kde4/apps/katepart/syntax/logohighlightstyle.nds.xml
 %lang(nds) %{_datadir}/kde4/apps/kturtle/examples/nds
 %lang(nds) %{_docdir}/HTML/nds
-# Latvian
-%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
-%lang(lv) %{_datadir}/locale/lv/entry.desktop
-%lang(lv) %{_datadir}/locale/lv/LC_SCRIPTS
-%if %{buildall}
-# Maori
-%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/*
-%lang(mi) %{_datadir}/locale/mi/entry.desktop
-%endif
-# Macedonian
-%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
-%lang(mk) %{_datadir}/locale/mk/entry.desktop
-# Maithili
-%lang(mai) %{_datadir}/locale/mai/LC_MESSAGES/*
-%lang(mai) %{_datadir}/locale/mai/entry.desktop
-# Marathi
-#lang(mr) %{_datadir}/locale/mr/LC_MESSAGES/*
-#lang(mr) %{_datadir}/locale/mr/entry.desktop
-# Malayalam
-%lang(ml) %{_datadir}/locale/ml/LC_MESSAGES/*
-%lang(ml) %{_datadir}/locale/ml/LC_SCRIPTS/
-%lang(ml) %{_datadir}/locale/ml/entry.desktop
-%lang(ml) %{_datadir}/kde4/apps/klettres/ml/
-%if %{buildall}
-# Maltese
-%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
-%lang(mt) %{_datadir}/locale/mt/entry.desktop
-# Nepali
-%lang(ne) %{_datadir}/locale/ne/LC_MESSAGES/*
-%lang(ne) %{_datadir}/locale/ne/entry.desktop
-%endif
 # Dutch
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
 %lang(nl) %{_datadir}/locale/nl/LC_SCRIPTS/
@@ -565,27 +467,7 @@ rm -rf %{buildroot}
 %lang(nl) %{_datadir}/kde4/apps/katepart/syntax/logohighlightstyle.nl.xml
 %lang(nl) %{_datadir}/kde4/apps/kturtle/data/logokeywords.nl.xml
 %lang(nl) %{_datadir}/kde4/apps/kturtle/examples/nl/*.logo
-%lang(nl) %{_mandir}/nl/*/*
-%if %{buildall}
-# NorthernSami
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-%lang(se) %{_datadir}/locale/se/entry.desktop
-%endif
-# Norwegian
-%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
-%lang(nb) %{_datadir}/locale/nb/LC_SCRIPTS/
-%lang(nb) %{_datadir}/locale/nb/entry.desktop
-%lang(nb) %{_datadir}/kde4/apps/khangman/nb.txt
-%lang(nb) %{_datadir}/kde4/apps/kvtml/nb/
-%lang(nb) %{_docdir}/HTML/nb/
-%lang(nb) %{_datadir}/kde4/apps/klettres/nb
-%lang(nb) %{_datadir}/kde4/apps/katepart/syntax/logohighlightstyle.nb.xml
-%lang(nb) %{_datadir}/kde4/apps/kturtle/data/logokeywords.nb.xml
-%lang(nb) %{_datadir}/kde4/apps/kturtle/examples/nb/*.logo
-%lang(nb) %{_mandir}/nb/*/*
-# Sinhala
-%lang(si) %{_datadir}/locale/si/LC_MESSAGES/*
-%lang(si) %{_datadir}/locale/si/entry.desktop
+%lang(nl) %{_mandir}/nl
 # Norwegian-Nynorsk
 %lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
 %lang(nn) %{_datadir}/locale/nn/LC_SCRIPTS/
@@ -593,12 +475,6 @@ rm -rf %{buildroot}
 %lang(nn) %{_datadir}/kde4/apps/khangman/nn.txt
 %lang(nn) %{_datadir}/kde4/apps/kvtml/nn/
 %lang(nn) %{_docdir}/HTML/nn
-#lang(nn) %{_mandir}/nn/*/*
-%if %{buildall}
-# Occitan
-%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
-%lang(oc) %{_datadir}/locale/oc/entry.desktop
-%endif
 # Punjabi
 %lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/*
 %lang(pa) %{_datadir}/locale/pa/entry.desktop
@@ -609,7 +485,7 @@ rm -rf %{buildroot}
 %lang(pl) %{_datadir}/kde4/apps/khangman/pl.txt
 %lang(pl) %{_datadir}/kde4/apps/kvtml/pl
 %lang(pl) %{_docdir}/HTML/pl
-%lang(pl) %{_mandir}/pl/*/*
+%lang(pl) %{_mandir}/pl
 # Portuguese
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %{_datadir}/locale/pt/entry.desktop
@@ -617,7 +493,7 @@ rm -rf %{buildroot}
 %lang(pt) %{_datadir}/kde4/apps/ktuberling/sounds/pt*
 %lang(pt) %{_datadir}/kde4/apps/kvtml/pt
 %lang(pt) %{_docdir}/HTML/pt
-%lang(pt) %{_mandir}/pt/*/*
+%lang(pt) %{_mandir}/pt
 # Brazil
 %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
 %lang(pt_BR) %{_datadir}/locale/pt_BR/entry.desktop
@@ -625,7 +501,7 @@ rm -rf %{buildroot}
 %lang(pt_BR) %{_datadir}/kde4/apps/klettres/pt_BR/*
 %lang(pt_BR) %{_datadir}/kde4/apps/kvtml/pt_BR
 %lang(pt_BR) %{_docdir}/HTML/pt_BR
-%lang(pt_BR) %{_mandir}/pt_BR/*/*
+%lang(pt_BR) %{_mandir}/pt_BR
 # Romanian
 %lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
 %lang(ro) %{_datadir}/locale/ro/entry.desktop
@@ -640,13 +516,13 @@ rm -rf %{buildroot}
 %lang(ru) %{_datadir}/kde4/apps/katepart/syntax/logohighlightstyle.ru.xml
 %lang(ru) %{_datadir}/kde4/apps/kturtle/data/logokeywords.ru.xml
 %lang(ru) %{_datadir}/kde4/apps/kturtle/examples/ru/*.logo
-%lang(ru) %{_mandir}/ru/*/*
+%lang(ru) %{_mandir}/ru
 # Slovak
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
 %lang(sk) %{_datadir}/locale/sk/entry.desktop
-#%lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
-#%lang(sk) %{_kde4_appsdir}/klettres/sk
-%lang(sk) %{_docdir}/HTML/sk
+#lang(sk) %{_kde4_appsdir}/ktuberling/sounds/sk*
+#lang(sk) %{_kde4_appsdir}/klettres/sk
+#lang(sk) %{_docdir}/HTML/sk
 # Slovenian
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
 %lang(sl) %{_datadir}/locale/sl/entry.desktop
@@ -659,21 +535,36 @@ rm -rf %{buildroot}
 %lang(sl) %{_docdir}/HTML/sl
 # Serbian
 %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES
+%lang(sr) %{_datadir}/locale/sr@ijekavian/LC_MESSAGES
+%lang(sr) %{_datadir}/locale/sr@ijekavianlatin/LC_MESSAGES
+%lang(sr) %{_datadir}/locale/sr@latin/LC_MESSAGES
 %lang(sr) %{_datadir}/locale/sr/LC_SCRIPTS/
+%lang(sr) %{_datadir}/locale/sr@ijekavian/LC_SCRIPTS/
+%lang(sr) %{_datadir}/locale/sr@ijekavianlatin/LC_SCRIPTS/
+%lang(sr) %{_datadir}/locale/sr@latin/LC_SCRIPTS/
 %lang(sr) %{_datadir}/locale/sr/entry.desktop
+%lang(sr) %{_datadir}/locale/sr@ijekavian/entry.desktop
+%lang(sr) %{_datadir}/locale/sr@ijekavianlatin/entry.desktop
+%lang(sr) %{_datadir}/locale/sr@latin/entry.desktop
 %lang(sr) %{_datadir}/kde4/apps/ktuberling/sounds/sr*
-%lang(sr) %{_docdir}/HTML/sr
 %lang(sr) %{_datadir}/icons/*/*/*/*/sr/*
 %lang(sr) %{_datadir}/icons/*/*/*/*/sr@latin/*
 %lang(sr) %{_datadir}/icons/*/*/*/*/sr@ijekavian/
 %lang(sr) %{_datadir}/icons/*/*/*/*/sr@ijekavianlatin/
+%lang(sr) %{_datadir}/kde4/apps/desktoptheme/*/icons/l10n/sr
+%lang(sr) %{_datadir}/kde4/apps/desktoptheme/*/icons/l10n/sr@latin
+%lang(sr) %{_datadir}/kde4/apps/desktoptheme/*/icons/l10n/sr@ijekavian
+%lang(sr) %{_datadir}/kde4/apps/desktoptheme/*/icons/l10n/sr@ijekavianlatin
 %lang(sr) %{_datadir}/kde4/apps/desktoptheme/*/widgets/l10n/sr
 %lang(sr) %{_datadir}/kde4/apps/desktoptheme/*/widgets/l10n/sr@latin
 %lang(sr) %{_datadir}/kde4/apps/desktoptheme/*/widgets/l10n/sr@ijekavian
 %lang(sr) %{_datadir}/kde4/apps/desktoptheme/*/widgets/l10n/sr@ijekavianlatin
 %lang(sr) %{_datadir}/kde4/apps/khangman/sr@latin.txt
 %lang(sr) %{_datadir}/kde4/apps/kvtml/sr*
-%lang(sr) %{_mandir}/sr/*/*
+%lang(sr) %{_docdir}/HTML/sr
+%lang(sr) %{_docdir}/HTML/sr@latin
+%lang(sr) %{_mandir}/sr
+%lang(sr) %{_mandir}/sr@latin
 # Swedish
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %{_datadir}/locale/sv/entry.desktop
@@ -682,21 +573,11 @@ rm -rf %{buildroot}
 %lang(sv) %{_datadir}/kde4/apps/khangman/sv.txt
 %lang(sv) %{_datadir}/kde4/apps/kvtml/sv
 %lang(sv) %{_docdir}/HTML/sv
-%lang(sv) %{_mandir}/sv/*/*
-%if %{buildall}
-# Tamil
-%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
-%lang(ta) %{_datadir}/locale/ta/entry.desktop
-%endif
-# Tajik
-%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
-%lang(tg) %{_datadir}/locale/tg/entry.desktop
-%lang(tg) %{_datadir}/kde4/apps/kvtml/tg
-%lang(tg) %{_datadir}/kde4/apps/khangman/tg.txt
+%lang(sv) %{_mandir}/sv
 # Thai
-#lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
-#lang(th) %{_datadir}/locale/th/charset
-#lang(th) %{_datadir}/locale/th/entry.desktop
+%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
+%lang(th) %{_datadir}/locale/th/charset
+%lang(th) %{_datadir}/locale/th/entry.desktop
 # Turkish
 %lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
 %lang(tr) %{_datadir}/locale/tr/entry.desktop
@@ -712,25 +593,12 @@ rm -rf %{buildroot}
 %lang(uk) %{_datadir}/kde4/apps/kvtml/uk
 %lang(uk) %{_datadir}/kde4/apps/step/objinfo/l10n/uk
 %lang(uk) %{_docdir}/HTML/uk
-%lang(uk) %{_mandir}/uk/*/*
-%if %{buildall}
-# Venda
-%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
-%lang(ven) %{_datadir}/locale/ven/entry.desktop
-# Vietnamese
-%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
-%lang(vi) %{_datadir}/locale/vi/entry.desktop
-%endif
+%lang(uk) %{_mandir}/uk
 # Walloon
 %lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
 %lang(wa) %{_datadir}/locale/wa/entry.desktop
 %lang(wa) %{_datadir}/kde4/apps/ktuberling/sounds/wa*
 %lang(wa) %{_docdir}/HTML/wa
-%if %{buildall}
-# Xhosa
-%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
-%lang(xh) %{_datadir}/locale/xh/entry.desktop
-%endif
 # Chinese
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_SCRIPTS/
@@ -744,7 +612,13 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_datadir}/locale/zh_TW/entry.desktop
 %lang(zh_TW) %{_docdir}/HTML/zh_TW
 
+
 %changelog
+* Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.0-1
+- new upstream release
+- added Source500 from Fedora (needed until kdepim-4.5 release)
+- added Patch0 for nl package
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.3-1
 - new upstream release
 

k/kdeaccessibility/kdeaccessibility-vl.spec

@@ -1,10 +1,11 @@
 Name: kdeaccessibility
 Summary: tools for handicapped people to use the GUI
 Summary(ja): ハンディを持つ人の GUI 使用をサポートするツール集
-Version: 4.4.3
-Release: 2%{?_dist_release}
+Version: 4.5.0
+Release: 1%{?_dist_release}
+
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeaccessibility-%{version}.tar.bz2
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 URL: http://www.kde.org/
 Group: Applications/Accessories
 License: GPLv2
@@ -21,12 +22,16 @@ BuildRequires: plasma-devel >= %{version}
 BuildRequires: libXtst-devel
 Requires: %{name}-libs = %{version}-%{release}
 
+%if %{name} != "kdeaccessibility"
+Conflicts: kdeaccessibility < 4
+%endif
+
 %description
 Included with this package are:
+* jovie: text to speech support
 * kmag: a screen magnifier
 * kmousetool: a program for people whom it hurts to click the mouse
 * kmouth: program that allows people who have lost their voice
-* ktts: text to speech support
 
 # 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
@@ -40,7 +45,7 @@ Requires: kdelibs4 >= %{version}
 
 
 %prep
-%setup -q
+%setup -q -n kdeaccessibility-%{version}
 
 %build
 mkdir -p %{_target_platform}
@@ -65,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 # hack around HTML doc multilib conflicts
-for doxy_hack in kmag kmousetool kmouth kttsd ; do
+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
@@ -109,6 +114,7 @@ gtk-update-icon-cache %{_datadir}/icons/mono &> /dev/null || :
 %defattr(-,root,root)
 %doc COPYING
 %{_bindir}/*
+%{_datadir}/kde4/apps/jovie/
 %{_datadir}/kde4/apps/kmag/
 %{_datadir}/kde4/apps/kmousetool/
 %{_datadir}/kde4/apps/kmouth/
@@ -118,10 +124,10 @@ gtk-update-icon-cache %{_datadir}/icons/mono &> /dev/null || :
 %{_datadir}/applications/kde4/*.desktop
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
+%doc %{_docdir}/HTML/en/jovie/
 %doc %{_docdir}/HTML/en/kmag/
 %doc %{_docdir}/HTML/en/kmousetool/
 %doc %{_docdir}/HTML/en/kmouth/
-%doc %{_docdir}/HTML/en/kttsd/
 %{_datadir}/icons/mono
 %{_datadir}/icons/hicolor/*/*/*
 %{_libdir}/kde4/*
@@ -129,9 +135,12 @@ gtk-update-icon-cache %{_datadir}/icons/mono &> /dev/null || :
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/libkttsd.so.4*
+%{_libdir}/libkttsd.so.*
 
 %changelog
+* Sat Aug 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+
 * Tue Jun 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-2
 - added BR: libXtst-devel
 

k/kdeadmin/kdeadmin-vl.spec

@@ -1,29 +1,32 @@
 Name: kdeadmin
-Version: 4.4.3
-Release: 1%{?_dist_release}
 Summary: K Desktop Environment - Administrative tools
 Summary(ja): K デスクトップ環境 - 管理ツール集
+Version: 4.5.0
+Release: 1%{?_dist_release}
+
 Group: Applications/Administration
 License: GPLv2
 URL: http://www.kde.org/
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeadmin-%{version}.tar.bz2
 
 Source6: kuser.pam
 Source7: kuser.pamd
-Source8: kpackage.pam
-Source9: kpackage.pamd
-Source10: kpackagerc
 
-Patch0:         kdeadmin-4.2.85-printing.patch
+Patch0: kdeadmin-4.2.85-printing.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  kdelibs4-devel >= %{version}
-BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  python-devel
-#BuildRequires: smart
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: python-devel
 
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
+Requires: usermode
+
+%if %{name} != "kdeadmin"
+Conflicts: kdeadmin < 4
+%endif
 
 %description
 The %{name} package includes administrative tools including:
@@ -31,17 +34,6 @@ The %{name} package includes administrative tools including:
 * ksystemlog: system log viewer
 * kuser: user manager
 
-%package kpackage
-Summary: An RPM package manager
-Group: Applications/Administration
-Requires: smart
-
-%description kpackage
-Kpackage is an RPM package manager, used for displaying currently installed
-packages, uninstalling them and installing new ones.
-
-It is based upon the "Smart Package Manager".
-
 %package -n system-config-printer-kde
 Summary: A printer administration tool for KDE
 Group: Applications/System
@@ -54,7 +46,7 @@ a CUPS print server.
 
 
 %prep
-%setup -q
+%setup -q -n kdeadmin-%{version}
 %patch0 -p1 -b .printing
 
 %build
@@ -78,18 +70,6 @@ make %{?_smp_mflags} -C %{_target_platform}
 rm -rf $RPM_BUILD_ROOT
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
-# remove kpackage files
-rm -f $RPM_BUILD_ROOT%{_bindir}/kpackage
-rm -rf $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kpackage
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kpackage.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/config/kpackagerc
-rm -f $RPM_BUILD_ROOT%{_datadir}/config.kcfg/kpackageSettings.kcfg
-rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kpackage/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/*/*/kpackage*
-
-# remove broken .pc file which has no business to be in a non-devel pkg anyway
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-
 # Put in some sane defaults
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
 cat >$RPM_BUILD_ROOT%{_datadir}/config/kuserrc <<EOF
@@ -100,9 +80,8 @@ homeBase=/home
 shell=/bin/bash
 userPrivateGroup=true
 EOF
-#install -c -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/config/kpackagerc
 
-# Runkuser through consolehelper
+# Run kuser through consolehelper
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 mv $RPM_BUILD_ROOT/usr/bin/kuser $RPM_BUILD_ROOT/usr/sbin
 ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/kuser
@@ -112,8 +91,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 install -c -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/security/console.apps/kuser
 install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/kuser
-#install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/security/console.apps/kpackage
-#install -c -m 644 %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/kpackage
 
 # delete files conflict with system-tools-backends
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
@@ -126,23 +103,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /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 || :
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%post kpackage
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-
-%posttrans kpackage
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-
-%postun kpackage
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-fi
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -173,24 +137,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/pam.d/kuser
 %{_sysconfdir}/security/console.apps/kuser
 
-#files kpackage
-#defattr(-,root,root,-)
-#%{_bindir}/kpackage
-#%{_datadir}/kde4/apps/kpackage
-#%{_datadir}/applications/kde4/kpackage.desktop
-#%{_datadir}/config/kpackagerc
-#%{_datadir}/config.kcfg/kpackageSettings.kcfg
-#%doc %{_docdir}/HTML/en/kpackage/
-#%{_datadir}/icons/hicolor/*/*/kpackage*
-#%{_sysconfdir}/pam.d/kpackage
-#%{_sysconfdir}/security/console.apps/kpackage
-
 %files -n system-config-printer-kde
 %defattr(-,root,root,-)
 %{_datadir}/kde4/services/system-config-printer-kde.desktop
 %{_datadir}/kde4/apps/system-config-printer-kde/
 
 %changelog
+* Fri Aug 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+- added Requires: usermode
+
+* Mon Jul  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+- added Conflicts: kdeadmin < 4
+
 * Sat May  8 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

k/kdeartwork/kdeartwork-vl.spec

@@ -1,25 +1,38 @@
 Name: kdeartwork
-Version: 4.4.3
-Release: 1%{?_dist_release}
 Summary: Additional artwork (themes, sound themes, ...) for KDE
+Version: 4.5.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/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeartwork-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: xscreensaver-extras
-BuildRequires: xscreensaver-gl-extras
+#BuildRequires: xscreensaver-gl-extras
 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
 
 %package -n nuvola-icon-theme
 Summary: Nuvola icon theme
+Summary(ja): Nuvola アイコンテーマ
 Group: User Interface/Desktops
 Requires(post): gtk2
 Requires(postun): gtk2
@@ -30,8 +43,13 @@ Requires(postun): gtk2
 %package screensavers
 Summary: Additional screensavers for KDE
 Group: User Interface/Desktops
-Requires: xscreensaver-base xscreensaver-extras xscreensaver-gl-extras
+Requires: xscreensaver-base
+Requires: xscreensaver-extras
+#Requires: xscreensaver-gl-extras
 Requires: kdebase-workspace >= %{version}
+%if %{name} != kdeartwork
+Conflicts: kdeartwork-screensavers
+%endif
 
 %description screensavers
 Additional screensavers for KDE.
@@ -39,6 +57,9 @@ Additional screensavers for KDE.
 %package wallpapers
 Summary: Additional wallpapers
 Group: User Interface/Desktops
+%if %{name} != kdeartwork
+Conflicts: kdeartwork-wallpapers
+%endif
 
 %description wallpapers
 %{summary}.
@@ -52,7 +73,7 @@ Group: User Interface/Desktops
 
 
 %prep
-%setup -q
+%setup -q -n kdeartwork-%{version}
 
 %build
 mkdir -p %{_target_platform}
@@ -94,6 +115,7 @@ fi
 %files
 %defattr(-,root,root)
 %doc COPYING README
+%{_datadir}/kde4/apps/aurorae/*
 %{_datadir}/kde4/apps/kstyle/*
 %{_datadir}/kde4/apps/color-schemes/*.colors
 %{_datadir}/kde4/apps/desktoptheme/*
@@ -123,6 +145,19 @@ fi
 
 
 %changelog
+* Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+
+* Mon Jul 12 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-3
+- added more Conflicts: kdeartwork-locolor, kdeartwork-kworldclock
+
+* Sun Jul 11 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-2
+- added Requires: kdebase-workspace
+- added Conflicts: kdeartwork3
+
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

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

@@ -1,8 +1,9 @@
 %define flags 1
 
 Name:          kdebase-runtime
-Summary:       K デスクトップ環境 - ランタイム
-Version:       4.4.3
+Summary:       K Desktop Environment - Runtime
+Summary(ja):   K デスクトップ環境 - ランタイム
+Version:       4.5.0
 Release:       1%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -20,8 +21,12 @@ 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
 
-## 4.4 Upstream patches
-Patch101:      kdebase-runtime-4.4.0-virtuosoconverter.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
+
 
 # when kdesu was removed, this is/should-be only temporary
 Provides:  kdebase4-runtime = %{version}-%{release}
@@ -41,7 +46,6 @@ Requires: htdig
 Requires: oxygen-icon-theme >= %{version}
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-#BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: attica-devel
 BuildRequires: bzip2-devel
@@ -51,12 +55,12 @@ BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libsmbclient-devel
-BuildRequires: libssh-devel >= 0.4.0
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openslp-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
+BuildRequires: polkit-qt-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: shared-desktop-ontologies-devel
@@ -65,20 +69,28 @@ 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" 
+Conflicts: kdebase3
+%endif
+
 %description
 Core runtime for the K Desktop Environment 4.
 
 
 %package libs
 Summary: Runtime libraries for %{name}
+Summary(ja): %{name} のランタイムライブラリ
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-Requires: %{name} = %{version}-%{release}
+#Requires: %{name} = %{version}-%{release}
+# cagibi is runtime dep, a dbus service
+Requires: cagibi
 
 %description libs
 %{summary}.
@@ -102,6 +114,7 @@ Requires: %{name} = %{version}-%{release}
 #patch5 -p1 -b .manpath
 %patch6 -p1 -b .home_onlyshowin_kde
 
+%patch100 -p1 -b .kioslave
 %patch101 -p1 -b .virtuosoconverter
 
 %build
@@ -175,7 +188,13 @@ fi
 
 %files
 %defattr(-,root,root,-)
+%{_sysconfdir}/dbus-1/system.d/*
+%{_sysconfdir}/xdg/menus/kde-information.menu
 %{_bindir}/*
+# omit ksvgtopng which kdelibs3 includes
+%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5" 
+%exclude %{_bindir}/ksvgtopng
+%endif
 # FIXME(?), currently contains cmake/modules -- Rex
 %{_datadir}/kde4/apps/*
 %{_datadir}/config/*.knsrc
@@ -183,11 +202,13 @@ fi
 %{_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
+%{_datadir}/dbus-1/system-services/*
+%{_datadir}/icons/default.kde4
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
 %{_datadir}/mime/packages/network.xml
+%{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
 %{_datadir}/sounds/*
-%{_datadir}/icons/default.kde4
 %{_libdir}/kconf_update_bin/*
 %{_libdir}/libkdeinit4_*.so
 %{_libdir}/kde4/kcm_*.so
@@ -198,7 +219,6 @@ fi
 %{_mandir}/man8/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_docdir}/HTML/en/*
-%{_sysconfdir}/xdg/menus/kde-information.menu
 %{_datadir}/applications/kde4/Help.desktop
 %{_datadir}/applications/kde4/knetattach.desktop
 %{_datadir}/config/kshorturifilterrc
@@ -220,7 +240,7 @@ fi
 %exclude %{_libdir}/kde4/kcm_*.so
 %exclude %{_libdir}/kde4/kded_*.so
 %{_libdir}/kde4/plugins/phonon_platform/
-%{_libdir}/kde4/plugins/styles/
+#{_libdir}/kde4/plugins/styles/
 
 %if 0%{?flags}
 %files flags
@@ -230,6 +250,15 @@ fi
 
 
 %changelog
+* Mon Aug 16 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.0-1
+- new upstream release
+- added Patch100 from Fedora
+  - backport to fix the freeze of kded on first use of the network:/kio-slave
+
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.5-1
+- new upstream release
+- added Conflicts: kdebase3 at Vine Linux 5
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.3-1
 - new upstream release
 

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

@@ -1,9 +1,12 @@
 %{!?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
+
+Name: kdebase-workspace
 Summary: K Desktop Environment - Workspace
 Summary(ja): K デスクトップ環境 - ワークスペース
-Name: kdebase-workspace
-Version: 4.4.3
+Version: 4.5.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -11,30 +14,35 @@ 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.3.95-redhat-startkde.patch
-Patch2: kdebase-workspace-4.3.98-plasma-konsole.patch
-Patch3: kdebase-workspace-4.3.75-show_systemsettings.patch
+Patch1: kdebase-workspace-4.4.80-redhat-startkde.patch
+Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch
+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)
-#Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
+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
 Patch8: kdebase-workspace-4.2.85-klipper-url.patch
 # 434824: KDE4 System Settings - No Method To Enter Administrative Mode
-Patch9: kdebase-workspace-4.3.75-rootprivs.patch
+Patch9: kdebase-workspace-4.4.90-rootprivs.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.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.3.98-battery-plasmoid-showremainingtime.patch
+Patch16: kdebase-workspace-4.4.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.3.75-classicmenu-logout.patch
-Patch19: kdebase-workspace-4.3.4-kdm_plymouth.patch
-Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
+Patch17: kdebase-workspace-4.4.0-classicmenu-logout.patch 
+Patch18: kdebase-workspace-4.4.92-kdm_plymouth.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
@@ -43,12 +51,14 @@ Patch22: kdebase-workspace-4.4.0-classicmenu-games.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
-# kubuntu working to upstream this
-# FIXME: Not upstreamed yet --Ben (4.3.80)
-#Patch51: http://bazaar.launchpad.net/~kubuntu-members/kdebase-workspace/ubuntu/annotate/head%3A/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff
-Patch51: kdebase-workspace-4.3.95-brightness_keys.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.4 patches
+## 4.5 patches
+Patch100: kdebase-workspace-4.5.0-startkde-malloc.patch
 
 # trunk
 
@@ -57,30 +67,43 @@ BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
 BuildRequires: desktop-file-utils
-BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: glib2-devel
+BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: gpsd-devel
 BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libboost-devel
+BuildRequires: libusb-devel
 BuildRequires: libutempter-devel
+%if %{?_dist_release} != "vl4" && %{?_dist_release} !="vl5"
+BuildRequires: libuuid-devel
+%else
+BuildRequires: e2fsprogs-devel
+%endif
 BuildRequires: libxklavier-devel >= 3.0
+BuildRequires: libxml2-devel
+BuildRequires: libXpm-devel
 BuildRequires: libXres-devel
+BuildRequires: libXtst-devel
 BuildRequires: lm-sensors-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
-BuildRequires: polkit-qt-devel >= 0.95.1
-BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel
+BuildRequires: polkit-qt-devel
 BuildRequires: python-devel
 BuildRequires: qedje-devel >= 0.4.0
-BuildRequires: libusb-devel
+BuildRequires: qimageblitz-devel
+BuildRequires: soprano-devel
 BuildRequires: xmms-devel
+%if %{?_dist_release} != "vl4" && %{?_dist_release} !="vl5"
+BuildRequires: xz-devel
+%endif
+BuildRequires: libqalculate-devel
 
 Requires: %{name}-libs = %{version}-%{release}
+%if %{?_dist_release} != "vl4" && %{?_dist_release} != "vl5"
 Requires: polkit-kde
+%endif
 
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
@@ -104,8 +127,9 @@ Requires: kio_sysinfo
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Requires:  polkit-kde
-
+#if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+#Conflicts: kdebase3
+#endif
 
 %description
 The KDE Workspace consists of what is the desktop of the
@@ -119,7 +143,6 @@ This package contains:
 * krunner (a command run interface)
 * ksysguard (a performance monitor)
 * kwin (the window manager of KDE)
-* kxkb (a utility to switch keyboard maps)
 * plasma (the KDE desktop, panels and widgets workspace application)
 * systemsettings (the configuration editor)
 
@@ -130,6 +153,7 @@ Obsoletes: PolicyKit-kde-devel < 4.3.0
 Provides: solid-bluetooth-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
+
 %description devel
 %{summary}.
 
@@ -138,7 +162,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Provides: solid-bluetooth = %{version}-%{release}
 Requires: kdelibs4 >= %{version}
-Requires: %{name} = %{version}-%{release}
+#Requires: %{name} = %{version}-%{release}
 
 %description libs
 %{summary}.
@@ -152,11 +176,15 @@ Group: User Interface/Desktops
 
 %package -n kdm
 Summary: The KDE login manager
+Summary(ja): KDE ログインマネージャ
 Group: User Interface/X
 Provides: kdebase-kdm = %{version}-%{release}
 Provides: service(graphical-login) = kdm
 Requires: kdelibs4 >= %{version}
 Requires: kde-settings-kdm
+%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+Conflicts: kdebase3
+%endif
 
 %description -n kdm
 KDM provides the graphical login screen, shown shortly after boot up,
@@ -165,12 +193,16 @@ log out, and when user switching.
 %package -n ksysguardd
 Summary: Performance monitor daemon
 Group:   System Environment/Daemons
+%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+Conflicts: kdebase3
+%endif
 
 %description -n ksysguardd
 %{summary}.
 
 %package -n oxygen-cursor-themes
 Summary: Oxygen cursor themes
+Summary(ja): Oxygen カーソルテーマ
 Group: User Interface/Desktops
 
 %description -n oxygen-cursor-themes
@@ -186,6 +218,7 @@ Requires: %{name} = %{version}-%{release}
 
 %package python-applet
 Summary: Plasma widget in Python
+Summary(ja): Python で記述された Plasma ウィジェット
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: PyKDE4 >= %{version}
@@ -211,28 +244,33 @@ Requires: akonadi
 %patch1 -p1 -b .redhat-startkde
 %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
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-%patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
 %patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
-%if 0%{?plymouth_hack_spool}
-%patch19 -p1 -b .kdm_plymouth
-%endif
+%patch18 -p1 -b .kdm_plymouth
+#patch19 -p1 -b .kdm_plymouth081
 %patch20 -p1 -b .xsession_errors_O_APPEND
 %patch21 -p1 -b .platformplugin-widgetstyle4
 %patch22 -p1 -b .classicmenu-games
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
-# kubuntu patches
-%patch51 -p1 -b .brightness_keys
+%patch52 -p1 -b .kdebug238325
+%patch53 -p1 -b .kdebug183143
+
+# 4.5 patches
+%patch100 -p1 -b .startkde-malloc
 
 
 %build
@@ -280,6 +318,30 @@ popd
 ## unpackaged files
 rm -fv $RPM_BUILD_ROOT%{_libdir}/kde4/libpolkitkdeprivate*.so
 
+%if %{?_dist_release} == "vl4" ||  %{?_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
@@ -331,6 +393,7 @@ fi
 %{_bindir}/kdostartupconfig4
 %{_bindir}/kfontinst
 %{_bindir}/kfontview
+%{_bindir}/kinfocenter
 %{_bindir}/klipper
 %{_bindir}/kmenuedit
 %{_bindir}/krandom.kss
@@ -345,14 +408,15 @@ fi
 %{_bindir}/ksysguard
 %{_bindir}/ksystraycmd
 %{_bindir}/kwin*
-%{_bindir}/kxkb
+%{_bindir}/oxygen-demo
+%{_bindir}/oxygen-settings
 %{_bindir}/plasma-desktop
 %{_bindir}/plasma-netbook
 %{_bindir}/plasma-overlay
+%{_bindir}/plasma-windowed
 %{_bindir}/plasmaengineexplorer
 %{_bindir}/plasmoidviewer
 %{_bindir}/plasmawallpaperviewer
-%{_bindir}/safestartkde
 %{_bindir}/solid-action-desktop-gen
 %{_bindir}/solid-bluetooth
 %{_bindir}/solid-network
@@ -362,11 +426,14 @@ fi
 
 %{_datadir}/kde4/apps/color-schemes/
 %{_datadir}/kde4/apps/desktoptheme/
+%{_datadir}/kde4/apps/freespacenotifier/
 %{_datadir}/kde4/apps/kaccess/
 %{_datadir}/kde4/apps/katepart/syntax/plasma-desktop-js.xml
 %{_datadir}/kde4/apps/kcminput/
 %{_datadir}/kde4/apps/kcmkeys/
 %{_datadir}/kde4/apps/kcmsolidactions/
+%{_datadir}/kde4/apps/kcmusb/
+%{_datadir}/kde4/apps/kcmview1394/
 %{_datadir}/kde4/apps/kconf_update/
 %{_datadir}/kde4/apps/kcontrol/
 %{_datadir}/kde4/apps/kdisplay/
@@ -374,10 +441,12 @@ fi
 %{_datadir}/kde4/apps/kfontinst/
 %{_datadir}/kde4/apps/kfontview/
 %{_datadir}/kde4/apps/khotkeys/
+%{_datadir}/kde4/apps/kinfocenter/
 %{_datadir}/kde4/apps/kmenuedit/
 %{_datadir}/kde4/apps/konqsidebartng/
 %{_datadir}/kde4/apps/kscreenlocker/
 %{_datadir}/kde4/apps/ksplash/
+%{_datadir}/kde4/apps/kstyle/themes/
 %{_datadir}/kde4/apps/ksysguard/
 %{_datadir}/kde4/apps/kthememanager/
 %{_datadir}/kde4/apps/kwin/
@@ -416,26 +485,29 @@ fi
 %{_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*.desktop
 %{_docdir}/HTML/en/kcontrol/
+%{_docdir}/HTML/en/kfontview/
+%{_docdir}/HTML/en/kinfocenter/
 %{_docdir}/HTML/en/klipper/
 %{_docdir}/HTML/en/kmenuedit/
 %{_docdir}/HTML/en/ksysguard/
-%{_docdir}/HTML/en/kxkb/
-#{_docdir}/HTML/en/PolicyKit-kde/
 %{_docdir}/HTML/en/plasma-desktop/
 %{_docdir}/HTML/en/systemsettings/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/oxygen/*/*/*
 %{_libdir}/kde4/classic_mode.so
+%{_libdir}/kde4/devinfo.so
 %{_libdir}/kde4/fontthumbnail.so
 %{_libdir}/kde4/icon_mode.so
 %{_libdir}/kde4/ion_*.so
 %{_libdir}/kde4/kcm_*.so
 %exclude %{_libdir}/kde4/kcm_kdm.so
 %{_libdir}/kde4/kded_*.so
+%{_libdir}/kde4/keyboard_layout_widget.so
 %{_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
@@ -450,8 +522,10 @@ fi
 %{_libdir}/kde4/plasma_package*_*.so
 %{_libdir}/kde4/plasma_wallpaper_*.so
 %{_libdir}/kde4/solid_*.so
+%{_libdir}/kde4/plugins/styles/oxygen.so
 %{_libexecdir}/kde4/kcheckpass
 %{_libexecdir}/kde4/kcmdatetimehelper
+%{_libexecdir}/kde4/kcmkdmhelper
 %{_libexecdir}/kde4/kfontprint
 %{_libexecdir}/kde4/fontinst
 %{_libexecdir}/kde4/fontinst_helper
@@ -459,6 +533,9 @@ fi
 %{_libexecdir}/kde4/krootimage
 %{_libexecdir}/kde4/kscreenlocker
 %{_libexecdir}/kde4/ksysguardprocesslist_helper
+%{_libexecdir}/kde4/kwin_killer_helper
+%{_libexecdir}/kde4/kwin_opengl_test
+%{_libexecdir}/kde4/kwin_rules_dialog
 %{_libexecdir}/kde4/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_libdir}/libkdeinit*.so
@@ -477,7 +554,15 @@ fi
 %exclude %{_libdir}/kde4/plasma_engine_akonadi.so
 %exclude %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
+# polkit-kde
+%if %{?_dist_release} != "vl4" && %{?_dist_release} !="vl5"
 %{_datadir}/polkit-1/actions/*.policy
+%else
+%{_bindir}/polkit-kde-authorization
+%{_libexecdir}/kde4/polkit-kde-manager
+%{_datadir}/PolicyKit/policy/*.policy
+%{_docdir}/HTML/en/PolicyKit-kde/
+%endif
 
 #dir %{_datadir}/kde-settings
 #{_datadir}/kde-settings/*
@@ -494,9 +579,12 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde4/*
+%if %{?_dist_release} == "vl4" ||  %{?_dist_release} == "vl5"
+%{_libdir}/kde4/devel/lib*.so
+%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
@@ -561,6 +649,13 @@ fi
 %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
+* Mon Aug 16 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.0-1
+- new upstream release
+
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.5-1
+- new upstream release
+- BR: libxml2-devel, libXpm-devel, libXtst-devel, e2fsprogs-devel
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.3-1
 - new upstream release
 - dropt Patch52 (merged into upstream)

k/kdebase/kdebase-vl.spec

@@ -1,12 +1,13 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Summary(ja): K デスクトップ環境 - 基本ファイル
-Version: 4.4.3
-Release: 2%{?_dist_release}
+Version: 4.5.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
 
@@ -24,42 +25,25 @@ Obsoletes: %{name}-extras < %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: eject
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # FIXME: remove BRs which are only needed for stuff now in -runtime
-BuildRequires: alsa-lib-devel
-BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.6.2
-BuildRequires: cyrus-sasl-devel
-BuildRequires: doxygen
-BuildRequires: fontconfig-devel
-BuildRequires: gettext
-BuildRequires: giflib-devel
-BuildRequires: hal-devel
-BuildRequires: pciutils-devel
-BuildRequires: pcre-devel
-BuildRequires: kdebase-workspace-devel
+BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: phonon-devel
 BuildRequires: plasma-devel >= %{version}
-BuildRequires: libraw1394-devel
-BuildRequires: libusb-devel
-BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
-BuildRequires: pciutils-devel
-BuildRequires: pcre-devel
-BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
-BuildRequires: libsmbclient-devel
+BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: strigi-devel >= 0.5.7
-# needed?
-BuildRequires: xorg-x11-font-utils
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: glib2-devel
+BuildRequires: zlib-devel
 
 # Dolphin needs the ioslaves from kdebase-runtime (#438632)
 Requires: kdebase-runtime
 
+Conflicts: kdebase3
+
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
 
@@ -75,13 +59,13 @@ Requires: kdepimlibs >= %{version}
 
 
 %package devel
-Group:    Development/Libraries
-Summary:  Development files for %{name}
+Summary:   Development files for %{name}
+Group:     Development/Libraries
+Requires:  %{name}-libs = %{version}-%{release}
+Requires:  kdelibs4-devel
+Requires:  kdepimlibs4-devel
 Provides:  kdebase4-devel = %{version}-%{release}
 Obsoletes: kdebase4-devel < %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs4-devel
-Requires: kdepimlibs4-devel
 
 %description devel
 %{summary}.
@@ -106,7 +90,6 @@ unset QTDIR || : ; . /etc/profile.d/qt4.sh
     -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} \
     ..
@@ -143,19 +126,15 @@ rm -rf %{buildroot}
 
 %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 ||:
     gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
-    touch --no-create %{_datadir}/icons/oxygen &> /dev/null ||:
-    gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null ||:
     update-desktop-database -q &> /dev/null ||:
 fi
 
@@ -170,7 +149,7 @@ fi
 %{_datadir}/kde4/apps/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
-%{_datadir}/icons/oxygen/*/*/*
+#{_datadir}/icons/oxygen/*/*/*
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
 %{_docdir}/HTML/en/*
@@ -195,8 +174,12 @@ fi
 %{_libdir}/kde4/devel/lib*.so
 
 %changelog
-* Tue Jun 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-2
-- added BR: pciutils-devel
+* Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.0-1
+- new upstream release
+
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.5-1
+- new upstream release
+- added Conflicts: kdebase3
 
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release

k/kdebindings/kdebindings-vl.spec

@@ -8,8 +8,7 @@
 %define pykde4_akonadi 1
 %define pyqt4_version 4.7
 # Qt4 version auto-detection -- inagaki
-%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null ||
- echo 4.6.1)
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.6.3)
 %define mono_dir %{_prefix}/lib/mono
 
 #if 0%{?ruby}%{?smoke}
@@ -25,10 +24,10 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.4.3
+Version: 4.5.0
 Release: 1%{?_dist_release}
 Summary: KDE bindings to non-C++ languages.
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebindings-%{version}.tar.bz2
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -41,14 +40,16 @@ URL: http://www.kde.org/
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  akonadi-devel >= 1.3.0
+BuildRequires:  akonadi-devel >= 1.4.0
 BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
-BuildRequires:  kdegraphics-devel >= %{version}
+BuildRequires:  kdegraphics4-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 # kdebindings does not support polkit-qt-1 yet
-#BuildRequires:  polkit-qt-devel
+%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+BuildRequires:  polkit-qt-devel
+%endif
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
@@ -76,6 +77,7 @@ BuildRequires:  java-1.6.0-openjdk-devel
 %endif
 
 Requires: kdelibs4 >= %{version}
+Conflicts: kdebindings < 4
 
 %description
 KDE bindings to non-C++ languages
@@ -85,6 +87,7 @@ Summary: Development files for kdebindings.
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4-devel
+Conflicts: kdebindings-devel < 4
 
 %description devel
 Development files for the KDE bindings.
@@ -253,7 +256,7 @@ Falcon plugin for the Kross archtecture in KDE4.
 
 
 %prep
-%setup -q
+%setup -q -n kdebindings-%{version}
 
 # do the no-rpath hack last, after the upstream backports (if any)
 #patch1 -p1 -b .no-rpath
@@ -305,6 +308,7 @@ unset QTDIR || : ; . /etc/profile.d/qt4.sh
     -DBUILD_java=OFF \
   %endif
     -DCMAKE_SKIP_RPATH:BOOL=OFF \
+    -DBUILD_perl=OFF \
     ..
 popd
 #    -DRUBY_INCLUDE_PATH:PATH=%{ruby_arch} \
@@ -341,11 +345,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+
 %pre -n PyKDE4-devel
 if [ -d %{_bindir}/pykdeuic4 ]; then
     rm -rf %{_bindir}/pykdeuic4/
 fi
 
+%if %{csharp}
+%post -n qyoto -p /sbin/ldconfig
+
+%postun -n qyoto -p /sbin/ldconfig
+%endif
+
 
 %files
 %defattr(-,root,root)
@@ -360,6 +371,7 @@ fi
 %{_bindir}/smoke*
 %{_includedir}/smoke.h
 %{_includedir}/smoke
+%{_includedir}/smokegen
 %{_libdir}/libcppparser.so
 %{_libdir}/libsmoke*.so
 %dir %{_libdir}/smokegen
@@ -396,23 +408,29 @@ fi
 %{_libdir}/libkimono.so
 %{_libdir}/libktexteditor-sharp.so
 %{_libdir}/libnepomuk-sharp.so
+%{_libdir}/libphonon-sharp.so
 %{_libdir}/libplasma-sharp.so
-%{_libdir}/libsoprano-sharp.so
 %{_libdir}/libqimageblitz-sharp.so
+%{_libdir}/libqscintilla-sharp.so
+%{_libdir}/libsoprano-sharp.so
 %{mono_dir}/qyoto/qimageblitz.dll
 %{mono_dir}/qyoto/akonadi.dll
 %{mono_dir}/qyoto/kde-dotnet.dll
 %{mono_dir}/qyoto/khtml-dll.dll
 %{mono_dir}/qyoto/ktexteditor-dotnet.dll
 %{mono_dir}/qyoto/nepomuk-dll.dll
+%{mono_dir}/qyoto/phonon.dll
 %{mono_dir}/qyoto/plasma-dll.dll
+%{mono_dir}/qyoto/qscintilla.dll
 %{mono_dir}/qyoto/soprano.dll
 %{mono_dir}/gac/akonadi
 %{mono_dir}/gac/kde-dotnet
 %{mono_dir}/gac/khtml-dll
 %{mono_dir}/gac/ktexteditor-dotnet
 %{mono_dir}/gac/nepomuk-dll
+%{mono_dir}/gac/phonon
 %{mono_dir}/gac/plasma-dll
+%{mono_dir}/gac/qscintilla
 %{mono_dir}/gac/soprano
 %{mono_dir}/gac/qimageblitz
 %{_datadir}/kde4/apps/plasma_scriptengine_kimono
@@ -425,9 +443,7 @@ fi
 %{_libdir}/libqttest-sharp.so
 %{_libdir}/libqtuitools-sharp.so
 %{_libdir}/libqtwebkit-sharp.so
-%{_libdir}/libqyoto.so
-%{_libdir}/libqyotoshared.so.1
-%{_libdir}/libqyotoshared.so.1.0.0
+%{_libdir}/libqyoto.so.*
 %{mono_dir}/qyoto/qt-dotnet.dll
 %{mono_dir}/qyoto/qtscript.dll
 %{mono_dir}/qyoto/qttest.dll
@@ -444,7 +460,7 @@ fi
 %{_bindir}/csrcc
 %{_bindir}/uics
 %{_includedir}/qyoto
-%{_libdir}/libqyotoshared.so
+%{_libdir}/libqyoto.so
 %{_libdir}/pkgconfig/*
 %endif
 
@@ -455,20 +471,26 @@ fi
 %{ruby_lib}/KDE/
 %{ruby_lib}/akonadi/
 %{ruby_lib}/khtml/
+%{ruby_lib}/kio/
 %{ruby_lib}/ktexteditor/
 %{ruby_lib}/okular/
+%{ruby_lib}/phonon/
+%{ruby_lib}/qscintilla/
 %{ruby_lib}/solid/
 %{ruby_lib}/soprano/
 %{ruby_lib}/nepomuk/
 %{ruby_arch}/akonadi.so
 %{ruby_arch}/khtml.so
+%{ruby_arch}/kio.so
 %{ruby_arch}/korundum4.so
 %{ruby_arch}/ktexteditor.so
 %{ruby_arch}/okular.so
+%{ruby_arch}/phonon.so
 %{ruby_arch}/plasma_applet.so
 %{ruby_arch}/solid.so
 %{ruby_arch}/soprano.so
 %{ruby_arch}/nepomuk.so
+%{ruby_arch}/qscintilla.so
 %{_libdir}/kde4/krubypluginfactory.so
 %{_datadir}/applications/kde4/dbpedia_references.desktop
 %{_datadir}/kde4/apps/dbpedia_references
@@ -527,6 +549,12 @@ fi
 %endif
 
 %changelog
+* Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

k/kdeedu/kdeedu-vl.spec

@@ -1,16 +1,15 @@
 Name: kdeedu
-Version: 4.4.3
-Release: 1%{?_dist_release}
 Summary: Educational/Edutainment applications for KDE
 Summary(ja): KDE 向け教育・教養アプリケーション集
+Version: 4.5.0
+Release: 1%{?_dist_release}
 
 License: GPLv2
 Group: Applications/Edutainment
 URL: http://www.kde.org/
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
-## upstreamable patches
-#Patch51: kdeedu-4.3.90-cantor_part_desktop_fix.patch 
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
+
 ## upstream patches
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -20,7 +19,7 @@ BuildRequires: libboost-devel libboost-python
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
 BuildRequires: cfitsio-devel
 BuildRequires: xplanet
-BuildRequires: libindi-devel
+BuildRequires: libindi-devel >= 0.6.1
 BuildRequires: libnova-devel
 BuildRequires: libqalculate-devel
 BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
@@ -39,6 +38,7 @@ BuildRequires: facile
 BuildRequires: python-devel python
 BuildRequires: readline-devel
 #BuildRequires: R-devel
+BuildRequires: avogadro-devel
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -49,6 +49,7 @@ Requires: %{name}-libs = %{version}-%{release}
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
+Conflicts: kdeedu3
 
 %description
 Educational/Edutainment applications for KDE.
@@ -80,12 +81,10 @@ Summary: Development files for kdeedu
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-marble-libs = %{version}-%{release}
+Requires: %{name}-math-libs = %{version}-%{release}
 Requires:  kdelibs4-devel
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
-# http://bugzilla.redhat.com/394011
-Obsoletes: marble-devel < 0.5.1-1
-Provides:  marble-devel = 0.7-%{release}
 
 %description devel
 Header files for developing applications using kdeedu.
@@ -153,7 +152,7 @@ Group:   System Environment/Libraries
 
 
 %prep
-%setup -q
+%setup -q -n kdeedu-%{version}
 #patch51 -p1 -b .cantor_part_desktop_fix.patch
 
 %build
@@ -294,7 +293,7 @@ fi
 %{_libdir}/kde4/plasma_applet_didyouknow.so
 %{_libdir}/kde4/plasma_engine_kalzium.so
 # kalzium
-%{_libdir}/avogadro-kalzium
+#{_libdir}/avogadro-kalzium
 %{_datadir}/kde4/apps/desktoptheme
 %{_datadir}/kde4/apps/blinken
 %{_datadir}/kde4/apps/kalzium
@@ -344,8 +343,10 @@ fi
 %{_datadir}/config/kanagram.knsrc
 %{_datadir}/config/khangman.knsrc
 %{_datadir}/config/klettres.knsrc
+%{_datadir}/config/kturtle.knsrc
 %{_datadir}/config/kwordquiz.knsrc
 %{_datadir}/config/parley.knsrc
+%{_datadir}/config/parley-themes.knsrc
 %{_datadir}/config/step.knsrc
 %doc %{_docdir}/HTML/en/blinken
 %doc %{_docdir}/HTML/en/kalzium
@@ -380,26 +381,28 @@ fi
 %defattr(-,root,root)
 %doc COPYING README
 %{_datadir}/kde4/apps/libkdeedu
-%{_libdir}/libavogadro-kalzium.so.*
+#{_libdir}/libavogadro-kalzium.so.*
 %{_libdir}/libcompoundviewer.so.*
 %{_libdir}/libkdeeduui.so.*
 %{_libdir}/libkeduvocdocument.so.*
 %{_libdir}/libkiten.so.*
 %{_libdir}/libscience.so.*
 # needed here for multilib'd runtime
-%{_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
+#{_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
 %files devel
 %defattr(-,root,root)
-%{_datadir}/kde4/apps/cmake/modules
 %{_includedir}/kde4/libkdeedu
 %{_includedir}/kde4/libkiten
+%{_includedir}/kde4/rocs
 %{_includedir}/marble
 %{_libdir}/libkdeedu*.so
 %{_libdir}/libkeduvocdocument.so
 %{_libdir}/libkiten.so
-%{_libdir}/libscience.so
 %{_libdir}/libmarble*.so
+%{_libdir}/librocslib.so
+%{_libdir}/libscience.so
+%{_datadir}/kde4/apps/cmake/modules
 
 %files kstars
 %defattr(-,root,root,-)
@@ -449,7 +452,7 @@ fi
 %{_libdir}/kde4/kigpart.*
 %{_libdir}/kde4/libkmplotpart.*
 %{_libdir}/kde4/plasma_applet_kalgebra.so
-#{_libdir}/libanalitza.so.*
+%{_libdir}/kde4/rocs_*.so
 %{_datadir}/applications/kde4/cantor.desktop
 %{_datadir}/applications/kde4/kalgebra.desktop
 %{_datadir}/applications/kde4/kbruch.desktop
@@ -486,7 +489,7 @@ fi
 %{_datadir}/icons/hicolor/*/*/application-x-kig.*
 %{_datadir}/kde4/apps/cantor
 %{_datadir}/kde4/apps/cantorpart
-%{_datadir}/kde4/apps/katepart/syntax/python-kig.xml
+%{_datadir}/kde4/apps/katepart/syntax/*.xml
 %{_datadir}/kde4/apps/kbruch
 %{_datadir}/kde4/apps/kig
 %{_datadir}/kde4/apps/kmplot
@@ -496,7 +499,9 @@ fi
 %{_datadir}/kde4/services/kalgebraplasmoid.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/Rocs*.desktop
 %{_mandir}/man1/kbruch.*
 %{_mandir}/man1/kig.*
 %{_mandir}/man1/kmplot.*
@@ -517,9 +522,18 @@ fi
 %{_libdir}/libanalitzagui.so.*
 %{_libdir}/libcantorlibs.so.*
 %{_libdir}/libcantor_config.so
+%{_libdir}/librocslib.so.*
 
 
 %changelog
+* Sat Aug 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+- added BR: avogadro-devel
+
+* Wed Jul  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+- added Conflicts: kdeedu3
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

k/kdegames/kdegames-vl.spec

@@ -1,13 +1,13 @@
 Name: kdegames
-Version: 4.4.3
-Release: 1%{?_dist_release}
 Summary: K Desktop Environment - Games
 Summary(ja): K デスクトップ環境 - ゲーム集
+Version: 4.5.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/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: desktop-file-utils
@@ -22,7 +22,7 @@ Requires(preun): ggz-client-libs
 Requires(postun): desktop-file-utils
 
 # KSnakeDuel moved here from kdegames3
-#Conflicts: kdegames3 < 3.5.10-6
+Conflicts: kdegames3 < 3.5.10-6
 
 Obsoletes: kdegames4 < %{version}-%{release}
 Provides:  kdegames4 = %{version}-%{release}
@@ -92,7 +92,7 @@ Install kdegames-devel if you wish to develop or compile games for the
 KDE desktop.
 
 %prep
-%setup -q
+%setup -q -n kdegames-%{version}
 
 %build
 mkdir -p %{_target_platform}
@@ -123,6 +123,23 @@ install -m644 -p -D ./kreversi/module.dsc \
 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}
+for i in lib*.so
+do
+  case "$i" in
+# conflicts with kdegames3
+    libkdegames.so )
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
+
+
 %check
 for f in $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*.desktop ; do
   desktop-file-validate $f
@@ -206,11 +223,19 @@ fi
 %defattr(-,root,root)
 %{_includedir}/kde4/*
 %{_libdir}/lib*.so
+%{_libdir}/kde4/devel/lib*.so
 %{_datadir}/kde4/apps/cmake/modules/*
 %dir %{_libdir}/libpala/
 %{_libdir}/libpala/*.cmake
 
 %changelog
+* Sat Aug 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+
+* Tue Jul  6 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+- added Conflict: kdegames3
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

k/kdegraphics/kdegraphics-vl.spec

@@ -1,18 +1,15 @@
-%define vine3 %(grep -c 3. /etc/vine-release)
-%define vine4 %(grep -c 4. /etc/vine-release)
-%define vine5 %(grep -c 5. /etc/vine-release)
-
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Summary(ja): K デスクトップ環境 - グラフィックアプリケーション集
-Version: 4.4.3
+Version: 4.5.0
 Release: 1%{?_dist_release}
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 URL: http://www.kde.org/
 License: GPLv2
 Group: Applications/Graphics
 
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -38,10 +35,12 @@ Requires: %{name}-libs = %{version}-%{release}
 Requires: kio_msits = %{version}-%{release}
 Requires: cups
 
+Obsoletes: kdegraphics4 < %{version}-%{release}
 Obsoletes: kdegraphics-extras < 4.0.0 
 Obsoletes: gwenview < 2
 Provides: gwenview = 2
 Provides: kdegraphics4 = %{version}-%{release}
+Conflicts: kdegraphics3
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -72,7 +71,8 @@ Requires: kdelibs4 >= %{version}
 %package devel
 Summary: Development files for kdegraphics
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Obsoletes: kdegraphics4-devel < %{version}-%{release}
 Provides: kdegraphics4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: pkgconfig
@@ -97,7 +97,7 @@ Group: System Environment/Libraries
 
 
 %prep
-%setup -q
+%setup -q -n kdegraphics-%{version}
 
 %build
 mkdir -p %{_target_platform}
@@ -229,6 +229,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/msits.protocol
 
 %changelog
+* Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+- added Conflicts: kdegraphics3
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

k/kdelibs/kdelibs-vl.spec

@@ -1,29 +1,28 @@
-%define attica_ver 0.1.2
-%define phonon_ver 4.3.80
-%define soprano_ver 2.4.0.1
+%define attica_ver 0.1.4
+%define dbusmenu_qt_ver 0.5.2
+%define phonon_ver 4.4.0
+%define soprano_ver 2.4.631
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
 Summary(ja): K デスクトップ環境 4 - ライブラリ
 Name: kdelibs
-Version: 4.4.3
+Version: 4.5.0
 Release: 1%{?_dist_release}
-Group: System Environment/Libraries
+
 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.3.85-parallel_devel.patch
+Patch0: kdelibs-4.4.85-parallel_devel.patch
 # fix kde#149705
 Patch2: kdelibs-4.2.85-kde149705.patch
-## UPSTREAM ME
-# Hunspell support for K3Spell
-# http://fedoraproject.org/wiki/Releases/FeatureDictionary
-# http://bugs.kde.org/show_bug.cgi?id=154561
-Patch5: kdelibs-4.0.0-k3spell-hunspell.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
@@ -33,26 +32,22 @@ Patch9: kdelibs-4.0.2-branding.patch
 # are loaded from kde4rc
 Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
 # workaround for policykit
-Patch11: kdelibs-4.3.80-policykit-workaround.patch
+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.2.85-libexecdir.patch
-# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
+Patch14: kdelibs-4.4.80-libexecdir.patch
+# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 # COMMENT ME PLEASE
 Patch20: kdelibs-4.1.70-cmake.patch
-# disable drkonqi by default, fedora prefers/wants abrt
+# disable drkonqi by default, RHEL prefers/wants abrt
 Patch24: kdelibs-4.3.1-drkonq.patch
-# use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
-# workaound for low-mem systems (ppc64), tracking here (for now),
-# https://bugzilla.redhat.com/show_bug.cgi?id=539697
-Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.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.3.98-no_rpath.patch
+Patch27: kdelibs-4.4.80-no_rpath.patch
 
 # upstreamable
 
@@ -69,13 +64,14 @@ BuildRequires: aspell-devel
 BuildRequires: attica-devel >= %{attica_ver} 
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
-BuildRequires: bison
+BuildRequires: bison flex
 BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.6.2-3
 BuildRequires: cups-devel cups
+BuildRequires: docbook-dtds docbook-style-xsl
 BuildRequires: enchant-devel
-BuildRequires: flex
 BuildRequires: gamin-devel
+BuildRequires: gettext-devel
 BuildRequires: giflib-devel
 BuildRequires: jasper-devel
 BuildRequires: krb5-devel
@@ -91,7 +87,7 @@ BuildRequires: pcre-devel
 BuildRequires: phonon-devel >= %{phonon_ver}
 BuildRequires: polkit-qt-devel
 BuildRequires: qca2-devel
-BuildRequires: shared-desktop-ontologies-devel
+BuildRequires: shared-desktop-ontologies-devel >= 0.4
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver}
 BuildRequires: strigi-devel >= %{strigi_ver}
@@ -99,11 +95,11 @@ BuildRequires: strigi-devel >= %{strigi_ver}
 BuildRequires: xz-devel
 %endif
 BuildRequires: zlib-devel
+BuildRequires: dbusmenu-qt-devel
 
-BuildRequires: libX11-devel libXcomposite-devel libXdamage-devel
+BuildRequires: libSM-devel libXcomposite-devel libXdamage-devel
 BuildRequires: libxkbfile-devel libXpm-devel libXScrnSaver-devel
 BuildRequires: libXtst-devel libXv-devel libXxf86misc-devel
-BuildRequires: mesa-libGL-devel mesa-libGLU-devel
 
 BuildRequires: openssh-clients
 BuildRequires: subversion
@@ -135,6 +131,9 @@ Provides: kross(qtscript) = %{version}-%{release}
 Obsoletes: kdelibs-experimental < 4.3.75 
 Provides: kdelibs-experimental = %{version}-%{release} 
 
+# because kjscmd
+Conflicts: kdebindings3
+
 %description
 Libraries for the K Desktop Environment 4.
 
@@ -202,18 +201,14 @@ API ドキュメントを含んでいます。
 %setup -q
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%patch5 -p1 -b .k3spell-hunspell
 %patch8 -p1 -b .install_all_css
 %patch9 -p1 -b .branding
-%patch11 -p1 -b .policykit
+%patch11 -p1 -b .policykit-workaround
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch24 -p1 -b .drkonq
-%if %{?_dist_release} != "vl4" && %{?_dist_release} != "vl5" 
-%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
-%endif
+#patch24 -p1 -b .drkonq
 %patch27 -p1 -b .no_rpath
 
 # upstreamable patches
@@ -292,7 +287,9 @@ bzip2 -9 $RPM_BUILD_ROOT%{_docdir}/HTML/en/sonnet/index.cache
 # install apidocs and generator script
 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
 
 
 %clean
@@ -334,10 +331,10 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %exclude %{_datadir}/kde4/apps/cmake
 %{_datadir}/config/*
 %{_datadir}/dbus-1/interfaces/*
-%{_datadir}/dbus-1/system-services/*
+#{_datadir}/dbus-1/system-services/*
 %{_datadir}/mime/packages/kde.xml
 %if %{?_dist_release} != "vl4" && %{?_dist_release} != "vl5" 
-%{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
+#{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
 %else
 %{_datadir}/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
 %endif
@@ -401,6 +398,10 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %doc %{_docdir}/HTML/en/kdelibs4-apidocs
 
 %changelog
+* Sun Aug 15 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+- added BR: dbusmenu-qt-devel
+
 * Wed May  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 - updated spec files for Vine Linux 5/VineSeed

k/kdemultimedia/kdemultimedia-vl.spec

@@ -1,14 +1,19 @@
-%define vine3 %(grep -c 3. /etc/vine-release)
-%define vine4 %(grep -c 4. /etc/vine-release)
-%define vine5 %(grep -c 5. /etc/vine-release)
-
 Name: kdemultimedia
 Summary: Multimedia applications for the K Desktop Environment (KDE).
 Summary(ja): K デスクトップ環境 - マルチメディアアプリケーション集
-Version: 4.4.3
+Version: 4.5.0
 Release: 1%{?_dist_release}
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
+
+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
 
 URL: http://www.kde.org/
 Group: Applications/Multimedia
@@ -45,6 +50,8 @@ Obsoletes: dragonplayer < 2.0.2-0.1
 Obsoletes: %{name}-extras < %{version}-%{release}
 Obsoletes: kmidi koncd
 
+Conflicts: kdemultimedia3
+
 %description
 Multimedia applications for the K Desktop Environment.
 
@@ -56,9 +63,9 @@ What it is
 * kscd (an Audio-CD player)
 
 %package libs
-License: LGPLv2+ and GPLv2+
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+License: LGPLv2+ and GPLv2+
 Obsoletes: %{name}-extras-libs < %{version}-%{release}
 Conflicts: dragonplayer < 2.0.2-0.1
 
@@ -71,14 +78,21 @@ Summary:  Developer files for %{name}
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
+Conflicts: kdemultimedia3-devel
 
 %description devel
 %{summary}.
 
 
 %prep
-%setup -q
-%patch1 -p1 -b .nomplayerthumbs
+%setup -q -n kdemultimedia-%{version}
+#patch1 -p1 -b .nomplayerthumbs
+#patch2 -p1 -b .kscd_doc
+%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+%patch700 -p1 -b .taglib
+%endif
+%patch701 -p1 -b .ffmpeg
+
 
 %build
 mkdir -p %{_target_platform}
@@ -134,11 +148,11 @@ fi
 %{_datadir}/kde4/apps/kmix
 %{_datadir}/kde4/apps/kconf_update/*
 %{_datadir}/kde4/apps/konqsidebartng
-%{_datadir}/kde4/apps/profiles
 %{_datadir}/kde4/apps/kscd
 %{_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
+%{_datadir}/kde4/apps/videothumbnail/
 %{_datadir}/config/dragonplayerrc
 %{_datadir}/applications/kde4/*
 %{_datadir}/autostart/*
@@ -169,6 +183,14 @@ fi
 %exclude %{_libdir}/libkdeinit*.so
 
 %changelog
+* Sat Aug 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+- added Patch701 to avoid link with ffmpeg
+
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+- added Conflicts: kdemultimedia3
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

k/kdenetwork/kdenetwork-vl.spec

@@ -1,14 +1,14 @@
 Name: kdenetwork
 Summary: K Desktop Environment - Network Applications
 Summary(ja): K デスクトップ環境 - ネットワークアプリケーション集
-Version: 4.4.3
-Release: 3%{?_dist_release}
+Version: 4.5.0
+Release: 1%{?_dist_release}
 
 Group: Applications/Internet
 License: GPLv2
 URL: http://www.kde.org/
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdenetwork-%{version}.tar.bz2
 Source1: krdc-icons.tar.bz2
 Source2: kppp.pamd
 
@@ -20,45 +20,51 @@ 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
+#Patch100: kdenetwork-4.4.3-cve-2010-1000_1511.patch
 
 # Vine patches
 Patch1000: kdenetwork-3.5.8-kopete-fs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libboost-devel
-BuildRequires: giflib-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: expat-devel
 BuildRequires: glib2-devel
-BuildRequires: gmp-devel
+BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: libboost-devel
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libktorrent-devel
 BuildRequires: libmsn-devel >= 4.0-0.beta2
 BuildRequires: libotr-devel
+BuildRequires: libv4l-devel
 BuildRequires: libvncserver-devel
 BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: libXtst-devel
 BuildRequires: meanwhile-devel
-BuildRequires: openldap-devel
-BuildRequires: openslp-devel
 BuildRequires: ortp-devel
-BuildRequires: pcre-devel
 BuildRequires: qca2-devel
 BuildRequires: plasma-devel >= %{version}
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite3-devel
-BuildRequires: libv4l-devel
+BuildRequires: strigi-devel
 BuildRequires: xmms-devel
 
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
 
+Obsoletes: kdenetwork4 < %{version}-%{release}
+Provides: kdenetwork4 = %{version}-%{release}
+
 Obsoletes: kopete <= 0.8.0
 Provides: kopete
 
+Conflicts: kdenetwork3
+
 %description
 Networking applications for the K Desktop Environment.
 
@@ -72,31 +78,32 @@ Group:   System Environment/Libraries
 %package devel
 Summary: Development files for kdenetwork
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 
 %description devel
 Development files for kdenetwork. Install kdenetwork-devel if you wish
 to develop or compile KDE networking applications.
 
-%package -n kppp
+%package -n kppp4
 Summary: K Desktop Environment - PPP Network Applications
 Summary(ja): K デスクトップ環境 - PPP 通信アプリケーション
 Group: Applications/Internet
 Requires: %{name}-libs = %{version}-%{release}
 Requires: ppp
+Conflicts: kppp < 4
 
-%description -n kppp
+%description -n kppp4
 PPP Networking applications for the K Desktop Environment.
 
 Install kppp if you intend to use KDE on a machine using
 PPP networking.
 
 %prep
-%setup -q -a 1
+%setup -q -n kdenetwork-%{version} -a 1
 %patch1 -p1 -b .icon
 %patch2 -p1 -b .resolv-conf-path
-%patch100 -p0 -b .cve-2010-1000_1511
+#patch100 -p0 -b .cve-2010-1000_1511
 
 # Vine patches
 %patch1000 -p1 -b .kopete
@@ -140,6 +147,23 @@ PROGRAM=%{_sbindir}/kppp
 SESSION=true
 EOF
 
+# move devel symlinks
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/devel
+pushd $RPM_BUILD_ROOT%{_libdir}
+for i in lib*.so
+do
+  case "$i" in
+# conflicts with kdenetwork3
+    libkopete.so | libkopete_oscar.so | libkopete_videodevice.so)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
+done
+popd
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -170,6 +194,7 @@ fi
 %defattr(-,root,root)
 %{_bindir}/*
 %exclude %{_bindir}/kppp*
+%{_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.rc
@@ -190,6 +215,7 @@ fi
 %doc %{_docdir}/HTML/en/*
 %exclude %{_datadir}/doc/HTML/en/kppp
 %{_datadir}/icons/hicolor/*/*/*
+%exclude %{_datadir}/icons/hicolor/*/apps/kppp*
 %{_datadir}/icons/oxygen/*/*/*
 %{_libdir}/kde4/*.so
 %{_libdir}/mozilla/plugins/skypebuttons.so
@@ -204,9 +230,10 @@ fi
 %{_includedir}/kde4/kopete
 %{_includedir}/kde4/krdc
 %{_libdir}/lib*.so
+%{_libdir}/kde4/devel/lib*.so
 %exclude %{_libdir}/libqgroupwise.so
 
-%files -n kppp
+%files -n kppp4
 %defattr(-,root,root)
 %doc %{_datadir}/doc/HTML/en/kppp
 %config /etc/security/console.apps/kppp
@@ -215,8 +242,16 @@ fi
 %{_sbindir}/kppp
 %{_datadir}/applications/kde4/*ppp*
 %{_datadir}/kde4/apps/kppp
+%{_datadir}/icons/hicolor/*/apps/kppp*
 
 %changelog
+* Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+- added Conflicts: kdenetwork3
+
 * Tue Jun 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-3
 - added BR: libXtst-devel
 

k/kdepim/kdepim-vl.spec

@@ -1,12 +1,11 @@
-%define beta 0
-%define vine4 %(grep -c 4. /etc/vine-release)
-
 Name: kdepim
-Version: 4.4.3
-Release: 1%{?_dist_release}
 Summary: PIM (Personal Information Manager) for KDE
 Summary(ja): KDE の個人情報管理(PIM)アプリケーション集
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Version: 4.4.5
+Release: 2%{?_dist_release}
+
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
+
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
@@ -41,9 +40,13 @@ BuildRequires: python-devel
 BuildRequires: soprano-devel
 BuildRequires: qca2-devel
 BuildRequires: zlib-devel
+Requires: %{name}-libs = %{version}-%{release}
 
+Obsoletes: kdepim4 < %{version}-%{release}
 Provides: kdepim4 = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+
+Conflicts: kdepim3
+Conflicts: kdeutils3
 
 %description
 A PIM (Personal Information Manager) for KDE.
@@ -68,16 +71,18 @@ Requires: kdelibs4 >= %{version}
 %package devel
 Summary: Development files for kdepim
 Group: Development/Libraries
-Provides: kdepim4-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
+Obsoletes: kdepim4-devel < %{version}-%{release}
+Provides: kdepim4-devel = %{version}-%{release}
+Conflicts: kdepim3-devel
 
 %description devel
 Development files for %{name}.
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %prep
-%setup -q
+%setup -q -n kdepim-%{version} 
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
 
@@ -199,6 +204,13 @@ rm -rf $RPM_BUILD_ROOT
 #exclude %{_libdir}/libkpilot_*.so
 
 %changelog
+* Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-2
+- rebuilt for VineSeed
+
+* Mon Jul  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+- added Conflicts: kdepim3, kdeutils3
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

k/kdepimlibs/kdepimlibs-vl.spec

@@ -1,11 +1,11 @@
 %define akonadi_subpkg 1
-%define akonadi_version 1.2.61
+%define akonadi_version 1.4.0
 
 Name: kdepimlibs
-Version: 4.4.3
-Release: 1%{?_dist_release}
 Summary: K Desktop Environment 4 - PIM Libraries
 Summary(ja): K デスクトップ環境 4 - PIM ライブラリ
+Version: 4.5.0
+Release: 1%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -25,7 +25,7 @@ BuildRequires: akonadi-devel >= %{akonadi_version}
 BuildRequires: libboost-devel >= 1.34.0
 BuildRequires: libboost-graph >= 1.34.0
 BuildRequires: cyrus-sasl-devel
-BuildRequires: gpgme-devel
+BuildRequires: gpgme-devel >= 1.1.7
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
@@ -68,8 +68,9 @@ Requires: akonadi >= %{akonadi_version}
 %{summary}.
 
 %package apidocs
-Group: Development/Documentation
 Summary: kdepimlibs API documentation
+Summary(ja): kdepimlibs API ドキュメント
+Group: Development/Documentation
 #Requires: kde-filesystem
 #BuildArch: noarch
 
@@ -194,6 +195,12 @@ rm -rf %{buildroot}
 #endif
 
 %changelog
+* Sun Aug 15 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.0-1
+- new upstream release
+
+* Sat Jul  3 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.5-1
+- new upstream release
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.3-1
 - new upstream release
 

k/kdeplasma-addons/kdeplasma-addons-vl.spec

@@ -1,39 +1,42 @@
 Name:           kdeplasma-addons
-Version:        4.4.3
-Release:        1%{?_dist_release}
 Summary:        Additional plasmoids for KDE
+Version:        4.5.0
+Release:        1%{?_dist_release}
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
+
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 ## upstreamable patches
 
 ## upstream patches
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  attica-devel
 BuildRequires:  libboost-devel
 BuildRequires:  eigen2-devel
 BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
+BuildRequires:  libXtst-devel libqalculate-devel
 # for libplasmaclock, nepomuk
 BuildRequires:  kdebase-workspace-devel >= %{version}
 # Lancelot build-deps kdebase-workspace, which contains
 # /usr/share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
 BuildRequires:  kdebase-workspace >= %{version}
 # RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.
-BuildRequires:  kdeedu-devel >= %{version}
+BuildRequires:  kdeedu4-devel >= %{version}
 # Optional (but recommended), enables automatic rotation for frame applet
 #BuildRequires:  libkexiv2-devel >= 0.4.0
-BuildRequires:  kdegraphics-devel >= %{version}
+BuildRequires:  kdegraphics4-devel >= %{version}
 # lancelot eye-candy
 BuildRequires:  libXcomposite-devel libXrender-devel libXdamage-devel
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 # kimpanel
 BuildRequires:  scim-devel
+BuildRequires:  qca2-devel
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -89,7 +92,10 @@ rm -f %{buildroot}%{_libdir}/libplasma*.so
 rm -f %{buildroot}%{_libdir}/lib{kimpanelruntime,ocsclient,rtm}.so
 # lancelot-devel
 rm -f %{buildroot}%{_libdir}/liblancelot*.so
+rm -rf %{buildroot}%{_includedir}/kde4/KDE
 rm -rf %{buildroot}%{_includedir}/kde4/lancelot
+rm -rf %{buildroot}%{_includedir}/kde4/lancelot-datamodels
+rm -rf %{buildroot}%{_datadir}/kde4/apps/cmake/modules/*.cmake
 # conversion-devel 
 rm -rf %{buildroot}%{_includedir}/kde4/conversion
 rm -f  %{buildroot}%{_libdir}/libconversion.so
@@ -133,6 +139,7 @@ rm -rf %{buildroot}
 %{_datadir}/kde4/apps/plasma-applet-opendesktop-activities/
 %{_datadir}/kde4/apps/plasma_pastebin/
 %{_datadir}/kde4/apps/plasma_wallpaper_pattern/
+%{_datadir}/kde4/apps/plasmaboard/
 %{_datadir}/kde4/apps/rssnow/
 %{_datadir}/config/*.knsrc
 %{_datadir}/config.kcfg/kimpanelconfig.kcfg
@@ -143,12 +150,12 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_datadir}/dbus-1/interfaces/org.kde.impanel.xml
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/oxygen/*/*/*
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/libkimpanelruntime.so.*
 %{_libdir}/liblancelot.so.*
+%{_libdir}/liblancelot-datamodels.so.*
 %{_libdir}/libplasmapotdprovidercore.so.*
 %{_libdir}/libplasmacomicprovidercore.so.*
 %{_libdir}/libplasmaweather.so.*
@@ -156,6 +163,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.0-1
+- new upstream release
+
+* Wed Jul  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.5-1
+- new upstream release
+
 * Sat May  8 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.3-1
 - new upstream release
 

k/kdetoys/kdetoys-vl.spec

@@ -1,17 +1,19 @@
 Name: kdetoys
-Version: 4.4.3
-Release: 1%{?_dist_release}
 Summary: K Desktop Environment - Toys and Amusements
 Summary(ja): K デスクトップ環境 - 小さなアプリケーション集
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Version: 4.5.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: GPL
+License: GPLv2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: kdebase-workspace-devel >= %{version}
 
+Conflicts: kdetoys3
+
 %description
 Toys for the K Desktop Environment.
 
@@ -21,10 +23,9 @@ What it is
 * amor: Amusing Misuse Of Resources put's comic figures above your windows
 * kteatime: system tray applet that makes sure your tea doesn't get too strong
 * ktux: Tux-in-a-Spaceship screen saver
-* kweather: kicker applet that will display the current weather outside
 
 %prep
-%setup -q
+%setup -q -n kdetoys-%{version}
 
 %build
 mkdir -p %{_target_platform}
@@ -51,14 +52,12 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
@@ -75,11 +74,16 @@ fi
 %{_datadir}/applications/kde4/*.desktop
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_libdir}/kde4/*
-%{_libdir}/libkdeinit4_*.so
 %{_mandir}/man6/amor.6*
 
 %changelog
+* Fri Aug 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+- added Conflicts: kdetoys3
+
 * Sat May  8 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

k/kdeutils/kdeutils-vl.spec

@@ -1,39 +1,49 @@
 Name: kdeutils
 Summary: K Desktop Environment - Utilities
 Summary(ja): K デスクトップ環境 - ユーティリティ集
-Version: 4.4.3
+Version: 4.5.0
 Release: 1%{?_dist_release}
 
 License: GPLv2
 Group: Applications/System
 URL: http://www.kde.org/
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeutils-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: desktop-file-utils
-BuildRequires: kdebase-devel >= %{version}
+BuildRequires: gmp-devel
+BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
-BuildRequires: gmp-devel
-BuildRequires: libarchive-devel >= 2.8.0
+BuildRequires: libarchive-devel 
 BuildRequires: libzip-devel
 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
+
 Provides:      okteta = 0.1.0-1
 Obsoletes:     okteta < 0.1.0-1
 
 Obsoletes: kdeutils-extras < 4.0.0
 Obsoletes: kdeutils-devel < 4.0.0
+Obsoletes: kdeutils4 < %{version}-%{release}
+Provides:  kdeutils4 = %{version}-%{release}
 
 Requires: %{name}-libs = %{version}-%{release}
 #Requires: %{name}-printer-applet = %{version}-%{release}
 
+Conflicts: kdeutils3
+
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: inagaki
@@ -51,7 +61,7 @@ Includes:
   * ktimer: task scheduler
   * kwalletmanager: kde wallet management tool
   * okteta: binary/hex editor
-  * superkaramba
+  * superkaramba: desktop widgets
   * sweeper: clean unwanted traces the user leaves on the system
 
 %package libs
@@ -64,6 +74,7 @@ Requires: kdelibs4 >= %{version}
 
 %package printer-applet
 Summary:  KDE printer applet
+Summary(ja): KDE プリンタアプレット
 Group:    Applications/System
 Requires: PyKDE4 
 Requires: hal-cups-utils
@@ -73,7 +84,7 @@ Requires: system-config-printer-libs
 %{summary}.
 
 %prep
-%setup -q
+%setup -q -n kdeutils-%{version}
 
 %build
 mkdir -p %{_target_platform}
@@ -84,7 +95,6 @@ unset QTDIR || : ; . /etc/profile.d/qt4.sh
     -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} \
     -DINSTALL_PRINTER_APPLET=TRUE \
@@ -103,7 +113,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libokteta{core,gui,kastencontrollers,kastencore,
 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
+rm -f $RPM_BUILD_ROOT%{_libdir}/liblibkremotecontrol.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsuperkaramba.so
+rm -rf $RPM_BUILD_ROOT%{_includedir}/kde4
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,6 +137,7 @@ 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
@@ -133,6 +146,7 @@ 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
@@ -144,12 +158,12 @@ fi
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
 %{_bindir}/ark
-%{_bindir}/irkick
 %{_bindir}/kcalc
 %{_bindir}/kcharselect
 %{_bindir}/kdf
 %{_bindir}/kfloppy
 %{_bindir}/kgpg
+%{_bindir}/krcdnotifieritem
 %{_bindir}/ktimer
 %{_bindir}/kwalletmanager
 %{_bindir}/kwikdisk
@@ -157,31 +171,32 @@ fi
 %{_bindir}/superkaramba
 %{_bindir}/sweeper
 %{_datadir}/kde4/apps/ark/
-%{_datadir}/kde4/apps/irkick/
 %{_datadir}/kde4/apps/kcalc/
 %{_datadir}/kde4/apps/kcharselect/
 %{_datadir}/kde4/apps/kconf_update/*
 %{_datadir}/kde4/apps/kdf/
 %{_datadir}/kde4/apps/kgpg/
+%{_datadir}/kde4/apps/kremotecontrol/
+%{_datadir}/kde4/apps/kremotecontroldaemon/
 %{_datadir}/kde4/apps/kwalletmanager/
 %{_datadir}/kde4/apps/okteta/
 %{_datadir}/kde4/apps/oktetapart/
-%{_datadir}/kde4/apps/profiles/
 %{_datadir}/kde4/apps/superkaramba/
 %{_datadir}/kde4/apps/sweeper/
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
 %{_datadir}/applications/kde4/*.desktop
 %doc %{_docdir}/HTML/en/*
-%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/oxygen/*/*/*
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/config.kcfg/*
-%{_datadir}/autostart/irkick.desktop
 %{_datadir}/autostart/kgpg.desktop
 %{_datadir}/config/*
+%{_datadir}/mime/packages/*
 %{_libdir}/libkdeinit*.so
 %{_libdir}/kde4/*.so
+%{_libdir}/kde4/plugins/designer/*.so
 %{_mandir}/man1/*
 
 %files libs
@@ -195,6 +210,13 @@ fi
 %{_datadir}/kde4/apps/printer-applet
 
 %changelog
+* Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.5.0-1
+- new upstream release
+
+* Mon Jul  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.5-1
+- new upstream release
+- added Conflicts: kdeutils3
+
 * Fri May  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
 - new upstream release
 

o/oxygen-icon-theme/oxygen-icon-theme-vl.spec

@@ -1,8 +1,7 @@
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
 Summary(ja):   Oxygen アイコンテーマ
-
-Version:       4.4.3
+Version:       4.5.0
 Release:       1%{?_dist_release}
 
 License:       LGPLv3+ 
@@ -15,13 +14,14 @@ BuildArch:     noarch
 BuildRequires: cmake
 Requires(posttrans): gtk2
 Requires(postun): gtk2
+
 Obsoletes: oxygen-icon-theme-scalable < 4.2.85 
 
 %description
-%{summary}.
+Oxygen icon theme.
 
 %description -l ja
-%{summary}.
+Oxygen アイコンテーマ．
 
 %prep
 %setup -q -n oxygen-icons-%{version}
@@ -70,6 +70,15 @@ fi
 %{_datadir}/icons/oxygen/*
 
 %changelog
+* Sun Aug 15 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.0-1
+- new upstream release
+
+* Sat Jul  3 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.5-1
+- new upstream release
+
+* Sat Jun 19 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.4-1
+- new upstream release
+
 * Wed May  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.3-1
 - new upstream release
 - fixed changelog typo