update: akonadi, grantlee, kdegames3, kde-l10n, kde-i18n-ja, oxygen-icon-theme

NEW: grantlee


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

a/akonadi/akonadi-vl.spec

@@ -1,4 +1,4 @@
-%define _qt4_ver 4.6.3
+%define _qt4_ver 4.7.1
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_version})
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
@@ -6,8 +6,8 @@
 Name:    akonadi
 Summary: PIM Storage Service
 Summary(ja): PIM ストレージサービス
-Version: 1.4.0
+Version: 1.5.0
-Release: 3%{?_dist_release}
+Release: 1%{?_dist_release}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -15,15 +15,15 @@ URL:     http://download.akonadi-project.org/
 
 Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 
+%define mysql_conf_timestamp 20110107
 # shrink default initial db size a bit (approx 140mb->28mb)
-%define mysql_conf_timestamp 20100209
+Patch1: akonadi-mysql_conf.patch
-Patch1: akonadi-1.1.1-mysql_conf.patch
 
 ## upstream patches
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cmake >= 2.6.0
-BuildRequires: qt4-devel >= 4.5.0
+BuildRequires: qt4-devel >= 4.4
 BuildRequires: automoc4
 BuildRequires: MySQL-devel
 BuildRequires: MySQL-server
@@ -39,7 +39,7 @@ BuildRequires: libICE-devel libXext-devel
 # these similar to how phonon is done currently.
 Requires: qt4-MySQL
 # not *strictly* required, but we need a functional default configuration
-#Requires: mysql-server
+#Requires: MySQL-server
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -61,8 +61,10 @@ Requires: qt4 = %{_qt4_version}
 
 %package devel
 Summary: Developer files for %{name}
+Summary(ja): %{name} の開発用ファイル
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel
 
 %description devel
 %{summary}.
@@ -81,9 +83,9 @@ PATH="$PATH:`/usr/bin/pkg-config --variable=bindir Qt`"
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %cmake \
-  -DCONFIG_INSTALL_DIR=%{_sysconfdir} \
+    -DCONFIG_INSTALL_DIR=%{_sysconfdir} \
-  -DINSTALL_QSQLITE_IN_QT_PREFIX:PATH=%{_qt4_plugindir} \
+    -DINSTALL_QSQLITE_IN_QT_PREFIX:PATH=%{_qt4_plugindir} \
-  ..
+    ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -108,7 +110,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %postun
 /sbin/ldconfig ||:
 if [ $1 -eq 0 ] ; then
-  update-mime-database %{_datadir}/mime &> /dev/null ||:
+    update-mime-database %{_datadir}/mime &> /dev/null ||:
 fi
 
 
@@ -119,6 +121,8 @@ fi
 %config(noreplace) %{_sysconfdir}/akonadi/mysql-global.conf
 %config(noreplace) %{_sysconfdir}/akonadi/mysql-global-mobile.conf
 %config(noreplace) %{_sysconfdir}/akonadi/mysql-local.conf
+%{_bindir}/akonadi_agent_launcher
+%{_bindir}/akonadi_agent_server
 %{_bindir}/akonadi_control
 %{_bindir}/akonadi_rds
 %{_bindir}/akonadictl
@@ -142,8 +146,8 @@ fi
 
 
 %changelog
-* Tue Jan 18 2011 Shu KONNO <owa@bg.wakwak.com> - 1.4.0-3
+* Mon Jan 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.5.0-1
-- rebuilt with libboost-1.45.0
+- new upstream release
 
 * Mon Sep 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.4.0-2
 - rebuilt with rpm-4.8.1

g/grantlee/grantlee-vl.spec

