update: kdelibs, kde-l10n, kdepimlibs, libktorrent, ktorrent

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

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

@@ -1,7 +1,7 @@
 Name: kde-l10n
 Summary: Internationalization support for KDE
 Summary(ja): KDE の国際化サポートパッケージ
-Version: 4.7.0
+Version: 4.7.2
 Release: 1%{?_dist_release}
 
 Group: User Interface/Desktops
@@ -10,13 +10,14 @@ URL: http://www.kde.org
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
 Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
-Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
-Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca@valencia-%{version}.tar.bz2
-Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.tar.bz2
-Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-de-%{version}.tar.bz2
-Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-el-%{version}.tar.bz2
-Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-en_GB-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bs-%{version}.tar.bz2
+Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca@valencia-%{version}.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2
+Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-de-%{version}.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-el-%{version}.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-en_GB-%{version}.tar.bz2
 #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
@@ -104,6 +105,7 @@ Summary(ja): KDE の国際化サポートパッケージ (日本語以外)
 Group: User Interface/Desktops
 Provides: %{name}-ar = %{version}-%{release}
 Provides: %{name}-bg = %{version}-%{release}
+Provides: %{name}-bs = %{version}-%{release}
 Provides: %{name}-ca = %{version}-%{release}
 Provides: %{name}-ca-valencia = %{version}-%{release}
 Provides: %{name}-cs = %{version}-%{release}
@@ -180,7 +182,7 @@ done
 for i in $(cat %{SOURCE1000}) ; do
   if [ -d "%{name}-$i-%{version}" ]; then
   pushd %{name}-$i-%{version}
