diff --git a/.cvsignore b/.cvsignore index 0cf0574..d9810ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ktorrent-3.1.3.tar.bz2 +ktorrent-3.1.4.tar.bz2 diff --git a/ktorrent.spec b/ktorrent.spec index 4c9c631..376e728 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -1,6 +1,6 @@ Name: ktorrent -Version: 3.1.3 -Release: 4%{?dist} +Version: 3.1.4 +Release: 1%{?dist} Summary: A BitTorrent program for KDE Group: Applications/Internet License: GPLv2+ @@ -8,6 +8,7 @@ URL: http://ktorrent.pwsp.net/ Source0: http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# upstreamed http://bugs.kde.org/157853#37 -- Rex Patch1: ktorrent-3.1.2-kdeinit.patch BuildRequires: kdelibs4-devel >= 4.1 @@ -49,12 +50,12 @@ pushd %{_target_platform} %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} +make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 %install %{__rm} -rf %{buildroot} mkdir -p %{buildroot} -make install DESTDIR=%{buildroot} -C %{_target_platform} +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} # validate desktop file desktop-file-install --vendor="" \ @@ -89,16 +90,13 @@ rm -rf $RPM_BUILD_ROOT %{_kde4_libdir}/kde4/ktstatsplugin.so %{_kde4_libdir}/kde4/ktupnpplugin.so %{_kde4_libdir}/kde4/ktwebinterfaceplugin.so -%{_kde4_libdir}/libbtcore.so.7 -%{_kde4_libdir}/libbtcore.so.7.2.0 -%{_kde4_libdir}/libktcore.so.6 -%{_kde4_libdir}/libktcore.so.6.3.0 -%{_kde4_libdir}/libktupnp.so.3 -%{_kde4_libdir}/libktupnp.so.3.2.0 +%{_kde4_libdir}/libbtcore.so.7* +%{_kde4_libdir}/libktcore.so.6* +%{_kde4_libdir}/libktupnp.so.3* %{_kde4_datadir}/icons/hicolor/*/actions/*png %{_kde4_datadir}/icons/hicolor/*/apps/ktorrent.png %{_kde4_datadir}/applications/kde4/ktorrent.desktop -%{_kde4_datadir}/kde4/apps/ktorrent +%{_kde4_datadir}/kde4/apps/ktorrent/ %{_kde4_datadir}/kde4/services/ktbwschedulerplugin.desktop %{_kde4_datadir}/kde4/services/ktinfowidgetplugin.desktop %{_kde4_datadir}/kde4/services/ktipfilterplugin.desktop @@ -121,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %{_kde4_datadir}/kde4/apps/cmake/modules/FindBTCore.cmake %changelog +* Thu Oct 23 2008 Rex Dieter - 3.1.4-1 +- ktorrent-3.1.4 + * Tue Oct 14 2008 Rex Dieter - 3.1.3-4 - KDEDInit could not launch .../ktorrent (#451559, kde#157853) diff --git a/sources b/sources index 52f1243..d3b99e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d94536629ce058412d177c3d894843f4 ktorrent-3.1.3.tar.bz2 +e6a425acb74896c8bb20168d66a940a0 ktorrent-3.1.4.tar.bz2