@@ -0,0 +1,131 @@
+%define apidocs 0
+
+# apidocs disabled until we agree on a standard path.
+
+Name:           grantlee
+Summary:        Qt string template engine based on the Django template system
+Version:        0.1.8
+Release:        1%{?_dist_release}
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://www.gitorious.org/grantlee/pages/Home
+Source0:        http://downloads.%{name}.org/%{name}-%{version}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  qt4-devel cmake
+
+%if 0%{?apidocs}   
+BuildRequires:  doxygen
+%endif
+
+%description
+Grantlee is a plug-in based String Template system written 
+using the Qt framework. The goals of the project are to make it easier for
+application developers to separate the structure of documents from the 
+data they contain, opening the door for theming.
+
+The syntax is intended to follow the syntax of the Django template system, 
+and the design of Django is reused in Grantlee. 
+Django is covered by a BSD style license.
+
+Part of the design of both is that application developers can extend 
+the syntax by implementing their own tags and filters. For details of 
+how to do that, see the API documentation.
+
+For template authors, different applications using Grantlee will present 
+the same interface and core syntax for creating new themes. For details of 
+how to write templates, see the documentation.
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%package apidocs
+Group: Documentation
+Summary: Grantlee API documentation
+BuildArch: noarch
+
+%description apidocs
+This package includes the Grantlee API documentation in HTML
+format for easy browsing.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+sed -i 's,${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX},%{_libdir},' CMakeLists.txt
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake .. -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=%{_prefix}
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+%if 0%{?apidocs}
+make docs -C %{_target_platform}
+%endif
+
+%install
+rm -rf %{buildroot}
+make install -C %{_target_platform} DESTDIR=%{buildroot}
+
+%if 0%{?apidocs}
+mkdir -p %{buildroot}%{_docdir}/HTML/en/grantlee-apidocs
+cp -prf %{_target_platform}/apidocs/html/* %{buildroot}%{_docdir}/HTML/en/grantlee-apidocs
+%endif
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS CHANGELOG COPYING.LIB README GOALS
+%{_libdir}/lib%{name}*.so.*
+%{_libdir}/%{name}
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}
+%{_includedir}/%{name}_core.h
+%{_includedir}/%{name}_templates.h
+%{_libdir}/lib%{name}*.so
+
+# %files apidocs
+# %{_docdir}/HTML/en/grantlee-apidocs
+
+%changelog
+* Mon Jan 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.1.8-1
+- Initial build for VineSeed
+
+* Mon Sep 27 2010 Thomas Janssen <thomasj@fedoraproject.org> 0.1.6-1
+- grantlee 0.1.6
+
+* Fri Aug 27 2010 Thomas Janssen <thomasj@fedoraproject.org> 0.1.5-1
+- grantlee 0.1.5
+
+* Sun Jul 04 2010 Thomas Janssen <thomasj@fedoraproject.org> 0.1.2-1
+- grantlee 0.1.2
+
+* Tue May 18 2010 Thomas Janssen <thomasj@fedoraproject.org> 0.1.1-3
+- disabled apidocs until we find a standard path
+
+* Tue May 11 2010 Jaroslav Reznik <jreznik@redhat.com> 0.1.1-2
+- added -apidocs subpackage
+
+* Sun May 09 2010 Thomas Janssen <thomasj@fedoraproject.org> 0.1.1-1
+- grantlee 0.1.1
+- fixed Group
+
+* Thu Apr 15 2010 Thomas Janssen <thomasj@fedoraproject.org> 0.1.0-1
+- initial fedora release

k/kde-i18n-ja/kde-i18n-ja-vl.spec

@@ -1,4 +1,4 @@
-%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+%if %{?_dist_release} == "vl5"
 %define kde KDE
 %else
 %define kde KDE3
@@ -8,7 +8,7 @@ Name: kde-i18n-ja
 Summary: Japanese support for %{kde}
 Summary(ja): %{kde} の日本語サポートパッケージ
 Version: 3.5.10
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -23,7 +23,7 @@ BuildRequires: kdelibs3-devel
 BuildRequires: arts-devel
 Requires: kdelibs3
 
-%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+%if %{?_dist_release} == "vl5"
 Conflicts: kde-l10n
 %endif
 
@@ -53,7 +53,7 @@ done
 # See http://fedoraproject.org/wiki/Languages
 rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/flag.png
 
-%if %{?_dist_release} != "vl4" && %{?_dist_release} != "vl5"
+%if %{?_dist_release} != "vl5"
 # remove .mo and entry.desktop files which conflict with KDE4 kde-l10n
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/amor.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ark.mo
@@ -190,6 +190,7 @@ rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdeqt.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdessh.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdesu.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdesud.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdevelop.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdf.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdialog.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdmconfig.mo
@@ -273,6 +274,7 @@ rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kjots.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kjumpingcube.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klaptopdaemon.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klettres.mo
+rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klickety.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klines.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klipper.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/klock.mo
@@ -513,6 +515,7 @@ rm -rf %{buildroot}%{_docdir}/HTML/*/kiten
 rm -rf %{buildroot}%{_docdir}/HTML/*/kjots
 rm -rf %{buildroot}%{_docdir}/HTML/*/kjumpingcube
 rm -rf %{buildroot}%{_docdir}/HTML/*/klettres
+rm -rf %{buildroot}%{_docdir}/HTML/*/klickety
 rm -rf %{buildroot}%{_docdir}/HTML/*/klines
 rm -rf %{buildroot}%{_docdir}/HTML/*/klipper
 rm -rf %{buildroot}%{_docdir}/HTML/*/kmag
@@ -696,6 +699,9 @@ rm -f ../file.list
 %files -f ../file.list
 
 %changelog
+* Sat Feb 12 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-6
+- removed klickety.mo, now in kde-l10n (VineSeed)
+
 * Sat Jan  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-5
 - added Conflicts: kde-l10n (VinePlus/5)
 

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

@@ -1,9 +1,7 @@
-%define buildall 0
-
 Name: kde-l10n
 Summary: Internationalization support for KDE
-Summary(ja): KDE の国際化サポート
+Summary(ja): KDE の国際化サポートパッケージ
-Version: 4.5.1
+Version: 4.6.0
 Release: 1%{?_dist_release}
 
 Group: User Interface/Desktops
@@ -19,13 +17,13 @@ Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.t
 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
+#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
+#Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2
 Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ga-%{version}.tar.bz2
 Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-gl-%{version}.tar.bz2
 Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-gu-%{version}.tar.bz2
@@ -44,7 +42,8 @@ Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kn-%{version}.
 Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ko-%{version}.tar.bz2
 Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lt-%{version}.tar.bz2
 Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-lv-%{version}.tar.bz2
-Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ml-%{version}.tar.bz2
+Source34: ftp://ftp.kde.org/pub/src/stable/%{version}/src/kde-l10n/%{name}-mai-%{version}.tar.bz2
+#Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ml-%{version}.tar.bz2
 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
 Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nds-%{version}.tar.bz2
 Source37: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
@@ -69,16 +68,12 @@ Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{versio
 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: cmake
 BuildRequires: findutils
 BuildRequires: gettext
-BuildRequires: cmake
+BuildRequires: kdelibs4-devel >= %{version}
-
-Provides: %{name}-ja = %{version}-%{release}
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -86,28 +81,45 @@ Packager: inagaki
 
 %description
 Internationalization support for KDE
-This package contains Japanese language support for KDE
+
+%description -l ja
+KDE の国際化サポートパッケージです．
+
+
+%package ja
+Summary: Japanese language support for KDE
+Summary(ja): KDE の日本語サポートパッケージ
+Group: User Interface/Desktops
+Obsoletes: %{name} < %{version}-%{release}
+Provides: %{name} = %{version}-%{release}
+
+%description ja
+Japanese language support for KDE
+
+%description ja -l ja
+KDE の日本語サポートパッケージです．
 
 %package extra
 Summary: Internationalization support for KDE (except Japanese) 
-Summary(ja): KDE の国際化サポート (日本語以外) 
+Summary(ja): KDE の国際化サポートパッケージ (日本語以外) 
 Group: User Interface/Desktops
 Provides: %{name}-ar = %{version}-%{release}
 Provides: %{name}-bg = %{version}-%{release}
 Provides: %{name}-ca = %{version}-%{release}
-Provides: %{name}-ca@valencia = %{version}-%{release}
+Provides: %{name}-ca-valencia = %{version}-%{release}
 Provides: %{name}-cs = %{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}-engb = %{version}-%{release}
+#Provides: %{name}-eo = %{version}-%{release}
 Provides: %{name}-es = %{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}
+#Provides: %{name}-fy = %{version}-%{release}
 Provides: %{name}-ga = %{version}-%{release}
 Provides: %{name}-gl = %{version}-%{release}
 Provides: %{name}-gu = %{version}-%{release}
@@ -125,7 +137,8 @@ Provides: %{name}-kn = %{version}-%{release}
 Provides: %{name}-ko = %{version}-%{release}
 Provides: %{name}-lt = %{version}-%{release}
 Provides: %{name}-lv = %{version}-%{release}
-Provides: %{name}-ml = %{version}-%{release}
+Provides: %{name}-mai = %{version}-%{release}
+#Provides: %{name}-ml = %{version}-%{release}
 Provides: %{name}-nb = %{version}-%{release}
 Provides: %{name}-nds = %{version}-%{release}
 Provides: %{name}-nl = %{version}-%{release}
@@ -134,6 +147,7 @@ Provides: %{name}-pa = %{version}-%{release}
 Provides: %{name}-pl = %{version}-%{release}
 Provides: %{name}-pt = %{version}-%{release}
 Provides: %{name}-pt_BR = %{version}-%{release}
+Provides: %{name}-ptbr = %{version}-%{release}
 Provides: %{name}-ro = %{version}-%{release}
 Provides: %{name}-ru = %{version}-%{release}
 Provides: %{name}-sk = %{version}-%{release}
@@ -145,7 +159,9 @@ Provides: %{name}-tr = %{version}-%{release}
 Provides: %{name}-uk = %{version}-%{release}
 Provides: %{name}-wa = %{version}-%{release}
 Provides: %{name}-zh_CN = %{version}-%{release}
+Provides: %{name}-zhcn = %{version}-%{release}
 Provides: %{name}-zh_TW = %{version}-%{release}
+Provides: %{name}-zhtw = %{version}-%{release}
 
 %description extra
 Internationalization support for KDE
@@ -159,14 +175,16 @@ 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
+  if [ -d "%{name}-$i-%{version}" -a -d "kde-l10n-4.4.5/kde-l10n-$i-4.4.5" ]; then
+    cp -a kde-l10n-4.4.5/kde-l10n-$i-4.4.5/* %{name}-$i-%{version}/
+    rm -rfv kde-l10n-4.4.5/kde-l10n-$i-4.4.5 
+  fi
   if [ -d "%{name}-$i-%{version}" ]; then
   pushd %{name}-$i-%{version}
   for j in . sr@latin ; do
@@ -191,10 +209,6 @@ 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}
@@ -217,13 +231,10 @@ 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
+  make install/fast DESTDIR=%{buildroot} -C %{name}-$i-%{version}/%{_target_platform}
   fi
 done
 
-# get rid of flags
-rm -f %{buildroot}%{_datadir}/locale/*/flag.png
-
 # get rid of documentation for apps which have been dropped from KDE 4
 rm -rf %{buildroot}%{_docdir}/HTML/*/aktion
 rm -rf %{buildroot}%{_docdir}/HTML/*/flashkard
