rpms/ktorrent/F-13 .cvsignore, 1.38, 1.39 ktorrent.spec, 1.114, 1.115 sources, 1.38, 1.39

[nucleo]

Author: nucleo

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-13/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	21 Dec 2009 15:21:53 -0000	1.38
+++ .cvsignore	6 Jun 2010 19:09:40 -0000	1.39
@@ -1 +1 @@
-ktorrent-4.0beta1.tar.bz2
+ktorrent-4.0.0.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-13/ktorrent.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- ktorrent.spec	28 Jan 2010 15:07:31 -0000	1.114
+++ ktorrent.spec	6 Jun 2010 19:09:40 -0000	1.115
@@ -1,16 +1,14 @@
 
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
-%define pre beta1
-
 Name:           ktorrent
-Version:        4.0
-Release:        0.2.%{pre}%{?dist}
+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
@@ -23,19 +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
 
-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
@@ -50,14 +47,6 @@ Requires: %{name} = %{version}-%{release
 %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
@@ -117,11 +109,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_bindir}/ktmagnetdownloader
 %{_kde4_bindir}/ktorrent
 %{_kde4_bindir}/ktupnptest
-%{_kde4_bindir}/ktutpd
 %{_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
@@ -144,18 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libbtcore.so.13*
-%{_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
@@ -163,7 +146,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.0-0.2.beta2
+* 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 Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-0.1.beta1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-13/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	21 Dec 2009 15:21:53 -0000	1.38
+++ sources	6 Jun 2010 19:09:40 -0000	1.39
@@ -1 +1 @@
-802b611d99c3fa856c7403d9cf6e3929  ktorrent-4.0beta1.tar.bz2
+7862b09dfc1282053c7304f98f3ce0cf  ktorrent-4.0.0.tar.bz2