Accepting request 64363 from KDE:Distro:Factory

Accepted submit request 64363 from user tittiatcoke

OBS-URL: https://build.opensuse.org/request/show/64363
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=79

initial-preference.diff

@@ -1,10 +1,8 @@
-Index: ktorrent/ktorrent.desktop
+--- ktorrent/ktorrent.desktop.orig	2011-03-14 19:48:22.000000000 +0200
-===================================================================
++++ ktorrent/ktorrent.desktop	2011-03-16 00:26:00.162000025 +0200
---- ktorrent/ktorrent.desktop.orig	2010-11-30 21:38:26.000000000 +0200
+@@ -106,6 +106,7 @@
-+++ ktorrent/ktorrent.desktop	2010-12-09 11:20:29.000000000 +0200
-@@ -107,6 +107,7 @@ Icon=ktorrent
  Type=Application
- DocPath=ktorrent/index.html
+ X-DocPath=ktorrent/index.html
  MimeType=application/x-bittorrent;application/x-torrent;
 +InitialPreference=5
  X-DBUS-StartupType=Unique

ktorrent-4.1.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa2b1133f7a42b6112ff9d55b2b441b9c8df041938e33c5246bb0d1da284aa6e
+size 2918327

ktorrent-4.1rc1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b7cad643839be4b107f96a32e7bf5e67d28272fddcabd767c4289f9cc0ea40d
-size 2959662

ktorrent.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Mar 16 18:30:18 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to 4.1.0:
+  * Check if source files are missing before moving them (bko#265607)
+  * Fix scanextender showing when they are not supposed to (bko#259483)
+  * Fix mediaplayer unable to stop in buffering mode when streaming
+    (bko#266100)
+  * KDE 4.4 compatibility fix in search plugin
+  * Make sure overwrite is possible for the torrent copy file feature
+  * Fix critical Qt warning when opening context menu in view
+- Spec file updates:
+  * Removed Authors: from %description (requirement for Factory submissions).
+  * Removed ktorrent-devel and libktcore12 subpackages and merged it in the
+    main package since the package doesn't actually provides any shared
+    libraries. Because of this also removed libktcore.so to fix rpmlint warning
+    "devel-file-in-non-devel-package".
+  * Minor update in %files section.
+- Rebased "initial-preference.diff" patch to apply cleanly.
+
 -------------------------------------------------------------------
 Thu Mar 10 10:35:59 UTC 2011 - coolo@novell.com
 

ktorrent.spec

@@ -18,14 +18,14 @@
 
 
 Name:           ktorrent
-Version:        4.0.99rc1
+Version:        4.1.0
-Release:        2
+Release:        1
 Summary:        KDE BitTorrent Client
 
 License:        GPLv2+ and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv2.1+ and BSD
 Url:            http://ktorrent.org/
 Group:          Productivity/Networking/File-Sharing
-Source0:        http://ktorrent.org/downloads/4.1rc1/%{name}-4.1rc1.tar.bz2
+Source0:        http://ktorrent.org/downloads/4.1.0/%{name}-%{version}.tar.bz2
 # Mimetype icons
 Source1:        icons.tar.bz2
 Source2:        ktorrent.1
@@ -42,16 +42,16 @@ BuildRequires:  ImageMagick
 BuildRequires:  fdupes
 BuildRequires:  kdebase4-workspace-devel
 BuildRequires:  libkdepimlibs4-devel
-BuildRequires:  libktorrent-devel >= 1.0.99
+BuildRequires:  libktorrent-devel >= 1.1.0
 BuildRequires:  taglib-devel
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
-# This specific "requires" is neccessary because rpm doesn't specify a version for the libktcore12 requirement
-Requires:       libktcore12 = %{version}-%{release}
 %kde4_pimlibs_requires
 %kde4_runtime_requires
 Recommends:     %{name}-lang = %{version}
+Obsoletes:      ktorrent-devel
+Obsoletes:      libktcore12
 
 %description
 KTorrent is a bittorrent application for KDE which allows you to download files
@@ -59,45 +59,9 @@ using the BitTorrent protocol. It enables you to run multiple torrents at the
 same time and comes with extended features to make it a full-featured client
 for BitTorrent.
 
-
-
-Authors:
---------
-    Jois Guisson <jrois.guisson@gmail.com>
-
-%package devel
-Summary:        KDE BitTorrent Client Build Environment
-License:        GPLv2+ and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv2.1+ and BSD
-Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
-
-%description devel
-This package includes the necessary files to build KTorrent plugins.
-
-
-
-Authors:
---------
-    Jois Guisson <jrois.guisson@gmail.com>
-
-
 %lang_package
-%package -n libktcore12
-Summary:        Library for ktorrent
-License:        GPLv2+ and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv2.1+ and BSD
-Group:          System/Libraries
-
-%description -n libktcore12
-This package contains ktorrent's library.
-
-
-
-Authors:
---------
-    Jois Guisson <jrois.guisson@gmail.com>
-
 %prep
-%setup -q -n %{name}-4.1rc1
+%setup -q
 %patch0
 %if ! 0%{?packman_bs}
 %patch1
@@ -114,6 +78,9 @@ cd build
 %kde4_makeinstall
 cd ..
 
+# Not needed, fix "devel-file-in-non-devel-package" rpmlint warning
+rm -f %{buildroot}%{_kde4_libdir}/libktcore.so
+
 # Fix wrong-icon-size
 convert -scale 22x22! %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/kt-encrypted.png
 
@@ -139,7 +106,6 @@ rm -rf %{buildroot}%{_datadir}/locale/hne/
 rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/
 rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
 %endif
-#
 
 %fdupes -s %{buildroot}
 
@@ -147,9 +113,9 @@ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
 
 %kde_post_install
 
-%post -n libktcore12 -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun -n libktcore12 -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -176,8 +142,9 @@ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
 %{_kde4_modulesdir}/ktzeroconfplugin.so
 %{_kde4_modulesdir}/plasma_applet_ktorrent.so
 %{_kde4_modulesdir}/plasma_engine_ktorrent.so
+%{_kde4_libdir}/libktcore.so.*
 %{_kde4_applicationsdir}/ktorrent.desktop
-%{_kde4_htmldir}/en/ktorrent/
+%doc %{_kde4_htmldir}/en/ktorrent/
 %{_kde4_iconsdir}/*/*/actions/kt-add-feeds.*
 %{_kde4_iconsdir}/*/*/actions/kt-add-filters.*
 %{_kde4_iconsdir}/*/*/actions/kt-bandwidth-scheduler.*
@@ -230,16 +197,8 @@ rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
 %{_kde4_servicetypesdir}/ktorrentplugin.desktop
 %doc %{_mandir}/man1/*
 
-%files devel
-%defattr(-,root,root,-)
-%{_kde4_libdir}/libktcore.so
-
 %files lang -f %{name}.lang
 %defattr(-,root,root,-)
 %exclude %{_kde4_htmldir}/en/ktorrent/
 
-%files -n libktcore12
-%defattr(-,root,root,-)
-%{_kde4_libdir}/libktcore.so.12*
-
 %changelog