rpms/ktorrent/F-11 ktorrent.spec, 1.98, 1.99 ktorrent-3.2.1-kdebug#188447.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Mon Aug 24 14:13:47 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/ktorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4419
Modified Files:
ktorrent.spec
Removed Files:
ktorrent-3.2.1-kdebug#188447.patch
Log Message:
* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
- kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
- -libs to make multilib friendly
Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/ktorrent.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- ktorrent.spec 12 Aug 2009 16:10:52 -0000 1.98
+++ ktorrent.spec 24 Aug 2009 14:13:47 -0000 1.99
@@ -3,7 +3,7 @@
Name: ktorrent
Version: 3.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A BitTorrent program
Group: Applications/Internet
License: GPLv2+
@@ -17,7 +17,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gmp-devel
BuildRequires: GeoIP-devel
-# libtaskmanager support
+# libtaskmanager support, for plasma applet
BuildRequires: kdebase-workspace-devel
BuildRequires: kdelibs4-devel >= 4.2.0
BuildRequires: kdepimlibs-devel
@@ -27,22 +27,45 @@ 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
+
+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
%description
KTorrent is a BitTorrent program for KDE. Its main features are native KDE
integration, download of torrent files, upload speed capping, internet
searching using various search engines, UDP Trackers and UPnP support.
+%package libs
+Summary: Runtime libraries for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
%package devel
Summary: Headers and libraries for building apps that use ktorrent
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+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
+Requires: plasma-engine-ktorrent = %{version}-%{release}
+%description -n kde-plasma-ktorrent
+%{summary}.
+
+
%prep
%setup -q
@@ -105,19 +128,19 @@ rm -rf $RPM_BUILD_ROOT
%{_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.11*
-%{_kde4_libdir}/libktcore.so.9*
-%{_kde4_libdir}/libktupnp.so.4*
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_datadir}/applications/kde4/ktorrent.desktop
%{_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 libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libbtcore.so.11*
+%{_kde4_libdir}/libktcore.so.9*
+%{_kde4_libdir}/libktupnp.so.4*
%files devel
%defattr(-,root,root,-)
@@ -127,7 +150,17 @@ rm -rf $RPM_BUILD_ROOT
%{_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
+%{_kde4_libdir}/kde4/plasma_applet_ktorrent.so
+
+
%changelog
+* Sun Aug 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.3-2
+- kde-plasma-ktorrent pkg (so main pkg doesn't pull in kdebase-workspace)
+- -libs to make multilib friendly
+
* Wed Aug 12 2009 Roland Wolters <wolters.liste at gmx.net> - 3.2.3-1
- ktorrent-3.2.3
--- ktorrent-3.2.1-kdebug#188447.patch DELETED ---
More information about the scm-commits
mailing list