rpms/ktorrent/F-9 .cvsignore, 1.26, 1.27 ktorrent.spec, 1.70, 1.71 sources, 1.26, 1.27

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15156

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
- ktorrent-3.2.1
- optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-9/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	26 Feb 2009 21:31:13 -0000	1.26
+++ .cvsignore	10 Apr 2009 14:02:34 -0000	1.27
@@ -1 +1 @@
-ktorrent-3.2.tar.bz2
+ktorrent-3.2.1.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-9/ktorrent.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ktorrent.spec	26 Feb 2009 21:31:14 -0000	1.70
+++ ktorrent.spec	10 Apr 2009 14:02:34 -0000	1.71
@@ -2,8 +2,8 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2
-Release:        8%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -11,22 +11,22 @@
 Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs4-devel >= 4.1.0
-BuildRequires: kdepimlibs-devel
 BuildRequires: avahi-devel
 BuildRequires: cmake   
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
-BuildRequires: qca2-devel
-BuildRequires: giflib-devel
-BuildRequires: pcre-devel
 BuildRequires: gmp-devel
+# libtaskmanager support
+BuildRequires: kdebase-workspace-devel
+BuildRequires: kdelibs4-devel >= 4.2.0
+BuildRequires: kdepimlibs-devel
+BuildRequires: plasma-devel
+BuildRequires: qca2-devel
+BuildRequires: taglib-devel
 
-%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.1.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 
 Requires: kdelibs4 >= %{kdelibs4_ver} 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -51,29 +51,33 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 %{__rm} -rf %{buildroot}
-mkdir -p %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# validate desktop file
-desktop-file-install --vendor=""                          \
-        --dir="%{buildroot}%{_datadir}/applications/kde4" \
-        %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
-
 %find_lang %{name}
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/ktorrent.desktop
+
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null ||:
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null ||:
+/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
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,18 +101,19 @@
 %{_kde4_libdir}/kde4/ktdownloadorderplugin.so
 %{_kde4_libdir}/kde4/ktscriptingplugin.so
 %{_kde4_libdir}/kde4/ktsyndicationplugin.so
+%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
 %{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
-%{_kde4_libdir}/libbtcore.so.9*
-%{_kde4_libdir}/libktcore.so.8*
+%{_kde4_libdir}/libbtcore.so.10*
+%{_kde4_libdir}/libktcore.so.9*
 %{_kde4_libdir}/libktupnp.so.4*
-%{_kde4_datadir}/icons/hicolor/*/actions/*png
-%{_kde4_datadir}/icons/hicolor/*/actions/*svgz
-%{_kde4_datadir}/icons/hicolor/*/apps/ktorrent.png
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_datadir}/applications/kde4/ktorrent.desktop
-%{_kde4_datadir}/kde4/apps/ktorrent/
+%{_kde4_appsdir}/ktorrent/
 %{_kde4_datadir}/kde4/services/kt*plugin.desktop
+%{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop
+%{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -119,6 +124,10 @@
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.1-1
+- ktorrent-3.2.1
+- optimize scriptlets
+
 * Tue Feb 26 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2-8
 - Some spec file dependency fixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-9/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	26 Feb 2009 21:31:14 -0000	1.26
+++ sources	10 Apr 2009 14:02:34 -0000	1.27
@@ -1 +1 @@
-e215de7a711b3f9c33044bf97a6d8bfb  ktorrent-3.2.tar.bz2
+a013e070af30fe199d51910ebbdba5f5  ktorrent-3.2.1.tar.bz2