rpms/ktorrent/F-12 .cvsignore, 1.39, 1.40 ktorrent.spec, 1.113, 1.114 sources, 1.39, 1.40

[nucleo]

Author: nucleo

Update of /cvs/pkgs/rpms/ktorrent/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1797

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
ktorrent-4.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-12/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	7 Feb 2010 18:50:14 -0000	1.39
+++ .cvsignore	6 Jun 2010 19:08:25 -0000	1.40
@@ -1 +1 @@
-ktorrent-3.3.4.tar.bz2
+ktorrent-4.0.0.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-12/ktorrent.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- ktorrent.spec	7 Feb 2010 18:50:14 -0000	1.113
+++ ktorrent.spec	6 Jun 2010 19:08:26 -0000	1.114
@@ -2,13 +2,13 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.3.4
+Version:        4.0.0
 Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ktorrent.org/
-Source0:        http://ktorrent.org/downloads/%{version}%{?pre}/ktorrent-%{version}%{?pre}.tar.bz2
+Source0:        http://ktorrent.org/downloads/4.0%{?pre}/ktorrent-%{version}%{?pre}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-devel
@@ -21,21 +21,18 @@ BuildRequires: GeoIP-devel
 BuildRequires: kdebase-workspace-devel
 BuildRequires: kdelibs4-devel >= 4.2.0
 BuildRequires: kdepimlibs-devel
+BuildRequires: libktorrent-devel
 BuildRequires: plasma-devel
 BuildRequires: qca2-devel
 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}
-# help multilib upgrades
 Obsoletes: ktorrent < 3.2.3-2
 
 Provides: plasma-engine-ktorrent = %{version}-%{release}
-# possible temporary upgrade path for kde-plasma-ktorrent split
-#if 0%{?fedora} < 12
-#Requires: kde-plasma-ktorrent = %{version}-%{release}
-#endif
+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+# fixme ?
+#Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -46,18 +43,10 @@ searching using various search engines, 
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs4%{?_isa} >= %{kdelibs4_ver}
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}} 
 %description libs
 %{summary}.
 
-%package        devel
-Summary:        Headers and libraries for building apps that use ktorrent
-Group:          Development/Libraries
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:       kdelibs4-devel
-%description    devel
-The headers and libraries used for developing applications on top of ktorrent.
-
 %package -n kde-plasma-ktorrent
 Summary: ktorrent plasma applet
 Group: Applications/Internet
@@ -84,6 +73,9 @@ make %{?_smp_mflags} -C %{_target_platfo
 %{__rm} -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# unpackaged files
+rm -f %{buildroot}%{_libdir}/lib{ktcore,ktupnp}.so
+
 %find_lang %{name}
 
 %check
@@ -114,12 +106,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
+%{_kde4_bindir}/ktmagnetdownloader
 %{_kde4_bindir}/ktorrent
 %{_kde4_bindir}/ktupnptest
 %{_kde4_libdir}/kde4/ktbwschedulerplugin.so
 %{_kde4_libdir}/kde4/ktinfowidgetplugin.so
 %{_kde4_libdir}/kde4/ktipfilterplugin.so
 %{_kde4_libdir}/kde4/ktlogviewerplugin.so
+%{_kde4_libdir}/kde4/ktmagnetgeneratorplugin.so
 %{_kde4_libdir}/kde4/ktmediaplayerplugin.so
 %{_kde4_libdir}/kde4/ktscanfolderplugin.so
 %{_kde4_libdir}/kde4/ktsearchplugin.so
@@ -136,23 +130,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_datadir}/applications/kde4/ktorrent.desktop
 %{_kde4_appsdir}/ktorrent/
 %{_kde4_datadir}/kde4/services/kt*plugin.desktop
+%{_kde4_datadir}/kde4/services/magnet.protocol
 %{_kde4_datadir}/kde4/services/plasma-dataengine-ktorrent.desktop
 %{_kde4_datadir}/kde4/servicetypes/ktorrentplugin.desktop
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libbtcore.so.12*
-%{_kde4_libdir}/libktcore.so.10*
+%{_kde4_libdir}/libktcore.so.11*
 %{_kde4_libdir}/libktupnp.so.4*
 
-%files devel
-%defattr(-,root,root,-)
-%{_kde4_includedir}/libbtcore/
-%{_kde4_libdir}/libbtcore.so
-%{_kde4_libdir}/libktcore.so
-%{_kde4_libdir}/libktupnp.so
-%{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
-
 %files -n kde-plasma-ktorrent
 %defattr(-,root,root,-)
 %{_kde4_datadir}/kde4/services/plasma-applet-ktorrent.desktop
@@ -160,11 +146,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Feb 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.3.4-1
-- ktorrent-3.3.4
+* Mon May 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.0.0-1
+- ktorrent-4.0.0
+
+* Thu May 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.0-0.4.rc1
+- ktorrent-4.0rc1
+
+* Mon Apr 05 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.0-0.3.beta2
+- ktorrent-4.0beta2
+
+* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.0-0.2.beta1
+- -libs: use %%{_kde4_version}
 
-* Mon Jan 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.3.3-1
-- ktorrent-3.3.3
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-0.1.beta1
+- ktorrent-4.0beta1
 
 * Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.2-1
 - ktorrent-3.3.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	7 Feb 2010 18:50:14 -0000	1.39
+++ sources	6 Jun 2010 19:08:26 -0000	1.40
@@ -1 +1 @@
-7d7dba06a78d09494199bd4ef82e5527  ktorrent-3.3.4.tar.bz2
+7862b09dfc1282053c7304f98f3ce0cf  ktorrent-4.0.0.tar.bz2