rpms/ktorrent/devel ktorrent.spec,1.117,1.118 sources,1.39,1.40

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11440

Modified Files:
	ktorrent.spec sources 
Log Message:
* Mon Apr 05 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.0-0.3.beta2
- ktorrent-4.0beta2



Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- ktorrent.spec	5 Apr 2010 15:28:49 -0000	1.117
+++ ktorrent.spec	6 May 2010 19:43:15 -0000	1.118
@@ -1,11 +1,11 @@
 
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
-%define pre beta2
+%define pre rc1
 
 Name:           ktorrent
 Version:        4.0
-Release:        0.3.%{pre}%{?dist}
+Release:        0.4.%{pre}%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
@@ -23,6 +23,7 @@ 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
@@ -48,14 +49,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
@@ -82,6 +75,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
@@ -142,18 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libbtcore.so.13*
 %{_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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	5 Apr 2010 14:22:44 -0000	1.39
+++ sources	6 May 2010 19:43:15 -0000	1.40
@@ -1 +0,0 @@
-b40140dcb3741569b72b3452f37c50c3  ktorrent-4.0beta2.tar.bz2