Browse Source

2010-03-13 Ryoichi INAGAKI <ryo1@bc.wakwak.com>

    updated for KDE 4.4.1



git-svn-id: http://trac.vinelinux.org/repos/projects/specs@560 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 14 years ago
parent
commit
e5fe378f04

+ 93 - 63
k/kde-l10n/kde-l10n-vl.spec

@@ -1,7 +1,7 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 URL: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -19,7 +19,7 @@ Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.t
 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
+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
@@ -33,7 +33,7 @@ Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-it-%{version}.
 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
+#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
@@ -53,7 +53,7 @@ Source40: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.
 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
+#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
@@ -62,25 +62,24 @@ Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{versio
 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/%{name}-he-%{version}.tar.bz2
-Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bn_IN-%{version}.tar.bz2
-Source55: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-gu-%{version}.tar.bz2
-Source56: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-is-%{version}.tar.bz2
-Source57: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kn-%{version}.tar.bz2
-Source58: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mai-%{version}.tar.bz2
-Source59: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-mr-%{version}.tar.bz2
-Source60: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ro-%{version}.tar.bz2
-Source61: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tg-%{version}.tar.bz2
-Source62: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hr-%{version}.tar.bz2
-Source63: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hne-%{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
 Source1000: subdirs-kde-l10n
 
-# upstream patches
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdelibs4-devel >= 4.4
 BuildRequires: findutils
 BuildRequires: gettext
 #BuildRequires: kde-filesystem >= 4
@@ -102,15 +101,15 @@ 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}-bn_IN = %{version}-%{release}
+#Obsoletes: %{name}-Bengali
 Provides: %{name}-bg = %{version}-%{release}
 Provides: %{name}-ca = %{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}-gu = %{version}-%{release}
 Provides: %{name}-en_GB = %{version}-%{release}
 Provides: %{name}-es = %{version}-%{release}
 Provides: %{name}-eu = %{version}-%{release}
@@ -120,26 +119,26 @@ Provides: %{name}-fr = %{version}-%{release}
 Provides: %{name}-fy = %{version}-%{release}
 Provides: %{name}-ga = %{version}-%{release}
 Provides: %{name}-gl = %{version}-%{release}
+Provides: %{name}-gu = %{version}-%{release}
 Provides: %{name}-he = %{version}-%{release}
 Provides: %{name}-hi = %{version}-%{release}
-Provides: %{name}-hne = %{version}-%{release}
+#Provides: %{name}-hne = %{version}-%{release}
 Provides: %{name}-hr = %{version}-%{release}
 Provides: %{name}-hu = %{version}-%{release}
 Provides: %{name}-is = %{version}-%{release}
 Provides: %{name}-it = %{version}-%{release}
 Provides: %{name}-kn = %{version}-%{release}
-Provides: %{name}-csb = %{version}-%{release}
 Provides: %{name}-kk = %{version}-%{release}
 Provides: %{name}-km = %{version}-%{release}
 Provides: %{name}-ko = %{version}-%{release}
-Provides: %{name}-ku = %{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}-mr = %{version}-%{release}
 Provides: %{name}-nl = %{version}-%{release}
 Provides: %{name}-no = %{version}-%{release}
 Provides: %{name}-nn = %{version}-%{release}
@@ -154,7 +153,7 @@ 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}
@@ -192,6 +191,7 @@ This package contains many languages support for KDE (except Japanese)
 %setup -q -n %{name}-%{version} -c
 
 for i in $(cat %{SOURCE1000}) ; do
+  echo $i | grep -v '^#' && \
   bzip2 -dc %{_sourcedir}/%{name}-$i-%{version}.tar.bz2 | tar -xf -
 done
 
@@ -199,30 +199,36 @@ done
 
 %build
 for i in $(cat %{SOURCE1000}) ; do
+  if [ -d "%{name}-$i-%{version}" ]; then
   pushd %{name}-$i-%{version}
-  # skip kdewebdev for now, because we're still shipping kdewebdev 3 due to Quanta
-  sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' messages/CMakeLists.txt
-  if [ -e docs/CMakeLists.txt ] ; then
-    sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' docs/CMakeLists.txt
-  fi
-  # remove lilo-config, conflicts with 3.5.9
-  rm -f messages/kdeadmin/kcmlilo.po
-  if [ -e docs/kdeadmin/CMakeLists.txt ] ; then
-    sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' docs/kdeadmin/CMakeLists.txt
-  fi
-  # remove bogus duplicated kdepim stuff from kdenetwork
-  if [ -e docs/kdenetwork/CMakeLists.txt ] ; then
-    sed -i -e 's/add_subdirectory( *korn *)/#add_subdirectory(korn)/g' -e 's/add_subdirectory( *kmail *)/#add_subdirectory(kmail)/g' -e 's/add_subdirectory( *knode *)/#add_subdirectory(knode)/g' docs/kdenetwork/CMakeLists.txt
-  fi
+  for j in . sr@latin ; do
+    if [ -d $j ] ; then
+      # skip kdewebdev for now, because we're still shipping kdewebdev 3 due to Quanta
+      sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' $j/messages/CMakeLists.txt
+      if [ -e $j/docs/CMakeLists.txt ] ; then
+        sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' $j/docs/CMakeLists.txt
+      fi
+      # remove lilo-config, conflicts with 3.5.10
+      rm -f $j/messages/kdeadmin/kcmlilo.po
+      if [ -e $j/docs/kdeadmin/CMakeLists.txt ] ; then
+        sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' $j/docs/kdeadmin/CMakeLists.txt
+      fi
+      # remove bogus duplicated kdepim stuff from kdenetwork
+      if [ -e $j/docs/kdenetwork/CMakeLists.txt ] ; then
+        sed -i -e 's/add_subdirectory( *korn *)/#add_subdirectory(korn)/g' -e 's/add_subdirectory( *kmail *)/#add_subdirectory(kmail)/g' -e 's/add_subdirectory( *knode *)/#add_subdirectory(knode)/g' $j/docs/kdenetwork/CMakeLists.txt
+      fi
+      # some languages still ship the kpilot stuff
+      # zap it so the kpilot package can ship all translations itself
+      rm -f $j/messages/kdepim/kpilot.po
+      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
+    fi
+  done
   mkdir -p %{_target_platform}
   pushd %{_target_platform}
   unset QTDIR || : ; . /etc/profile.d/qt4.sh
-  CFLAGS="${CFLAGS:-%optflags}" \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" \
-  FFLAGS="${FFLAGS:-%optflags}" \
-  cmake \
-    -DCMAKE_BUILD_TYPE=release \
-    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+  %cmake \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
     -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
     -DLIB_INSTALL_DIR:PATH=%{_libdir} \
@@ -230,13 +236,16 @@ for i in $(cat %{SOURCE1000}) ; do
     -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} ..
   popd
   popd
+  fi
 done
 
 %install
 rm -rf %{buildroot}
 
 for i in $(cat %{SOURCE1000}) ; do
+  if [ -d %{name}-$i-%{version}/%{_target_platform} ]; then
   make -C %{name}-$i-%{version}/%{_target_platform} DESTDIR=%{buildroot} install
+  fi
 done
 
 # get rid of flags
@@ -290,8 +299,8 @@ rm -rf %{buildroot}
 %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
+#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/*
@@ -313,6 +322,9 @@ rm -rf %{buildroot}
 %lang(ca) %{_datadir}/kde4/apps/kvtml/latinCatalan*
 %lang(ca) %{_docdir}/HTML/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
 # Czech
 %lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
 %lang(cs) %{_datadir}/locale/cs/entry.desktop