@@ -236,10 +247,22 @@ rm -rf %{buildroot}%{_docdir}/HTML/*/ksirtet
 rm -rf %{buildroot}%{_docdir}/HTML/*/ksmiletris
 rm -rf %{buildroot}%{_docdir}/HTML/*/ksplashml
 
+# get rid of flags which should be included in kdebase-runtime-flags
+# they are currently,
+# kde-l10n-km-4.5.1/messages/flag.png
+# kde-l10n-th-4.5.1/messages/flag.png
+# kde-l10n-zh_CN-4.5.1/messages/flag.png
+# (get this fixed upstream) -- Rex
+rm -rfv $RPM_BUILD_ROOT%{_datadir}/locale/*/flag.png
+
+pushd $RPM_BUILD_ROOT
+rm -rf %{_docdir}/HTML/{gl,it,lt,nb,nl,nn,pl,ro,ru,sr,sv,uk
+popd
+
 %clean
 rm -rf %{buildroot}
 
-%files
+%files ja
 %defattr(-,root,root)
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
 %lang(ja) %{_datadir}/locale/ja/LC_SCRIPTS/
@@ -264,7 +287,6 @@ rm -rf %{buildroot}
 %lang(ca) %{_datadir}/kde4/apps/khangman/ca.txt
 %lang(ca) %{_datadir}/kde4/apps/ktuberling/sounds/ca*
 %lang(ca) %{_datadir}/kde4/apps/kvtml/ca
-%lang(ca) %{_datadir}/kde4/apps/kvtml/latinCatalan*
 %lang(ca) %{_docdir}/HTML/ca
 %lang(ca) %{_mandir}/ca
 # Catalan-Valencian
@@ -300,7 +322,10 @@ rm -rf %{buildroot}
 # Greek
 %lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
 %lang(el) %{_datadir}/locale/el/entry.desktop
+%lang(el) %{_datadir}/kde4/apps/ktuberling/sounds/el*
 %lang(el) %{_datadir}/kde4/apps/kvtml/el
+%lang(el) %{_docdir}/HTML/el
+%lang(el) %{_mandir}/el
 # British
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/locale/en_GB/entry.desktop
@@ -311,9 +336,9 @@ rm -rf %{buildroot}
 %lang(en_GB) %{_datadir}/kde4/apps/kturtle/data/logokeywords.en_GB.xml
 %lang(en_GB) %{_datadir}/kde4/apps/kturtle/examples/en_GB/*.logo
 # Esperanto
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
+#lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-%lang(eo) %{_datadir}/locale/eo/entry.desktop
+#lang(eo) %{_datadir}/locale/eo/entry.desktop
-%lang(eo) %{_docdir}/HTML/eo/
+#lang(eo) %{_docdir}/HTML/eo/
 # Spanish
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
 %lang(es) %{_datadir}/locale/es/entry.desktop
@@ -350,8 +375,8 @@ rm -rf %{buildroot}
 %lang(fr) %{_docdir}/HTML/fr
 %lang(fr) %{_mandir}/fr
 # Frisian
-%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
+#lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
-%lang(fy) %{_datadir}/locale/fy/entry.desktop
+#lang(fy) %{_datadir}/locale/fy/entry.desktop
 # Irish
 %lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
 %lang(ga) %{_datadir}/locale/ga/LC_SCRIPTS/
@@ -423,6 +448,7 @@ rm -rf %{buildroot}
 %lang(ko) %{_docdir}/HTML/ko/
 # Lithuanian
 %lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+%lang(lt) %{_datadir}/locale/lt/LC_SCRIPTS/
 %lang(lt) %{_datadir}/locale/lt/entry.desktop
 %lang(lt) %{_docdir}/HTML/lt/
 %lang(lt) %{_mandir}/lt
@@ -430,11 +456,14 @@ rm -rf %{buildroot}
 %lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
 %lang(lv) %{_datadir}/locale/lv/entry.desktop
 %lang(lv) %{_datadir}/locale/lv/LC_SCRIPTS
+# Maithili
+%lang(mai) %{_datadir}/locale/mai/LC_MESSAGES/*
+%lang(mai) %{_datadir}/locale/mai/entry.desktop
 # Malayalam
-%lang(ml) %{_datadir}/locale/ml/LC_MESSAGES/*
+#lang(ml) %{_datadir}/locale/ml/LC_MESSAGES/*
-%lang(ml) %{_datadir}/locale/ml/LC_SCRIPTS/
+#lang(ml) %{_datadir}/locale/ml/LC_SCRIPTS/
-%lang(ml) %{_datadir}/locale/ml/entry.desktop
+#lang(ml) %{_datadir}/locale/ml/entry.desktop
-%lang(ml) %{_datadir}/kde4/apps/klettres/ml/
+#lang(ml) %{_datadir}/kde4/apps/klettres/ml/
 # Norwegian
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
 %lang(nb) %{_datadir}/locale/nb/LC_SCRIPTS/
@@ -516,15 +545,14 @@ rm -rf %{buildroot}
 %lang(ru) %{_datadir}/kde4/apps/kvtml/ru
 %lang(ru) %{_docdir}/HTML/ru
 %lang(ru) %{_datadir}/kde4/apps/katepart/syntax/logohighlightstyle.ru.xml
+%lang(ru) %{_datadir}/kde4/apps/klettres/ru
+%lang(ru) %{_datadir}/kde4/apps/ktuberling/sounds/ru*
 %lang(ru) %{_datadir}/kde4/apps/kturtle/data/logokeywords.ru.xml
 %lang(ru) %{_datadir}/kde4/apps/kturtle/examples/ru/*.logo
 %lang(ru) %{_mandir}/ru
 # Slovak
 %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
 %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
@@ -539,15 +567,6 @@ rm -rf %{buildroot}
 %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
 %lang(sr) %{_datadir}/locale/sr/LC_SCRIPTS/
 %lang(sr) %{_datadir}/locale/sr/entry.desktop
-%lang(sr) %{_datadir}/locale/sr@ijekavian/LC_MESSAGES/*
-%lang(sr) %{_datadir}/locale/sr@ijekavian/LC_SCRIPTS/
-%lang(sr) %{_datadir}/locale/sr@ijekavian/entry.desktop
-%lang(sr) %{_datadir}/locale/sr@ijekavianlatin/LC_MESSAGES/*
-%lang(sr) %{_datadir}/locale/sr@ijekavianlatin/LC_SCRIPTS/
-%lang(sr) %{_datadir}/locale/sr@ijekavianlatin/entry.desktop
-%lang(sr) %{_datadir}/locale/sr@latin/LC_MESSAGES/*
-%lang(sr) %{_datadir}/locale/sr@latin/LC_SCRIPTS/
-%lang(sr) %{_datadir}/locale/sr@latin/entry.desktop
 %lang(sr) %{_datadir}/kde4/apps/ktuberling/sounds/sr*
 %lang(sr) %{_datadir}/icons/*/*/*/*/sr/*
 %lang(sr) %{_datadir}/icons/*/*/*/*/sr@latin/*
@@ -564,9 +583,7 @@ rm -rf %{buildroot}
 %lang(sr) %{_datadir}/kde4/apps/khangman/sr@latin.txt
 %lang(sr) %{_datadir}/kde4/apps/kvtml/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/LC_SCRIPTS/
@@ -616,6 +633,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Feb  5 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.0-1
+- new upstream release
+
 * Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.1-1
 - new upstream release
 - dropt Patch0

k/kde-settings/kde-settings-vl.spec

@@ -1,16 +1,18 @@
-%define majorver 4.4
+%define majorver 4.6
-%define minorver 13
+%define minorver 4
 
 Summary: Config files for kde
 Summary(ja): KDE の設定ファイル
 Name:    kde-settings
 Version: %{majorver}.%{minorver}
-Release: 6%{?_dist_release}
+Release: 1%{?_dist_release}
 
 Group:   System Environment/Base
 License: Public Domain
 URL:     http://fedorahosted.org/kde-settings
+
 Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{majorver}-%{minorver}.tar.bz2
+Source1: kdm.conf
 
 # customized for Vine Linux by Source
 # don't use pam_selinux.so
@@ -23,8 +25,7 @@ Source23: kdmrc.vine5
 Source24: kdmrc.seed
 
 # customized for Vine Linux by Patch
-Patch1:   kdmrc_vine.patch
+Patch2:   kde-settings-backgroundrc_vine.patch
-Patch2:   backgroundrc_vine.patch
 Patch3:   kde-settings-4.4-13-vine_url.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -84,6 +85,7 @@ Requires: pulseaudio-module-x11
 ## kde3
 Requires: alsa-plugins-pulseaudio
 ## kde4: -pulseaudio plugins are installed for all phonon backends by default
+
 %description pulseaudio
 %{summary}.
 
@@ -91,7 +93,6 @@ Requires: alsa-plugins-pulseaudio
 %prep
 %setup -q -n %{name}-%{majorver}-%{minorver}
 
-#patch1 -p1 
 %patch2 -p1
 %patch3 -p1
 
@@ -116,6 +117,9 @@ ln -sf ../../../etc/kde/kdm $RPM_BUILD_ROOT%{_datadir}/config/kdm
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/kdm
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/kdm
 
+# own as part of plymouth/kdm integration hacks (#551310)
+mkdir -p -m775 $RPM_BUILD_ROOT%{_localstatedir}/spool/gdm
+
 # rhel stuff
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/fedora-bookmarks.sh \
       $RPM_BUILD_ROOT%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
@@ -128,12 +132,15 @@ install -m644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm-np
 install -m644 %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share/config/konversationrc
 
 # overwrite kdmrc
-%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+%if %{?_dist_release} == "vl5"
 install -m644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/kde/kdm/kdmrc
 %else
-install -m644 %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/kde/kdm/kdmrc
+#install -m644 %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/kde/kdm/kdmrc
 %endif
 
+# /var/run tempfs fun
+install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/kdm.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -147,17 +154,11 @@ rm -rf $RPM_BUILD_ROOT
 [ -d %{_datadir}/config/kdm -a ! -L %{_datadir}/config/kdm ] && \
   mv -v %{_datadir}/config/kdm %{_datadir}/config/kdm.rpmorig ||:
 
-#post kdm
+%post kdm
-## KDM fixup(s)
+(grep "^ServerArgsLocal=-nr" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
-# handle move from /etc/X11/xdm/kdmrc to /etc/kde/kdm/kdmrc
+ sed -i -e "s|^ServerArgsLocal=-nr|ServerArgsLocal=-background none|" \
-#[ ! -f %{_sysconfdir}/kde/kdm/kdmrc -a -f %{_sysconfdir}/kde/kdm/kdmrc.rpmnew ] && \
+ %{_sysconfdir}/kde/kdm/kdmrc
-#  cp -a %{_sysconfdir}/kde/kdm/kdmrc.rpmnew %{_sysconfdir}/kde/kdm/kdmrc ||:
+) ||:
-## kdm v3 themes don't work (#444730)
-## this hack assumes %_datadir != %_kde4_datadir
-#(grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
-# sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_datadir}/kde4/apps/kdm/themes/Constantine|" \
-# %{_sysconfdir}/kde/kdm/kdmrc
-#) ||:
 
 %triggerin kdm -- kdm >= 4
 # kdm v3 themes don't work (#444730)
@@ -166,7 +167,7 @@ rm -rf $RPM_BUILD_ROOT
 ) ||:
 
 %triggerin kdm -- kdmbase3
-# kdm v3 themes don't work (#444730)
+# kdm v4 themes don't work
 # this hack assumes %_datadir != %_kde4_datadir
 (grep "^Theme=%{_datadir}/kde4/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && sed -i -e "s|^Theme=%{_datadir}/kde4/apps/kdm/themes/.*|Theme=%{_datadir}/apps/kdm/themes/circles|" %{_sysconfdir}/kde/kdm/kdmrc
 ) ||:
@@ -178,10 +179,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/kde/env/env.sh
 %{_sysconfdir}/kde/env/gpg-agent*.sh
 %{_sysconfdir}/kde/env/gtk2_rc_files.sh
-#if 0%{?fedora}
-#{_sysconfdir}/kde/env/fedora-bookmarks.sh
-#{_sysconfdir}/kde/shutdown/gpg-agent*.sh
-#endif
 %config(noreplace) /etc/pam.d/kcheckpass
 %config(noreplace) /etc/pam.d/kscreensaver
 # drop noreplace, so we can be sure to get the new kiosk bits
@@ -199,12 +196,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/lib/kdm
 %config(noreplace) %{_localstatedir}/lib/kdm/backgroundrc
 %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/kde/kdm/README*
-%{_sysconfdir}/kde/kdm/Xaccess
+%config(noreplace) %{_sysconfdir}/kde/kdm/Xaccess
-%{_sysconfdir}/kde/kdm/Xresources
+%config(noreplace) %{_sysconfdir}/kde/kdm/Xresources
-%{_sysconfdir}/kde/kdm/Xsession
+%config(noreplace) %{_sysconfdir}/kde/kdm/Xsession
-%{_sysconfdir}/kde/kdm/Xwilling
+%config(noreplace) %{_sysconfdir}/kde/kdm/Xsetup
-%{_sysconfdir}/kde/kdm/Xsetup
+%config(noreplace) %{_sysconfdir}/kde/kdm/Xwilling
+%{_sysconfdir}/tmpfiles.d/kdm.conf
 %attr(1777,root,root) %dir %{_localstatedir}/run/kdm
+%attr(0775,root,root) %dir %{_localstatedir}/spool/gdm
 
 %files pulseaudio
 %defattr(-,root,root,-)
@@ -212,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
+- updated to 4.6-4 
+
 * Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.13-6
 - added %%triggerin for kdmrc
 

k/kdegames3/kdegames3-vl.spec

@@ -1,13 +1,13 @@
 %define make_cvs 1
 
 # These games are already in KDE 4.
-%define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktron ktuberling kwin4 lskat
+%define donotcompilelist katomic kbattleship kblackbox kbounce kgoldrunner kjumpingcube klines klickety kmahjongg kmines knetwalk kolf konquest kpat kreversi ksame kshisen kspaceduel ktron ktuberling kwin4 lskat
 
 Name: kdegames3
-Summary: K Desktop Environment 3 - Games not ported to KDE 4
+Summary: KDE Games not ported to KDE 4
-Summary(ja): K デスクトップ環境 3 - KDE 4 に移植されていないゲーム集
+Summary(ja): KDE 4 に移植されていない KDE ゲーム集
 Version: 3.5.10
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: GPLv2
 Group: Applications/Games
@@ -32,7 +32,7 @@ Requires: hicolor-icon-theme
 %description
 Games and gaming libraries for KDE which have not been ported to KDE 4 yet.
 Included with this package are: atlantik, kasteroids, kbackgammon, kboxpush,
-kenolaba, kfouleggs, klickety, kpoker, ksirtet, ksmiletris, ksnake.
+kenolaba, kfouleggs, kpoker, ksirtet, ksmiletris, ksnake.
 
 
 %package devel
@@ -171,6 +171,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-2
+- dropt klickety
+
 * Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
 - updated to 3.5.10 based on FC
 - built with new toolchain

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

@@ -1,7 +1,7 @@
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
 Summary(ja):   Oxygen アイコンテーマ
-Version:       4.5.1
+Version:       4.6.0
 Release:       1%{?_dist_release}
 
 License:       LGPLv3+ 
@@ -21,7 +21,7 @@ Obsoletes: oxygen-icon-theme-scalable < 4.2.85
 Oxygen icon theme.
 
 %description -l ja
-Oxygen アイコンテーマ．
+Oxygen テーマのアイコン集です．
 
 %prep
 %setup -q -n oxygen-icons-%{version}
@@ -70,6 +70,9 @@ fi
 %{_datadir}/icons/oxygen/*
 
 %changelog
+* Sat Feb 12 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.0-1
+- new upstream release
+
 * Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.5.1-1
 - new upstream release