-  for j in . sr@latin ; do
+  for j in . *@* ; 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
@@ -248,9 +250,9 @@ rm -rf %{buildroot}%{_docdir}/HTML/*/ksplashml
 # (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
+#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}
@@ -273,6 +275,9 @@ rm -rf %{buildroot}
 %lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 %lang(bg) %{_datadir}/locale/bg/entry.desktop
 %lang(bg) %{_datadir}/kde4/apps/kvtml/bg
+# Bosnian
+%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
+%lang(bs) %{_datadir}/locale/bs/entry.desktop
 # Catalan
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_datadir}/locale/ca/LC_SCRIPTS/
@@ -635,6 +640,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.7.2-1
+- new upstream release
+
 * Sun Jul 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.7.0-1
 - new upstream release
 

k/kdelibs/kdelibs-vl.spec

@@ -13,8 +13,8 @@
 Summary: KDE Libraries
 Summary(ja): KDE ライブラリ
 Name: kdelibs
-Version: 4.7.0
-Release: 2%{?_dist_release}
+Version: 4.7.2
+Release: 1%{?_dist_release}
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -62,13 +62,14 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 Patch27: kdelibs-4.5.80-no_rpath.patch
 
 ## upstreamable
-# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
-# reverting to our past gnupg2-only setup.
-# TODO: try to use either gpg or gpg2, whichever is available
-Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
+# knewstuff2 variant of:
+# https://git.reviewboard.kde.org/r/102439/
+Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
+
 # https://bugs.kde.org/show_bug.cgi?id=269045
 # https://git.reviewboard.kde.org/r/101231/
 Patch51: kdelibs-4.6.2-uri_mimetypes.patch
+
 # Fix for KHTML form completion regression (kde#277457) from bugs.kde.org
 # attachment (patch by Andrea Iacovitti)
 # https://bugs.kde.org/show_bug.cgi?id=277457#c2
@@ -257,7 +258,6 @@ API ドキュメントを含んでいます．
 # upstreamable patches
 %patch50 -p1 -b .knewstuff_gpg2
 %patch51 -p1 -b .uri_mimetypes
-%patch52 -p1 -b .khtml-kde#277457
 
 # upstream patches
 
@@ -462,6 +462,9 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %doc %{_docdir}/HTML/en/kdelibs4-apidocs
 
 %changelog
+* Fri Oct  7 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.2-1
+- new upstream release
+
 * Sat Aug 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-2
 - rebuilt with soprano-2.7.0-2 and akonadi-1.6.0-2
 

k/kdepimlibs/kdepimlibs-vl.spec

@@ -1,10 +1,13 @@
 %define akonadi_subpkg 1
-%define akonadi_version 1.5.0
+%define akonadi_version_min 1.5.80
+
+%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
+
 
 Name: kdepimlibs
 Summary: KDE PIM Libraries
 Summary(ja): KDE PIM ライブラリ
-Version: 4.6.4
+Version: 4.7.2
 Release: 1%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -15,7 +18,7 @@ URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: akonadi-devel >= %{akonadi_version} 
+BuildRequires: akonadi-devel >= %{akonadi_version_min} 
 BuildRequires: libboost-devel >= 1.34.0
 BuildRequires: libboost-graph >= 1.34.0
 BuildRequires: cyrus-sasl-devel
@@ -23,6 +26,7 @@ BuildRequires: gpgme-devel >= 1.1.7
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
+BuildRequires: prison-devel
 BuildRequires: shared-mime-info
 BuildRequires: shared-desktop-ontologies-devel >= 0.4
 BuildRequires: soprano-devel 
@@ -38,6 +42,8 @@ Requires: akonadi >= %{akonadi_version}
 Provides: %{name}-akonadi = %{version}-%{release}
 %endif
 Requires: kdelibs4 >= %{version}
+# for kio_smtp plain/login sasl plugins
+Requires: cyrus-sasl-plain
 
 # stuff moved kdepim -> kdepimlibs, help upgrade path
 Conflicts: kdepim < 4.2.90
@@ -60,7 +66,6 @@ Obsoletes: kdepimlibs4-devel < %{version}-%{release}
 Provides:  kdepimlibs4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: libboost-devel
-Requires: libical-devel
 
 %description devel
 Header files for developing applications using %{name}.
@@ -117,12 +122,12 @@ export QTDOCDIR=`pkg-config --variable=docdir Qt`
 kde4-doxygen.sh --doxdatadir=%{_docdir}/HTML/en/common .
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 # hack around HTML doc multilib conflicts
 for doxy_hack in kcontrol/kresources ; do
-pushd %{buildroot}%{_docdir}/HTML/en/${doxy_hack}
+pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/${doxy_hack}
 bunzip2 index.cache.bz2
 sed -i -e 's!<a name="id[0-9]*"></a>!!g' index.cache
 bzip2 -9 index.cache
@@ -130,8 +135,8 @@ done
 popd
 
 # move devel symlinks
-mkdir -p %{buildroot}%{_libdir}/kde4/devel
-pushd %{buildroot}%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/kde4/devel
+pushd $RPM_BUILD_ROOT%{_libdir}
 for i in lib*.so
 do
   case "$i" in
@@ -158,8 +163,8 @@ done
 popd
 
 # install apidocs
-mkdir -p %{buildroot}%{_docdir}/HTML/en
-cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_docdir}/HTML/en/kdepimlibs-apidocs
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en
+cp -prf kdepimlibs-%{version}-apidocs $RPM_BUILD_ROOT%{_docdir}/HTML/en/kdepimlibs-apidocs
 
 
 %post -p /sbin/ldconfig
@@ -167,7 +172,7 @@ cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_docdir}/HTML/en/kdepimlibs-
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -225,6 +230,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 15 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.2-1
+- new upstream release
+
+* Sun Jul 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.0-1
+- new upstream release
+
 * Mon Jun 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.6.4-1
 - new upstream release
 

k/ktorrent/ktorrent-vl.spec

@@ -1,8 +1,8 @@
 Name:           ktorrent
 Summary:        A BitTorrent program
 Summary(ja):    BitTorrent クライアント
-Version:        4.0.5
-Release:        2%{?_dist_release}
+Version:        4.1.2
+Release:        1%{?_dist_release}
 
 Group:          Applications/Internet
 License:        GPLv2+
@@ -21,7 +21,7 @@ BuildRequires: gmp-devel
 BuildRequires: kdebase-workspace-devel
 BuildRequires: kdelibs4-devel >= 4.2.0
 BuildRequires: kdepimlibs-devel
-BuildRequires: libktorrent-devel
+BuildRequires: libktorrent-devel >= 1.1.0
 BuildRequires: plasma-devel
 BuildRequires: qca2-devel
 BuildRequires: taglib-devel
@@ -32,8 +32,7 @@ Obsoletes: ktorrent < 3.2.3-2
 Provides: plasma-engine-ktorrent = %{version}-%{release}
 
 Requires: %{name}-libs = %{version}-%{release}
-# fixme ?
-#Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -121,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ktmagnetdownloader
 %{_bindir}/ktorrent
 %{_bindir}/ktupnptest
+%{_libdir}/kde4/kio_magnet.so
 %{_libdir}/kde4/ktbwschedulerplugin.so
 %{_libdir}/kde4/ktinfowidgetplugin.so
 %{_libdir}/kde4/ktipfilterplugin.so
@@ -140,16 +140,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/kde4/plasma_engine_ktorrent.so
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/applications/kde4/ktorrent.desktop
+%{_datadir}/config.kcfg/magnetsettings.kcfg
 %{_datadir}/kde4/apps/ktorrent/
 %{_datadir}/kde4/services/kt*plugin.desktop
 %{_datadir}/kde4/services/magnet.protocol
 %{_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_datadir}/kde4/servicetypes/ktorrentplugin.desktop
+%{_docdir}/HTML/en/ktorrent
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/libktcore.so.11*
-%{_libdir}/libktupnp.so.4*
+%{_libdir}/libktcore.so.12*
 
 %files -n kde-plasma-ktorrent
 %defattr(-,root,root,-)
@@ -158,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  2 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.1.2-1
+- new upstream release
+
 * Sun May 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 4.0.5-2
 - add BuildRequires: soprano-devel
 

lib/libk/libktorrent/libktorrent-vl.spec

@@ -1,19 +1,20 @@
 Name:    libktorrent
 Summary: Library providing torrent downloading code
-Version: 1.0.5
+Version: 1.1.2
 Release: 1%{?_dist_release}
 
 Group:   System Environment/Libraries
 License: GPLv2+
 URL:     http://ktorrent.org/
 
-Source0: http://ktorrent.org/downloads/4.0.5/libktorrent-%{version}-3.tar.bz2 
+Source0: http://ktorrent.org/downloads/4.1.2/libktorrent-%{version}.tar.bz2 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libboost-devel
 BuildRequires: gettext
 BuildRequires: gmp-devel
 BuildRequires: kdelibs4-devel
+BuildRequires: libboost-devel
+BuildRequires: libgcrypt-devel
 BuildRequires: qca2-devel
 
 %description
@@ -32,7 +33,7 @@ Requires: kdelibs4-devel
 
 
 %prep
-%setup -q -n %{name}-%{version}-3
+%setup -q
 
 %build
 mkdir -p %{_target_platform}
@@ -69,7 +70,7 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
-%{_libdir}/libktorrent.so.2*
+%{_libdir}/libktorrent.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -79,6 +80,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  5 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.1.2-1
+- new upstream release
+- added BR: libgcrypt-devel
+
 * Wed Jan 26 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.5-1
 - new upstream release