@@ -361,13 +373,11 @@ rm -rf %{buildroot}
 %lang(en_GB) %{_datadir}/kde4/apps/katepart/syntax/logohighlightstyle.en_GB.xml
 %lang(en_GB) %{_datadir}/kde4/apps/kturtle/data/logokeywords.en_GB.xml
 %lang(en_GB) %{_datadir}/kde4/apps/kturtle/examples/en_GB/*.logo
-%if %{buildall}
 # Esperanto
 %lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
 %lang(eo) %{_datadir}/locale/eo/entry.desktop
-%endif
+%lang(eo) %{_docdir}/HTML/eo/
 # Spanish
-%defattr(-,root,root)
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
 %lang(es) %{_datadir}/locale/es/entry.desktop
 %lang(es) %{_datadir}/kde4/apps/ktuberling/sounds/es*
@@ -442,8 +452,8 @@ rm -rf %{buildroot}
 %lang(hi) %{_datadir}/locale/hi/entry.desktop
 
 # Chhattisgarhi
-%lang(hne) %{_datadir}/locale/hne/LC_MESSAGES/*
-%lang(hne) %{_datadir}/locale/hne/entry.desktop
+#lang(hne) %{_datadir}/locale/hne/LC_MESSAGES/*
+#lang(hne) %{_datadir}/locale/hne/entry.desktop
 
 # Croatian
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
@@ -492,8 +502,8 @@ rm -rf %{buildroot}
 %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
+#lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
+#lang(ku) %{_datadir}/locale/ku/entry.desktop
 %if %{buildall}
 # Lao
 %lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
@@ -516,6 +526,7 @@ rm -rf %{buildroot}
 # 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/*
@@ -528,8 +539,8 @@ rm -rf %{buildroot}
 %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
+#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/
@@ -572,6 +583,9 @@ rm -rf %{buildroot}
 %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
 # Norwegian-Nynorsk
 %lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
 %lang(nn) %{_datadir}/locale/nn/LC_SCRIPTS/
@@ -579,7 +593,7 @@ 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/*/*
+#lang(nn) %{_mandir}/nn/*/*
 %if %{buildall}
 # Occitan
 %lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
@@ -632,6 +646,7 @@ rm -rf %{buildroot}
 %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
 # Slovenian
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
 %lang(sl) %{_datadir}/locale/sl/entry.desktop
