diff --git a/.cvsignore b/.cvsignore index ffe4303..cd595ba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ktorrent-3.2.5.tar.bz2 +ktorrent-3.3.tar.bz2 diff --git a/ktorrent.spec b/ktorrent.spec index 51e4cf8..523775b 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -2,13 +2,13 @@ # Fedora pkg review: http://bugzilla.redhat.com/187818 Name: ktorrent -Version: 3.2.5 +Version: 3.3 Release: 1%{?dist} Summary: A BitTorrent program Group: Applications/Internet License: GPLv2+ URL: http://ktorrent.org/ -Source0: http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2 +Source0: http://ktorrent.org/downloads/%{version}%{?pre}/ktorrent-%{version}%{?pre}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: avahi-devel @@ -28,7 +28,6 @@ BuildRequires: taglib-devel %global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: kdelibs4%{?_isa} >= %{kdelibs4_ver} # help multilib upgrades Obsoletes: ktorrent < 3.2.3-2 @@ -47,6 +46,7 @@ searching using various search engines, UDP Trackers and UPnP support. Summary: Runtime libraries for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Requires: kdelibs4%{?_isa} >= %{kdelibs4_ver} %description libs %{summary}. @@ -67,7 +67,7 @@ Requires: plasma-engine-ktorrent = %{version}-%{release} %prep -%setup -q +%setup -q -n %{name}-%{version}%{?pre} %build mkdir -p %{_target_platform} @@ -90,7 +90,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/ktorrent.desktop %post -/sbin/ldconfig touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : %posttrans @@ -98,13 +97,16 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : update-desktop-database -q &> /dev/null ||: %postun -/sbin/ldconfig if [ $1 -eq 0 ] ; then touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : update-desktop-database -q &> /dev/null ||: fi +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + %clean rm -rf $RPM_BUILD_ROOT @@ -127,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT %{_kde4_libdir}/kde4/ktzeroconfplugin.so %{_kde4_libdir}/kde4/ktdownloadorderplugin.so %{_kde4_libdir}/kde4/ktscriptingplugin.so +%{_kde4_libdir}/kde4/ktshutdownplugin.so %{_kde4_libdir}/kde4/ktsyndicationplugin.so %{_kde4_libdir}/kde4/plasma_engine_ktorrent.so %{_kde4_iconsdir}/hicolor/*/*/* @@ -138,8 +141,8 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(-,root,root,-) -%{_kde4_libdir}/libbtcore.so.11* -%{_kde4_libdir}/libktcore.so.9* +%{_kde4_libdir}/libbtcore.so.12* +%{_kde4_libdir}/libktcore.so.10* %{_kde4_libdir}/libktupnp.so.4* %files devel @@ -157,8 +160,12 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Oct 24 2009 Rex Dieter - 3.2.5-1 -- ktorrent-3.2.5 +* Mon Nov 09 2009 Rex Dieter - 3.3-1 +- ktorrent-3.3 +- -libs: add/fix scriptlets, move kdelibs4 dep here + +* Sat Oct 24 2009 Rex Dieter - 3.3-0.1.rc1 +- ktorrent-3.3rc1 * Sun Sep 27 2009 Rex Dieter - 3.2.4-1 - ktorrent-3.2.4 diff --git a/sources b/sources index c0210a1..bf36515 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b0c3ebd2e0125ef65dbf67a584d1295 ktorrent-3.2.5.tar.bz2 +1248fae4696b6cacf3954c2cb5daedf3 ktorrent-3.3.tar.bz2