@@ -643,17 +658,25 @@ rm -rf %{buildroot}
 %lang(sl) %{_datadir}/kde4/apps/kturtle/examples/sl/*.logo
 %lang(sl) %{_docdir}/HTML/sl
 # Serbian
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
+%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/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}/kde4/apps/ktuberling/sounds/sr*
 %lang(sr) %{_docdir}/HTML/sr
 %lang(sr) %{_docdir}/HTML/sr@latin
 %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}/icons/*/*/*/*/*/*/sr/*
 %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) %{_datadir}/locale/sr@latin/LC_MESSAGES/*
@@ -680,9 +703,9 @@ rm -rf %{buildroot}
 %lang(tg) %{_datadir}/kde4/apps/kvtml/tg
 %lang(tg) %{_datadir}/kde4/apps/khangman/tg.txt
 # 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
@@ -693,6 +716,7 @@ rm -rf %{buildroot}
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
 %lang(uk) %{_datadir}/locale/uk/LC_SCRIPTS/
 %lang(uk) %{_datadir}/locale/uk/entry.desktop
+%lang(uk) %{_datadir}/kde4/apps/klettres/uk
 %lang(uk) %{_datadir}/kde4/apps/ktuberling/sounds/uk*
 %lang(uk) %{_datadir}/kde4/apps/kvtml/uk
 %lang(uk) %{_datadir}/kde4/apps/step/objinfo/l10n/uk
@@ -730,6 +754,12 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_docdir}/HTML/zh_TW
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.1-1
+- new upstream release
+
+* Thu Feb 11 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-1
+- new upstream release
+
 * Mon Nov 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.3.3-1
 - new upstream release
 

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

@@ -1,5 +1,5 @@
 Name: kdeartwork
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 
@@ -123,6 +123,13 @@ fi
 
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
+- new upstream release
+
+* Tue Mar  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Wed Nov 25 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.3.3-1
 - new upstream release
 

+ 36 - 15
k/kdebase-runtime/kdebase-runtime-vl.spec

@@ -2,7 +2,7 @@
 
 Name:          kdebase-runtime
 Summary:       K デスクトップ環境 - ランタイム
-Version:       4.3.3
+Version:       4.4.1
 Release:       1%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -13,34 +13,47 @@ URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
 
-Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
+Patch5:        kdebase-runtime-4.3.1-manpath.patch
+# add OnlyShowIn=KDE  to Desktop/Home.desktop (like trash.desktop)
+Patch6:        kdebase-runtime-4.3.3-home_onlyshowin_kde.patch
 
-## Upstream patches
+## 4.4 Upstream patches
+Patch101: kdebase-runtime-4.4.0-virtuosoconverter.patch
 
 # when kdesu was removed, this is/should-be only temporary
 #Conflicts: kdebase3 < 3.5.10-4
 Provides:  kdebase4-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
+# knotify4 provides dbus service org.freedesktop.Notifications too 
+Provides: desktop-notification-daemon
+
 Requires: kdepimlibs >= %{version}
 Requires: eject
 Requires: %{name}-libs = %{version}-%{release}
 # KHelpcenter requires htdig for building search indices
 Requires: htdig
 
+# ensure default/fallback icon theme present
+# beware of bootstrapping, there be dragons
+Requires: oxygen-icon-theme >= %{version}
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
+BuildRequires: attica-devel
+BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
+BuildRequires: exiv2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel
+#BuildRequires: kdelibs-experimental-devel
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libsmbclient-devel
+BuildRequires: libssh-devel >= 0.4.0
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openslp-devel
@@ -48,6 +61,7 @@ BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
+BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel >= 2.3.0
 BuildRequires: xine-lib-devel libxcb-devel
 BuildRequires: xorg-x11-font-utils
@@ -62,6 +76,7 @@ Core runtime for the K Desktop Environment 4.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}
+Requires: kdepimlibs >= %{version}
 Requires: %{name} = %{version}-%{release}
 
 %description libs
@@ -80,11 +95,13 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -q -n kdebase-runtime-%{version}
 
-%patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
-%patch4 -p1 -b .nepomuk-autostart
+#patch5 -p1 -b .manpath
+%patch6 -p1 -b .home_onlyshowin_kde
+
+%patch101 -p1 -b .virtuosoconverter
 
 %build
 mkdir -p %{_target_platform}
@@ -98,9 +115,6 @@ unset QTDIR || : ; . /etc/profile.d/qt4.sh
     -DLIB_INSTALL_DIR:PATH=%{_libdir} \
     -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
     -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
-    -DKDE4_KDM_PAM_SERVICE=kdm \
-    -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
-    -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
     ..
 popd
 
@@ -131,10 +145,6 @@ install -p -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/services/khelpcenter.desktop
 # FIXME: -devel type files, omit for now
 rm -vf  $RPM_BUILD_ROOT%{_libdir}/lib{kwalletbackend,molletnetwork}.so
 
-# file conflicts with kdepim
-rm -f $RPM_BUILD_ROOT%{_datadir}/kde4/apps/nepomuk/ontologies/nco.* \
-      $RPM_BUILD_ROOT%{_datadir}/kde4/apps/nepomuk/ontologies/nmo.*
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -195,15 +205,19 @@ fi
 %{_datadir}/emoticons/kde4/
 %{_datadir}/locale/en_US/entry.desktop
 %{_datadir}/locale/l10n/
+%{_datadir}/locale/currency/
 %{?flags:%exclude %{_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
 
 %files libs
 %defattr(-,root,root,-)
+%{_libdir}/attica_kde.so
 %{_libdir}/libkwalletbackend.so.*
 %{_libdir}/libmolletnetwork.so.*
-# FIXME: move some of these to main pkg, e.g. kcm*.so, kded_*.so
 %{_libdir}/kde4/*.so
+# FIXME: Is this a good idea? Won't multilib apps need KCMs, too?
+%exclude %{_libdir}/kde4/kcm_*.so
+%exclude %{_libdir}/kde4/kded_*.so
 %{_libdir}/kde4/plugins/phonon_platform/
 %{_libdir}/kde4/plugins/styles/
 
@@ -215,6 +229,13 @@ fi
 
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.1-1
+- new upstream release
+
+* Sun Feb 28 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Mon Nov 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.3.3-1
 - new upstream release
 

+ 123 - 73
k/kdebase-workspace/kdebase-workspace-vl.spec

@@ -3,7 +3,7 @@
 Summary: K Desktop Environment - Workspace
 Summary(ja): K デスクトップ環境 - ワークスペース
 Name: kdebase-workspace
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -23,25 +23,44 @@ Source21: kdm.pamd
 Source22: kdm-np.pamd
 Source23: kscreensaver.pamd
 
-Patch1: kdebase-workspace-4.2.96-redhat-startkde.patch
-Patch2: kdebase-workspace-4.2.95-plasma-konsole.patch
-Patch3: kdebase-workspace-4.2.90-show_systemsettings.patch
-Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
+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
+Patch4: kdebase-workspace-4.3.95-ck-shutdown.patch
+# 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
 # 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.2.95-rootprivs.patch
+Patch9: kdebase-workspace-4.3.75-rootprivs.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
-Patch12: kdebase-workspace-4.2.95-default-applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
-Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
-# show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
-Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.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
+# 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
+# support the widgetStyle4 hack in the Qt KDE platform plugin
+Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
+# fix the Games menu in the classic menu mixing up Name and Description
+Patch22: kdebase-workspace-4.4.0-classicmenu-games.patch
 
 # upstream patches:
-# 4.3 branch
+# "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
+
+# 4.4 patches
 
 # trunk
 
@@ -64,14 +83,16 @@ BuildRequires: libXres-devel
 BuildRequires: lm-sensors-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
-BuildRequires: polkit-qt-devel
+BuildRequires: polkit-qt-devel >= 0.95.1
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
 BuildRequires: qedje-devel >= 0.4.0
 BuildRequires: libusb-devel
+BuildRequires: xmms-devel
 
 Requires: %{name}-libs = %{version}-%{release}
+Requires: polkit-kde
 
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
@@ -95,11 +116,7 @@ Requires: kio_sysinfo
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < %{version}-100 
-Provides:  PolicyKit-kde = %{version}-100
-# This can be used by apps which want to use the PolicyKit
-# frontend implementation of the desktop they are running under
-Provides: PolicyKit-authentication-agent
+Requires:  polkit-kde
 
 
 %description
@@ -119,11 +136,10 @@ This package contains:
 * systemsettings (the configuration editor)
 
 %package devel
-Group:    Development/Libraries
 Summary:  Development files for %{name}
-Obsoletes: PolicyKit-kde-devel < 4.2.85
-Provides:  PolicyKit-kde-devel = %{version}-%{release}
-Provides: solid-bluetooth-devel = 4.3-0.1
+Group:    Development/Libraries
+Obsoletes: PolicyKit-kde-devel < 4.3.0
+Provides: solid-bluetooth-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -132,9 +148,9 @@ Requires: kdelibs4-devel
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Provides: solid-bluetooth = 4.3-0.1
+Provides: solid-bluetooth = %{version}-%{release}
 Requires: kdelibs4 >= %{version}
-#Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description libs
 %{summary}.
@@ -148,10 +164,11 @@ Group: User Interface/Desktops
 
 %package -n kdm
 Summary: The KDE login manager
-group: User Interface/X
+Group: User Interface/X
 Provides: kdebase-kdm = %{version}-%{release}
 Provides: service(graphical-login) = kdm
 Requires: kdelibs4 >= %{version}
+Requires: kde-settings-kdm
 
 %description -n kdm
 KDM provides the graphical login screen, shown shortly after boot up,
@@ -191,6 +208,7 @@ Requires: PyKDE4 >= %{version}
 %package akonadi
 Summary: Akonadi integration for KDE Workspace
 Group: User Interface/Desktops
+Provides: plasma-dataengine-akonadi = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: akonadi
 
@@ -211,13 +229,23 @@ Requires: akonadi
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-%patch12 -p1 -b .default-applets
 %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
+%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
+
 
 %build
 mkdir -p %{_target_platform}
@@ -248,43 +276,47 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 # xsession support
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
-ln -s %{_datadir}/kde4/apps/kdm/sessions/kde.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions/kde.desktop
+mv $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kdm/sessions/kde.desktop \
+   $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kdm/sessions/kde-safe.desktop \
+   $RPM_BUILD_ROOT%{_datadir}/xsessions/
 
-# FIXME/TODO: provide kdm config in kde-settings(-kdm)
 # nuke, use external kde-config-kdm
-# rm -rf  %{buildroot}%{_datadir}/config/kdm
+rm -rf $RPM_BUILD_ROOT%{_datadir}/config/kdm
 
-# own %{_kde4_appsdir}/kdm/faces and set default user image
+# own %{_datadir}/kde4/apps/kdm/faces and set default user image
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kdm/faces
 pushd $RPM_BUILD_ROOT%{_datadir}/kde4/apps/kdm/faces
 ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
+## unpackaged files
+rm -fv $RPM_BUILD_ROOT%{_libdir}/kde4/libpolkitkdeprivate*.so
+
 # install gdm session support
 #mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions
 #install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/KDE.desktop
 
 # install rc/script files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown}
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/env.sh
-install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/gpg-agent-startup.sh
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown}
+#install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/env.sh
+#install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/gpg-agent-startup.sh
 #install -m 755 %{SOURCEX} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/vine-bookmarks.sh
-install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/kde/shutdown/gpg-agent-shutdown.sh
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/kde4rc
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/kderc
+#install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/kde/shutdown/gpg-agent-shutdown.sh
+#install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/kde4rc
+#install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/kderc
 
 # default settings dir
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share
-pushd $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share
-  mkdir -p applications apps config icons services
-popd
+#mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share
+#pushd $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share
+#  mkdir -p applications apps config icons services
+#popd
 
 # install pam.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kcheckpass
-install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm
-install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm-np
-install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kscreensaver
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+#install -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kcheckpass
+#install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm
+#install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm-np
+#install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kscreensaver
 
 # 
 
@@ -323,20 +355,20 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING README
 #config(noreplace) %{_sysconfdir}/X11/dm/Sessions/KDE.desktop
-%config(noreplace) %{_sysconfdir}/kde4rc
-%config(noreplace) %{_sysconfdir}/kderc
-%dir %{_sysconfdir}/kde
-%{_sysconfdir}/kde/env
-%{_sysconfdir}/kde/shutdown
-%{_sysconfdir}/pam.d/kcheckpass
-%{_sysconfdir}/pam.d/kscreensaver
-%{_bindir}/kaccess                           
-%{_bindir}/kapplymousetheme                  
-%{_bindir}/kblankscrn.kss                    
-%{_bindir}/kcheckrunning                     
-%{_bindir}/kcminit                           
-%{_bindir}/kcminit_startup                   
-%{_bindir}/kdostartupconfig4                 
+#config(noreplace) %{_sysconfdir}/kde4rc
+#config(noreplace) %{_sysconfdir}/kderc
+#dir %{_sysconfdir}/kde
+#{_sysconfdir}/kde/env
+#{_sysconfdir}/kde/shutdown
+#{_sysconfdir}/pam.d/kcheckpass
+#{_sysconfdir}/pam.d/kscreensaver
+%{_bindir}/kaccess
+%{_bindir}/kapplymousetheme
+%{_bindir}/kblankscrn.kss
+%{_bindir}/kcheckrunning
+%{_bindir}/kcminit
+%{_bindir}/kcminit_startup
+%{_bindir}/kdostartupconfig4
 %{_bindir}/kfontinst
 %{_bindir}/kfontview
 %{_bindir}/klipper
@@ -354,47 +386,52 @@ fi
 %{_bindir}/ksystraycmd
 %{_bindir}/kwin*
 %{_bindir}/kxkb
-%{_bindir}/polkit-kde-authorization
 %{_bindir}/plasma-desktop
+%{_bindir}/plasma-netbook
 %{_bindir}/plasma-overlay
 %{_bindir}/plasmaengineexplorer
 %{_bindir}/plasmoidviewer
 %{_bindir}/plasmawallpaperviewer
 %{_bindir}/safestartkde
-%{_bindir}/setscheduler
 %{_bindir}/solid-action-desktop-gen
 %{_bindir}/solid-bluetooth
 %{_bindir}/solid-network
 %{_bindir}/solid-powermanagement
 %{_bindir}/startkde
 %{_bindir}/systemsettings
+
 %{_datadir}/kde4/apps/color-schemes/
 %{_datadir}/kde4/apps/desktoptheme/
 %{_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/kconf_update/
 %{_datadir}/kde4/apps/kcontrol/
 %{_datadir}/kde4/apps/kdisplay/
-%{_datadir}/kde4/apps/kdm/sessions/kde.desktop
+#{_datadir}/kde4/apps/kdm/sessions/kde.desktop
 %{_datadir}/kde4/apps/kfontinst/
 %{_datadir}/kde4/apps/kfontview/
 %{_datadir}/kde4/apps/khotkeys/
 %{_datadir}/kde4/apps/kmenuedit/
 %{_datadir}/kde4/apps/konqsidebartng/
+%{_datadir}/kde4/apps/kscreenlocker/
 %{_datadir}/kde4/apps/ksplash/
 %{_datadir}/kde4/apps/ksysguard/
 %{_datadir}/kde4/apps/kthememanager/
 %{_datadir}/kde4/apps/kwin/
 %{_datadir}/kde4/apps/kwrited/
 %{_datadir}/kde4/apps/plasma/
+%{_datadir}/kde4/apps/plasma-desktop/
+%{_datadir}/kde4/apps/plasma-netbook/
 %{_datadir}/kde4/apps/plasma_scriptengine_ruby/
 %{_datadir}/kde4/apps/powerdevil/
 %{_datadir}/kde4/apps/solid/
 %{_datadir}/kde4/apps/solidfakenetbackend/
 %{_datadir}/kde4/apps/systemsettings/
 
+%{_datadir}/config/aurorae.knsrc
 %{_datadir}/config/background.knsrc
 %{_datadir}/config/colorschemes.knsrc
 %{_datadir}/config/ksplash.knsrc
@@ -412,8 +449,10 @@ fi
 %{_datadir}/autostart/plasma.desktop
 %{_datadir}/autostart/plasma-desktop.desktop
 %{_datadir}/applications/kde4/*
+%{_sysconfdir}/dbus-1/system.d/*.conf
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
+%{_datadir}/dbus-1/system-services/*.service
 %{_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*.desktop
 %{_docdir}/HTML/en/kcontrol/
@@ -421,7 +460,7 @@ fi
 %{_docdir}/HTML/en/kmenuedit/
 %{_docdir}/HTML/en/ksysguard/
 %{_docdir}/HTML/en/kxkb/
-%{_docdir}/HTML/en/PolicyKit-kde/
+#{_docdir}/HTML/en/PolicyKit-kde/
 %{_docdir}/HTML/en/plasma/
 %{_docdir}/HTML/en/systemsettings/
 %{_datadir}/icons/hicolor/*/*/*
@@ -444,6 +483,7 @@ fi
 %{_libdir}/kde4/plasma_appletscriptengine_dashboard.so
 %{_libdir}/kde4/plasma_appletscriptengine_webapplet.so
 %{_libdir}/kde4/plasma_containment_*.so
+%{_libdir}/kde4/plasma_containmentactions_*.so
 %{_libdir}/kde4/plasma_engine_*.so
 %{_libdir}/kde4/plasma-geolocation-gps.so
 %{_libdir}/kde4/plasma-geolocation-ip.so
@@ -453,10 +493,12 @@ fi
 %{_libexecdir}/kde4/kcheckpass
 %{_libexecdir}/kde4/kcmdatetimehelper
 %{_libexecdir}/kde4/kfontprint
-%{_libexecdir}/kde4/kio_fonts_helper
+%{_libexecdir}/kde4/fontinst
+%{_libexecdir}/kde4/fontinst_helper
+%{_libexecdir}/kde4/fontinst_x11
 %{_libexecdir}/kde4/krootimage
 %{_libexecdir}/kde4/kscreenlocker
-%{_libexecdir}/kde4/polkit-kde-manager
+%{_libexecdir}/kde4/ksysguardprocesslist_helper
 %{_libexecdir}/kde4/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_libdir}/libkdeinit*.so
@@ -464,11 +506,10 @@ fi
 %{_libdir}/libsystemsettingsview.so
 %{_libdir}/kconf_update_bin/*
 %{_mandir}/man1/plasmaengineexplorer.1*
+
 # googlegadgets
 %exclude %{_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_libdir}/kde4/plasma_scriptengine_ggl.so
-%exclude %{_datadir}/kde4/apps/plasma/plasmoids/ggl_*
-%exclude %{_datadir}/kde4/services/plasma-applet-ggl*
 %exclude %{_datadir}/kde4/services/*googlegadgets.desktop
 # python widget
 %exclude %{_datadir}/kde4/services/plasma-scriptengine*python.desktop
@@ -476,15 +517,19 @@ fi
 %exclude %{_libdir}/kde4/plasma_engine_akonadi.so
 %exclude %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
-%dir %{_datadir}/kde-settings
-%{_datadir}/kde-settings/*
+%{_datadir}/polkit-1/actions/*.policy
+
+#dir %{_datadir}/kde-settings
+#{_datadir}/kde-settings/*
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 %{_libdir}/libplasma_applet-system-monitor.so
+%{_libdir}/kde4/plugins/designer/ksignalplotterwidgets.so
 %{_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
+%{_libdir}/kde4/plugins/gui_platform/libkde.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -503,7 +548,7 @@ fi
 
 %files -n kdm
 %defattr(-,root,root,-)
-%{_sysconfdir}/pam.d/kdm*
+#{_sysconfdir}/pam.d/kdm*
 %{_bindir}/genkdmconf
 %{_bindir}/kdm
 %{_bindir}/kdmctl
@@ -511,14 +556,14 @@ fi
 %{_libexecdir}/kde4/kdm_config
 %{_libexecdir}/kde4/kdm_greet
 %{_libdir}/kde4/kgreet_*.so
-%{_datadir}/config/kdm
 %{_datadir}/config/kdm.knsrc
 %{_docdir}/HTML/en/kdm/
 %dir %{_datadir}/kde4/apps/doc
 %{_datadir}/kde4/apps/doc/kdm
 %{_datadir}/kde4/apps/kdm
-%exclude %{_datadir}/kde4/apps/kdm/sessions/kde.desktop
 %{_datadir}/kde4/services/kdm.desktop
+#{_datadir}/config/kdm
+#exclude %{_datadir}/kde4/apps/kdm/sessions/kde.desktop
 
 %files -n ksysguardd
 %defattr(-,root,root,-)
@@ -542,8 +587,6 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/kde4/plasma_package_ggl.so
 %{_libdir}/kde4/plasma_scriptengine_ggl.so
-%{_datadir}/kde4/apps/plasma/plasmoids/ggl_*
-%{_datadir}/kde4/services/plasma-applet-ggl*
 %{_datadir}/kde4/services/*googlegadgets.desktop
 
 %files python-applet
@@ -558,6 +601,13 @@ fi
 %{_datadir}/kde4/services/plasma-engine-akonadi.desktop
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.1-1
+- new upstream release
+
+* Sun Feb 28 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Sun Nov 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.3.3-1
 - new upstream release
 

+ 8 - 1
k/kdebase/kdebase-vl.spec

@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Summary(ja): K デスクトップ環境 - 基本ファイル
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -194,6 +194,13 @@ fi
 %{_libdir}/kde4/devel/lib*.so
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
+- new upstream release
+
+* Tue Mar  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Sun Nov 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.3.3-1
 - new upstream release
 

+ 59 - 29
k/kdebindings/kdebindings-vl.spec

@@ -6,8 +6,14 @@
 %define java 0
 
 %define pykde4_akonadi 1
-%define pyqt4_version 4.6
+%define pyqt4_version 4.7
+# ugly hack for Qt4 version auto-detection -- inagaki
+%define _qt4_notfound %(eval "pkg-config --exists Qt"; echo $?)
+%if %{_qt4_notfound}
+%define qt4_version 4.6.1
+%else
 %define qt4_version %(pkg-config --modversion Qt)
+%endif
 %define mono_dir %{_prefix}/lib/mono
 
 #if 0%{?ruby}%{?smoke}
@@ -23,35 +29,34 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.3
+Version: 4.4.1
 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
 
-# patch to disable examples (trouble with them installing to the buildroot)
-Patch0:  kdebindings-qyoto-examples.patch
-# workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
-Patch1:  kdebindings-4.2.85-old-PyQt4.patch
-# make the Python plugin factory work without python-devel
-Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
-
-URL: http://www.kde.org/
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
 Group: System Environment/Libraries
+URL: http://www.kde.org/
+
+# fix build with CMAKE_SKIP_RPATH - also needs sed line below
+# WARNING: This is a bunch of quick hacks to get this to build. Please do not
+#          commit this upstream without further discussion.
+Patch1:  kdebindings-4.3.75-no-rpath.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  akonadi-devel >= 1.1.0
+BuildRequires:  akonadi-devel >= 1.3.0
 BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  polkit-qt-devel
+# kdebindings does not support polkit-qt-1 yet
+#BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
-BuildRequires:  qscintilla-devel >= 2.2
+BuildRequires:  qscintilla-devel >= 2.4
 BuildRequires:  soprano-devel
 %if %{csharp}
 BuildRequires:  mono-core
@@ -253,9 +258,12 @@ Falcon plugin for the Kross archtecture in KDE4.
 
 %prep
 %setup -q
-%patch0
-%patch1 -p0 -b .old-PyQt4
 
+# do the no-rpath hack last, after the upstream backports (if any)
+#patch1 -p1 -b .no-rpath
+#sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
+
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 unset QTDIR || : ; . /etc/profile.d/qt4.sh
@@ -300,9 +308,9 @@ unset QTDIR || : ; . /etc/profile.d/qt4.sh
   %else
     -DBUILD_java=OFF \
   %endif
+    -DCMAKE_SKIP_RPATH:BOOL=OFF \
     ..
 popd
-%build
 #    -DRUBY_INCLUDE_PATH:PATH=%{ruby_arch} \
 
 # smp build not recommended (upstream)
@@ -319,6 +327,17 @@ mv $RPM_BUILD_ROOT%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
 ln -s %{_bindir}/pykdeuic4 \
       $RPM_BUILD_ROOT%{python_sitearch}/PyQt4/uic/pykdeuic4.py
 
+# install pykde4 examples under correct dir
+#mkdir -p %{buildroot}%{_docdir}
+#rm -f %{buildroot}%{_datadir}/kde4/apps/pykde4/examples/*.py?
+#mv %{buildroot}%{_datadir}/kde4/apps/pykde4 %{buildroot}%{_docdir}/
+
+# bz#551534 - qyoto doesn't pull mono in
+%if %{csharp}
+find %{buildroot} -name \*.dll -not -type l | xargs chmod ugo+x
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
@@ -342,9 +361,14 @@ fi
 %files devel
 %defattr(-,root,root)
 %if %{smoke}
+%{_bindir}/smoke*
 %{_includedir}/smoke.h
 %{_includedir}/smoke
+%{_libdir}/libcppparser.so
 %{_libdir}/libsmoke*.so
+%dir %{_libdir}/smokegen
+%{_libdir}/smokegen/*.so
+%{_datadir}/smokegen
 %endif
 
 %files -n PyKDE4
@@ -379,14 +403,14 @@ fi
 %{_libdir}/libplasma-sharp.so
 %{_libdir}/libsoprano-sharp.so
 %{_libdir}/libqimageblitz-sharp.so
-%{mono_dir}/2.0/qimageblitz.dll
-%{mono_dir}/2.0/akonadi.dll
-%{mono_dir}/2.0/kde-dotnet.dll
-%{mono_dir}/2.0/khtml-dll.dll
-%{mono_dir}/2.0/ktexteditor-dotnet.dll
-%{mono_dir}/2.0/nepomuk-dll.dll
-%{mono_dir}/2.0/plasma-dll.dll
-%{mono_dir}/2.0/soprano.dll
+%{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/plasma-dll.dll
+%{mono_dir}/qyoto/soprano.dll
 %{mono_dir}/gac/akonadi
 %{mono_dir}/gac/kde-dotnet
 %{mono_dir}/gac/khtml-dll
@@ -408,11 +432,11 @@ fi
 %{_libdir}/libqyoto.so
 %{_libdir}/libqyotoshared.so.1
 %{_libdir}/libqyotoshared.so.1.0.0
-%{mono_dir}/2.0/qt-dotnet.dll
-%{mono_dir}/2.0/qtscript.dll
-%{mono_dir}/2.0/qttest.dll
-%{mono_dir}/2.0/qtuitools.dll
-%{mono_dir}/2.0/qtwebkit.dll
+%{mono_dir}/qyoto/qt-dotnet.dll
+%{mono_dir}/qyoto/qtscript.dll
+%{mono_dir}/qyoto/qttest.dll
+%{mono_dir}/qyoto/qtuitools.dll
+%{mono_dir}/qyoto/qtwebkit.dll
 %{mono_dir}/gac/qt-dotnet
 %{mono_dir}/gac/qtscript
 %{mono_dir}/gac/qttest
@@ -507,6 +531,12 @@ fi
 %endif
 
 %changelog
+* Tue Mar  9 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
+- new upstream release
+- added -DCMAKE_SKIP_RPATH:BOOL=OFF option to cmake
+  (see https://bugs.kde.org/show_bug.cgi?id=214824)
+- built with new toolchain
+
 * Wed Nov 25 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.3.3-1
 - new upstream release
 

+ 14 - 4
k/kdegraphics/kdegraphics-vl.spec

@@ -5,7 +5,7 @@
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Summary(ja): K デスクトップ環境 - グラフィックアプリケーション集
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
@@ -156,7 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README
 %doc %{_datadir}/doc/HTML/en/*
 %{_bindir}/*
-%{_datadir}/config/*
+#{_datadir}/config/*
 %{_datadir}/applications/kde4/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/kde4/services/*.desktop
@@ -171,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/apps/gwenview
 %{_datadir}/kde4/apps/kolourpaint
 %{_datadir}/kde4/apps/kruler
+%{_datadir}/kde4/apps/solid/actions/*
 %{_datadir}/kde4/apps/svgpart
 %{_libdir}/kde4/gsthumbnail.so
 %{_libdir}/kde4/gvpart.so
@@ -184,7 +185,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/icons/hicolor/*/apps/gwenview.*
 %{_datadir}/icons/hicolor/*/apps/kcolorchooser.*
-%{_datadir}/icons/hicolor/*/apps/kgamma.*
+#{_datadir}/icons/hicolor/*/apps/kgamma.*
 %{_datadir}/icons/hicolor/*/apps/kolourpaint.*
 %{_datadir}/icons/hicolor/*/apps/kruler.*
 %{_datadir}/icons/hicolor/*/apps/ksnapshot.*
@@ -195,6 +196,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_datadir}/kde4/apps/kipi
 %{_datadir}/kde4/apps/libkdcraw
+%{_datadir}/kde4/apps/libkexiv2
 %{_datadir}/icons/hicolor/*/apps/kipi.*
 %{_datadir}/icons/hicolor/*/apps/kdcraw.*
 %{_datadir}/kde4/servicetypes/kipiplugin.desktop
@@ -205,7 +207,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libkolourpaint_lgpl.so.*
 %{_libdir}/libksane.so.*
 %{_libdir}/libokularcore.so.*
-%{_libdir}/strigi/strigita_dvi.so
+%{_libdir}/strigi/strigiea_dvi.so
+%{_libdir}/strigi/strigiea_tiff.so
 %{_libdir}/strigi/strigila_mobi.so
 
 %files devel
@@ -226,6 +229,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/msits.protocol
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
+- new upstream release
+
+* Sat Mar  6 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Wed Nov 25 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.3.3-1
 - new upstream release
 

+ 94 - 39
k/kdelibs/kdelibs-vl.spec

@@ -1,5 +1,6 @@
-%define phonon_ver 4.3.1
-%define soprano_ver 2.3.1
+%define attica_ver 0.1.2
+%define phonon_ver 4.3.80
+%define soprano_ver 2.4.0.1
 %define strigi_ver 0.7
 
 %define kde_major_version 4
@@ -9,7 +10,7 @@
 Summary: K Desktop Environment 4 - Libraries
 Summary(ja): K デスクトップ環境 4 - ライブラリ
 Name: kdelibs
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 Group: System Environment/Libraries
 License: LGPLv2+
@@ -18,45 +19,57 @@ Source1: kde4.sh
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-4.2.96-parallel_devel.patch
+Patch0: kdelibs-4.3.85-parallel_devel.patch
 # fix kde#149705
 Patch2: kdelibs-4.2.85-kde149705.patch
-# openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
-Patch6: kdelibs-4.0.0-openssl.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.0.2-install-all-css.patch
+Patch8: kdelibs-4.3.90-install_all_css.patch
+# add Fedora/V-R to KHTML UA string
+Patch9: kdelibs-4.0.2-branding.patch
 # don't cache kdeglobals paths because they change after profile directories
 # are loaded from kde4rc
 Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
 # workaround for policykit
-Patch11: kdelibs-4.1.72-policykit-workaround.patch
+Patch11: kdelibs-4.3.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
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
+# COMMENT ME PLEASE
 Patch20: kdelibs-4.1.70-cmake.patch
-Patch21: kdelibs-4.3.1-ossl-1.x.patch
-# patch to fix keditbookmarks crash (kde#160679)
-Patch22: kdelibs-4.3.0-bookmarks.patch
+# disable drkonqi by default, fedora prefers/wants abrt
 Patch24: kdelibs-4.3.1-drkonq.patch
-# fix build of fakes.c due to missing #include <string.h>
-Patch25: kdelibs-4.3.3-fix-kdefakes-build.patch
 # use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
-# workaound for low-mem systems (ppc64)
+# 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
 
-# upstream
-# 4.3 branch
+# upstreamable
+
+# 4.4 upstream
 
 # security fix
+## Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: qt4-devel >= 4.5.0
+BuildRequires: qt4-devel >= 4.6.0
 BuildRequires: alsa-lib-devel
 BuildRequires: aspell-devel
+BuildRequires: attica-devel >= %{attica_ver} 
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
@@ -67,21 +80,23 @@ BuildRequires: gamin-devel
 BuildRequires: giflib-devel
 BuildRequires: jasper-devel
 BuildRequires: krb5-devel
-BuildRequires: libacl-devel
-BuildRequires: libattr-devel
+BuildRequires: libacl-devel libattr-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
-BuildRequires: libutempter-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: libutempter-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
 BuildRequires: phonon-devel >= %{phonon_ver}
+BuildRequires: polkit-qt-devel
+BuildRequires: qca2-devel
+BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver}
 BuildRequires: strigi-devel >= %{strigi_ver}
-BuildRequires: subversion
+#BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
 BuildRequires: libX11-devel libXcomposite-devel libXdamage-devel
@@ -89,20 +104,37 @@ 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
+
+# for apidoc
 BuildRequires: doxygen
 BuildRequires: graphviz
+BuildRequires: qt4-doc
 
-Requires: kdelibs-common 
-Requires: qt4 >= 4.5.0
+Requires: kde-settings
 Requires: xdg-utils
 Requires: hicolor-icon-theme
+Requires: kdelibs-common 
+Requires: qt4 >= 4.6.0
 # used in kde4.(sh|csh)
 Requires: coreutils grep
+Requires: phonon >= %{phonon_ver} 
+Requires: shared-desktop-ontologies
+Requires: soprano >= %{soprano_ver} 
+Requires: strigi-libs >= %{strigi_ver} 
 Requires(post): shared-mime-info, desktop-file-utils, gtk2
 Requires(postun): shared-mime-info, desktop-file-utils, gtk2
 
-Provides: kdelibs4 = %{version}-%{release}
 Obsoletes: kdesupport
+Obsoletes: kdelibs4 < %{version}-%{release}
+Provides:  kdelibs4 = %{version}-%{release}
+
+Provides: kross(javascript) = %{version}-%{release}
+Provides: kross(qtscript) = %{version}-%{release}
+
+Obsoletes: kdelibs-experimental < 4.3.75 
+Provides: kdelibs-experimental = %{version}-%{release} 
 
 %description
 Libraries for the K Desktop Environment 4.
@@ -125,14 +157,22 @@ Summary: Header files for compiling KDE 4 applications.
 Summary(ja): KDE 4 アプリケーションをコンパイルするためのヘッダーファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: cmake >= 2.6.2-3
+Requires: attica-devel >= %{attica_ver} 
 Requires: automoc4 >= 0.9.88
-Requires: qt4-devel >= 4.5
+Requires: cmake >= 2.6.2-3
 Requires: openssl-devel
 Requires: phonon-devel
-Requires: pcre-devel
+# considered part of nepomuk-devel
+Requires: shared-desktop-ontologies-devel
+Requires: qt4-devel
+# do we really still need all these below? -- Rex
+Requires: strigi-devel
+Requires: bzip2-devel gamin-devel libacl-devel
+
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
+Obsoletes: kdelibs-experimental-devel < 4.3.75 
+Provides:  kdelibs-experimental-devel = %{version}-%{release}
 Provides:  plasma-devel = %{version}-%{release}
 Obsoletes: kdesupport-devel
 
@@ -163,26 +203,27 @@ API ドキュメントを含んでいます。
 %setup -q
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%patch8 -p1 -b .all-css
+%patch5 -p1 -b .k3spell-hunspell
+%patch8 -p1 -b .install_all_css
+%patch9 -p1 -b .branding
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch21 -p1 -b .ossl-1.x
-%patch22 -p1 -b .bookmarks
 %patch24 -p1 -b .drkonq
-%patch25 -p1 -b .fix-kdefakes-build
-%ifarch ppc64
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
-%endif
+%patch27 -p1 -b .no_rpath
+
+# upstreamable patches
 
 # upstream patches
-# 4.3
 
 # security fix
+## Not Upstreamed? why not ? -- Rex
 %patch200 -p1 -b .CVE-2009-2702
 
+
 %build
 # add release version
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
@@ -239,8 +280,8 @@ do
 done
 popd
 
-install -p -m 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde4.sh
-install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde4.csh
+#install -p -m 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde4.sh
+#install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/kde4.csh
 
 # fix Sonnet documentation multilib conflict
 bunzip2 $RPM_BUILD_ROOT%{_docdir}/HTML/en/sonnet/index.cache.bz2
@@ -278,22 +319,26 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %files
 %defattr(-,root,root)
 %doc AUTHORS README TODO COPYING.LIB
-%config(noreplace) %{_sysconfdir}/profile.d/*
+#config(noreplace) %{_sysconfdir}/profile.d/*
 %config %{_sysconfdir}/xdg/menus/*.menu
+%{_sysconfdir}/dbus-1/system.d/*
 %{_bindir}/*
 %exclude %{_bindir}/kconfig_compiler4
 %dir %{_datadir}/kde4/apps
 %{_datadir}/kde4/apps/*
 # kdewidgets
 %exclude %{_bindir}/makekdewidgets4
+%exclude %{_bindir}/kde4-doxygen.sh
 %exclude %{_datadir}/kde4/apps/kdewidgets
 %exclude %{_datadir}/kde4/apps/cmake
 %{_datadir}/config/*
 %{_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/system-services/*
 %{_datadir}/mime/packages/kde.xml
+%{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
-%{_datadir}/icons/hicolor/*/actions/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_docdir}/HTML/en/sonnet
 %{_docdir}/HTML/en/kioslave
 %{_libdir}/lib*.so.*
@@ -337,18 +382,28 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %{_bindir}/kconfig_compiler4
 %{_bindir}/makekdewidgets4
 %{_bindir}/kde4-doxygen.sh
+%{_includedir}/*
 %dir %{_libdir}/kde4/devel
 %{_libdir}/kde4/devel/lib*.so
 #exclude %{_libdir}/libkdeinit4_*.so
 %{_datadir}/kde4/apps/cmake
 %{_datadir}/kde4/apps/kdewidgets
-%{_includedir}/*
+%{_mandir}/man1/kdecmake.1*
+%{_mandir}/man1/makekdewidgets.1*
 
 %files apidocs
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/kdelibs4-apidocs
 
 %changelog
+* Sat Mar  6 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
+- dropt kde4.(sh|csh) (kde-settings provides them) 
+- new upstream release
+
+* Sun Feb 11 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Mon Nov 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.3.3-1
 - new upstream release
 - added Patch25, 26

+ 10 - 2
k/kdemultimedia/kdemultimedia-vl.spec

@@ -5,7 +5,7 @@
 Name: kdemultimedia
 Summary: Multimedia applications for the K Desktop Environment (KDE).
 Summary(ja): K デスクトップ環境 - マルチメディアアプリケーション集
-Version: 4.3.3
+Version: 4.4.1
 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
@@ -23,7 +23,7 @@ BuildRequires: cdparanoia-devel
 BuildRequires: flac-devel
 BuildRequires: glib2-devel
 BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel
+BuildRequires: kdelibs4-devel
 BuildRequires: libtheora-devel
 ## needed to build Kscd, keep for now -- Kevin
 #BuildRequires: libtunepimp-devel
@@ -138,6 +138,7 @@ fi
 %{_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}/config/dragonplayerrc
 %{_datadir}/applications/kde4/*
 %{_datadir}/autostart/*
@@ -168,6 +169,13 @@ fi
 %exclude %{_libdir}/libkdeinit*.so
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
+- new upstream release
+
+* Sat Mar  6 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Wed Nov 25 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.3.3-1
 - new upstream release
 

+ 12 - 4
k/kdenetwork/kdenetwork-vl.spec

@@ -1,5 +1,5 @@
 Name: kdenetwork
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 Summary: K Desktop Environment - Network Applications
 Summary(ja): K デスクトップ環境 - ネットワークアプリケーション集
@@ -21,7 +21,7 @@ BuildRequires: libboost-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
-BuildRequires: kdelibs-experimental >= %{version}
+BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
@@ -169,12 +169,13 @@ fi
 %{_datadir}/kde4/apps/krfb
 %{_datadir}/kde4/apps/krdc
 %{_datadir}/kde4/apps/remoteview
-%{_datadir}/kde4/apps/desktoptheme/default/widgets/kget.svg
+#{_datadir}/kde4/apps/desktoptheme/default/widgets/kget.svg
 %{_datadir}/config/kopeterc
 %{_datadir}/applications/kde4/*
 %exclude %{_datadir}/applications/kde4/*ppp*.desktop
 %{_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/services/*
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
 %{_datadir}/sounds/*
@@ -183,7 +184,7 @@ fi
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/oxygen/*/*/*
 %{_libdir}/kde4/*.so
-%{_libdir}/mozilla/plugins/libskypebuttons.so
+%{_libdir}/mozilla/plugins/skypebuttons.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -208,6 +209,13 @@ fi
 %{_datadir}/kde4/apps/kppp
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
+- new upstream release
+
+* Sat Mar  6 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Wed Nov 25 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.3.3-1
 - new upstream release
 

+ 12 - 4
k/kdepim-runtime/kdepim-runtime-vl.spec

@@ -1,8 +1,8 @@
-%define akonadi_version 1.1.95
+%define akonadi_version 1.2.60
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 
 License: GPLv2
@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: akonadi-devel >= %{akonadi_version}
 BuildRequires: desktop-file-utils
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel >= %{version}
+BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: zlib-devel
 BuildRequires: soprano-devel
 BuildRequires: libxslt-devel
@@ -114,6 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/kde4/*.so
+%{_datadir}/autostart/*
 %{_datadir}/akonadi/agents/*
 %{_datadir}/applications/kde4/*
 %{_datadir}/config/*rc
@@ -125,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/kde4/akonadi/xml
+#{_includedir}/kde4/akonadi/xml
 %{_libdir}/lib*.so
 
 %files libs
@@ -133,6 +134,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so.*
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.1-1
+- new upstream release
+
+* Tue Mar  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Mon Nov 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.3.3-1
 - new upstream release
 

+ 18 - 5
k/kdepim/kdepim-vl.spec

@@ -2,7 +2,7 @@
 %define vine4 %(grep -c 4. /etc/vine-release)
 
 Name: kdepim
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 Summary: PIM (Personal Information Manager) for KDE
 Summary(ja): KDE の個人情報管理(PIM)アプリケーション集
@@ -146,11 +146,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_bindir}/*
-%{_libdir}/libkpilot_*.so
+#{_libdir}/libkpilot_*.so
 %{_libdir}/kde4/*.so
 %{_libdir}/strigi/*.so
+%{_libdir}/akonadi/*
 %{_datadir}/applications/kde4/*.desktop
 %{_datadir}/kde4/apps/akregator
+#{_datadir}/kde4/apps/akonadi/*
+%{_datadir}/kde4/apps/akonadiconsole/*
+%{_datadir}/kde4/apps/blogilo/*
 %{_datadir}/kde4/apps/kaddressbook
 %{_datadir}/kde4/apps/kalarm
 %{_datadir}/kde4/apps/kconf_update/*
@@ -166,13 +170,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/apps/kontactsummary
 %{_datadir}/kde4/apps/korgac
 %{_datadir}/kde4/apps/korganizer
-%{_datadir}/kde4/apps/kpilot
+#{_datadir}/kde4/apps/kpilot
 %{_datadir}/kde4/apps/ktimetracker
 %{_datadir}/kde4/apps/kwatchgnupg
 %{_datadir}/kde4/apps/libkdepim
 %{_datadir}/kde4/apps/libkleopatra
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/autostart/*
+%{_datadir}/akonadi/*
 %{_datadir}/config/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/icons/hicolor/*/*/*
@@ -180,6 +185,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/*
 %{_datadir}/kde4/servicetypes/*
 %doc %{_docdir}/HTML/en/*
+%{_mandir}/man1/*
 
 %files libs
 %defattr(-,root,root)
@@ -188,11 +194,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/kde4/*
+#{_includedir}/kde4/*
 %{_libdir}/lib*.so
-%exclude %{_libdir}/libkpilot_*.so
+#exclude %{_libdir}/libkpilot_*.so
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
+- new upstream release
+
+* Sat Mar  6 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.0-1
+- new upstream release
+- built with new toolchain
+
 * Sun Oct 25 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.3.2-1
 - new upstream release
 

+ 27 - 16
k/kdepimlibs/kdepimlibs-vl.spec

@@ -1,8 +1,8 @@
 %define akonadi_subpkg 1
-%define akonadi_version 1.2.0
+%define akonadi_version 1.2.61
 
 Name: kdepimlibs
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 Summary: K Desktop Environment 4 - PIM Libraries
 Summary(ja): K デスクトップ環境 4 - PIM ライブラリ
@@ -22,7 +22,8 @@ Requires: akonadi >= %{akonadi_version}
 Requires: kdelibs4 >= %{version}
 
 BuildRequires: akonadi-devel >= %{akonadi_version} 
-BuildRequires: libboost-devel >= 1.33.1
+BuildRequires: libboost-devel >= 1.34.0
+BuildRequires: libboost-graph >= 1.34.0
 BuildRequires: cyrus-sasl-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -66,15 +67,15 @@ Requires: akonadi >= %{akonadi_version}
 %description akonadi
 %{summary}.
 
-#%package apidocs
-#Group: Development/Documentation
-#Summary: kdepimlibs API documentation
+%package apidocs
+Group: Development/Documentation
+Summary: kdepimlibs API documentation
 #Requires: kde-filesystem
 #BuildArch: noarch
 
-#%description apidocs
-#This package includes the kdepimlibs API documentation in HTML
-#format for easy browsing.
+%description apidocs
+This package includes the kdepimlibs API documentation in HTML
+format for easy browsing.
 
 %prep
 %setup -q -n kdepimlibs-%{version}
@@ -97,8 +98,8 @@ popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 # build apidocs
-#export QTDOCDIR=`pkg-config --variable=docdir Qt`
-#kde4-doxygen.sh --doxdatadir=%{_docdir}/HTML/en/common .
+export QTDOCDIR=`pkg-config --variable=docdir Qt`
+kde4-doxygen.sh --doxdatadir=%{_docdir}/HTML/en/common .
 
 %install
 rm -rf %{buildroot}
@@ -142,8 +143,8 @@ done
 popd
 
 # install apidocs
-#mkdir -p %{buildroot}%{_docdir}/HTML/en
-#cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_docdir}/HTML/en/kdepimlibs-apidocs
+mkdir -p %{buildroot}%{_docdir}/HTML/en
+cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_docdir}/HTML/en/kdepimlibs-apidocs
 
 
 %post -p /sbin/ldconfig
@@ -175,6 +176,7 @@ rm -rf %{buildroot}
 %{_libdir}/libakonadi-*.so.*
 %endif
 %{_datadir}/kde4/apps/akonadi-kde
+%{_datadir}/kde4/apps/akonadi
 
 %files devel
 %defattr(-,root,root,-)
@@ -186,12 +188,21 @@ rm -rf %{buildroot}
 %{_libdir}/gpgmepp/
 
 #if 0%{?apidocs}
-#files apidocs
-#defattr(-,root,root,-)
-#{_docdir}/HTML/en/kdepimlibs-apidocs/
+%files apidocs
+%defattr(-,root,root,-)
+%{_docdir}/HTML/en/kdepimlibs-apidocs/
 #endif
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.1-1
+- new upstream release
+- added apidocs package
+
+* Sat Feb 13 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-1
+- new upstream release
+- added BR: libboost-graph
+- built with new toolchain
+
 * Mon Nov 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.3.3-1
 - new upstream release
 

+ 5 - 1
k/kdetoys/kdetoys-vl.spec

@@ -1,5 +1,5 @@
 Name: kdetoys
-Version: 4.3.3
+Version: 4.4.1
 Release: 1%{?_dist_release}
 Summary: K Desktop Environment - Toys and Amusements
 Summary(ja): K デスクトップ環境 - 小さなアプリケーション集
@@ -80,6 +80,10 @@ fi
 %{_mandir}/man6/amor.6*
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.1-1
+- new upstream release
+- built with new toolchain
+
 * Wed Nov 25 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.3.3-1
 - new upstream release
 

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

@@ -1,8 +1,8 @@
 %define SYSINFO_DISTRO vine
 
 Name:           kio_sysinfo
-Version:        20090620
-Release:        3%{?_dist_release}
+Version:        20090930
+Release:        1%{?_dist_release}
 Summary:        KIO slave which shows basic system information
 
 Group:          System Environment/Libraries
@@ -29,15 +29,9 @@ requested by users.
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 unset QTDIR || : ; . /etc/profile.d/qt4.sh
-CFLAGS="${CFLAGS:-%optflags}" \
-CXXFLAGS="${CXXFLAGS:-%optflags}" \
-FFLAGS="${FFLAGS:-%optflags}" \
-cmake \
-    -DCMAKE_BUILD_TYPE=release \
-    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+%cmake \
     -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} \
     -DSYSINFO_DISTRO:STRING=%{SYSINFO_DISTRO} ..
@@ -70,6 +64,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Feb 13 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 20090930-1
+- new upstream release
+
 * Sun Aug 30 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 20090620-3
 - Initial build for Vine Linux
 

+ 7 - 1
o/oxygen-icon-theme/oxygen-icon-theme-vl.spec

@@ -2,7 +2,7 @@ Name:          oxygen-icon-theme
 Summary:       Oxygen icon theme 
 Summary(ja):   Oxygen アイコンテーマ
 
-Version:       4.3.3
+Version:       4.4.1
 Release:       1%{?_dist_release}
 
 License:       LGPLv3+ 
@@ -70,6 +70,12 @@ fi
 %{_datadir}/icons/oxygen/*
 
 %changelog
+* Sun Mar  7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.1-1
+- new upsteam release
+
+* Thu Feb 11 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-1
+- new upsteam release
+
 * Mon Nov 23 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.3.3-1
 - new upsteam release