diff --git a/icons.tar.bz2 b/icons.tar.bz2 index 0e221ca..607679f 100644 --- a/icons.tar.bz2 +++ b/icons.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1bd50231bbc51fa43f2c58c598b9fa600e0c320b3bc1beb5c71aeb9312e87b2 -size 83588 +oid sha256:776c2483b42a6e233e8312c00ba891d3ca1ba497fd167bcb526c7233965cf99d +size 33203 diff --git a/ktorrent-4.1beta1.tar.bz2 b/ktorrent-4.1beta1.tar.bz2 deleted file mode 100644 index 9aee8fd..0000000 --- a/ktorrent-4.1beta1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64a7ddebfa211177ec1756875a2a879d13611329f05427f4995bc60719df329d -size 2917511 diff --git a/ktorrent-4.1rc1.tar.bz2 b/ktorrent-4.1rc1.tar.bz2 new file mode 100644 index 0000000..1cd96c7 --- /dev/null +++ b/ktorrent-4.1rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b7cad643839be4b107f96a32e7bf5e67d28272fddcabd767c4289f9cc0ea40d +size 2959662 diff --git a/ktorrent.changes b/ktorrent.changes index 62d90a5..2517847 100644 --- a/ktorrent.changes +++ b/ktorrent.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Sat Feb 26 10:27:27 UTC 2011 - coolo@novell.com + +- switch back to recommending -lang package + +------------------------------------------------------------------- +Fri Feb 25 22:32:07 UTC 2011 - asterios.dramis@gmail.com + +- Update to 4.0.99rc1 (4.1rc1): + * Make sure that apply button of config dialog is enabled properly when the + group changes in the scanfolder settings + * Add kio-magnet + * Improve performance of ktorrent in situations where there are many torrent + (262571) + * Fix memory leak on exit (263802) + * Fix tab bar not matching TabBarWidget state in some circumstances (263068) + * Fix libktorrent not gettting updated when the download of a magnet link + finishes and the FileSelectDlg is shown + * Update view tab when switching to it, fixes data scan widget showing in the + wrong place (259483) + * Update view captions every GUI update (264215) + * Use user modified path for file column in chunks view (264814) + * Fix QM bug causing torrents to get started when it is not needed (262570) +- Spec file updates: + * Changes based on rpmdevtools templates and spec-cleaner run. + * Changed License: to GPLv2+ and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv2.1+ + and BSD. + * Updates in Url: and %description. + * Added description for the patches based on openSUSE Patches Guidelines. + * Updates in Buildrequires:, Requires:, %build, %install and %files sections. + * Use Suggests: and not Recommends: for lang package. + * Removed %pre and %post /sbin/ldconfig section for main package (not + needed). + * Moved the english help files in the main package. +- Removed ktorrent icons from icons.tar.bz2 (they are provided by the package). +- Fixed rpmlint warning ("wrong-icon-size"). + ------------------------------------------------------------------- Mon Feb 7 12:49:38 UTC 2011 - coolo@novell.com diff --git a/ktorrent.spec b/ktorrent.spec index 2fdce05..4ae6b95 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -15,65 +15,59 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# -%define srcversion 4.1beta1 - Name: ktorrent -BuildRequires: gmp-devel kdebase4-workspace-devel libkdepimlibs4-devel libqca2-devel taglib-devel -BuildRequires: fdupes libktorrent-devel -BuildRequires: hicolor-icon-theme jpackage-utils -Url: http://ktorrent.pwsp.net/ -License: GPLv2+ -Group: Productivity/Networking/File-Sharing +Version: 4.0.99rc1 +Release: 1 Summary: KDE BitTorrent Client -Version: 4.0.99beta1 -Release: 2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define rversion %version -Source: %{name}-%{srcversion}.tar.bz2 -Source2: icons.tar.bz2 -Source3: ktorrent.1 -Source4: ktupnptest.1 -Patch1: remove-links.diff -Patch4: suse-dht-warning.diff -Patch5: initial-preference.diff -Recommends: %{name}-lang = %{version} -%kde4_runtime_requires -%kde4_pimlibs_requires -Requires: oxygen-icon-theme +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 +# Mimetype icons +Source1: icons.tar.bz2 +Source2: ktorrent.1 +Source3: ktupnptest.1 +# PATCH-FIX-OPENSUSE remove-links.diff adrian@suse.de -- Remove links to some search engine with maybe legal problems +Patch0: remove-links.diff +# PATCH-FIX-OPENSUSE suse-dht-warning.diff wstephenson@novell.com -- Warning popup for DHT +Patch1: suse-dht-warning.diff +# PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- InitialPreference to set it as the default torrent downloader +Patch2: initial-preference.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +BuildRequires: ImageMagick +BuildRequires: fdupes +BuildRequires: kdebase4-workspace-devel +BuildRequires: libkdepimlibs4-devel +BuildRequires: libktorrent-devel +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} %description -Torrent is a BitTorrent program for KDE. Its main features are: -* Download of torrent files -* Upload speed capping, seeing that most people cannot upload - infinite amounts of data -* Internet searching using the BitTorrent Web site's search engine -* UDP trackers +KTorrent is a bittorrent application for KDE which allows you to download files +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 -%package -n libktcore12 -License: GPLv2+ -Group: System/Libraries -Summary: Library for ktorrent -%description -n libktcore12 -This package contains ktorrent's library Authors: -------- Jois Guisson %package devel -License: GPLv2+ -Group: Development/Libraries/C and C++ Summary: KDE BitTorrent Client Build Environment -Requires: ktorrent = %{version} +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. @@ -85,32 +79,46 @@ Authors: Jois Guisson %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 + %prep -%setup -q -n %{name}-%{srcversion} -%patch1 +%setup -q -n %{name}-4.1rc1 +%patch0 %if ! 0%{?packman_bs} -%patch4 +%patch1 %endif -%patch5 -tar xfj %{SOURCE2} +%patch2 +tar jxf %{SOURCE1} %build - %cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=true -DCMAKE_VERBOSE_MAKEFILE:BOOL=true - %make_jobs +%cmake_kde4 -d build +%make_jobs %install - cd build - %makeinstall +cd build +%kde4_makeinstall +cd .. + +# 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 + # Add man pages from help2man edited. mkdir -p %{buildroot}%{_mandir}/man1 +cp %{S:2} %{buildroot}%{_mandir}/man1 cp %{S:3} %{buildroot}%{_mandir}/man1 -cp %{S:4} %{buildroot}%{_mandir}/man1 - %fdupes -s $RPM_BUILD_ROOT -%if %suse_version > 1110 -%else - rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/hne -%endif - %suse_update_desktop_file -r ktorrent Qt KDE Network P2P # Fix any .py files with shebangs and wrong permissions. if test -z `find %{buildroot} -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \ @@ -118,109 +126,118 @@ then break; else chmod -f 0755 `find %{buildroot} -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \ fi - %kde_post_install - %find_lang %name +%if 0%{?suse_version} +%suse_update_desktop_file -r %{name} Qt KDE Network P2P +%endif -%pre -p /sbin/ldconfig +# Remove unneeded locales +%if 0%{?suse_version} < 1140 +rm -rf %{buildroot}%{_datadir}/locale/ast/ +rm -rf %{buildroot}%{_datadir}/locale/hne/ +rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/ +rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ +%endif +# -%post -p /sbin/ldconfig +%fdupes -s %{buildroot} -%postun -p /sbin/ldconfig +%find_lang %{name} + +%kde_post_install %post -n libktcore12 -p /sbin/ldconfig %postun -n libktcore12 -p /sbin/ldconfig -%files lang -f build/%name.lang -%defattr(-,root,root) -%if %suse_version < 1140 -%dir %{_datadir}/locale/sr@ijekavian -%dir %{_datadir}/locale/sr@ijekavian/LC_MESSAGES -%dir %{_datadir}/locale/sr@ijekavianlatin -%dir %{_datadir}/locale/sr@ijekavianlatin/LC_MESSAGES -%endif - %files -%defattr(-,root,root) -%{_bindir}/ktorrent -%{_bindir}/ktupnptest -%{_bindir}/ktmagnetdownloader -%_kde4_modules/ktbwschedulerplugin.so -%_kde4_modules/ktinfowidgetplugin.so -%_kde4_modules/ktipfilterplugin.so -%_kde4_modules/ktlogviewerplugin.so -%_kde4_modules/ktscanfolderplugin.so -%_kde4_modules/ktsearchplugin.so -%_kde4_modules/ktstatsplugin.so -%_kde4_modules/ktupnpplugin.so -%_kde4_modules/ktwebinterfaceplugin.so -%_kde4_modules/ktmediaplayerplugin.so -%_kde4_modules/ktdownloadorderplugin.so -%_kde4_modules/ktscriptingplugin.so -%_kde4_modules/ktsyndicationplugin.so -%_kde4_modules/plasma_applet_ktorrent.so -%_kde4_modules/plasma_engine_ktorrent.so -%{_iconsbasedir}/*/actions/kt-add-feeds.* -%{_iconsbasedir}/*/actions/kt-add-filters.* -%{_iconsbasedir}/*/actions/kt-remove-feeds.* -%{_iconsbasedir}/*/actions/kt-remove-filters.* -%{_iconsbasedir}/*/actions/kt-magnet.* -%_kde_share_dir/services/ktdownloadorderplugin.desktop -%_kde_share_dir/services/ktscriptingplugin.desktop -%_kde_share_dir/services/ktsyndicationplugin.desktop -%_kde_share_dir/services/plasma-applet-ktorrent.desktop -%_kde_share_dir/services/plasma-dataengine-ktorrent.desktop -%{_kde4_applicationsdir}/ktorrent.desktop -%{_iconsbasedir}/*/apps/ktorrent.* -%{_iconsbasedir}/*/mimetypes/torrent.* -%{_iconsbasedir}/*/actions/kt-bandwidth-scheduler.* -%{_iconsbasedir}/*/actions/kt-change-tracker.* -%{_iconsbasedir}/*/actions/kt-check-data.* -%{_iconsbasedir}/*/actions/kt-chunks.* -%{_iconsbasedir}/*/actions/kt-encrypted.* -%{_iconsbasedir}/*/actions/kt-info-widget.* -%{_iconsbasedir}/*/actions/kt-pause.* -%{_iconsbasedir}/*/actions/kt-plugins.* -%{_iconsbasedir}/*/actions/kt-queue-manager.* -%{_iconsbasedir}/*/actions/kt-remove.* -%{_iconsbasedir}/*/actions/kt-restore-defaults.* -%{_iconsbasedir}/*/actions/kt-set-max-download-speed.* -%{_iconsbasedir}/*/actions/kt-set-max-upload-speed.* -%{_iconsbasedir}/*/actions/kt-show-hide.* -%{_iconsbasedir}/*/actions/kt-show-statusbar.* -%{_iconsbasedir}/*/actions/kt-speed-limits.* -%{_iconsbasedir}/*/actions/kt-start-all.* -%{_iconsbasedir}/*/actions/kt-start.* -%{_iconsbasedir}/*/actions/kt-stop-all.* -%{_iconsbasedir}/*/actions/kt-stop.* -%{_iconsbasedir}/*/actions/kt-upnp.* -%_kde_share_dir/apps/ktorrent -%_kde_share_dir/services/ktbwschedulerplugin.desktop -%_kde_share_dir/services/ktinfowidgetplugin.desktop -%_kde_share_dir/services/ktipfilterplugin.desktop -%_kde_share_dir/services/ktlogviewerplugin.desktop -%_kde_share_dir/services/ktscanfolderplugin.desktop -%_kde_share_dir/services/ktsearchplugin.desktop -%_kde_share_dir/services/ktstatsplugin.desktop -%_kde_share_dir/services/ktupnpplugin.desktop -%_kde_share_dir/services/ktwebinterfaceplugin.desktop -%_kde_share_dir/services/ktmediaplayerplugin.desktop -%_kde_share_dir/services/magnet.protocol -%_kde_share_dir/servicetypes/ktorrentplugin.desktop -%{_kde4_modulesdir}/ktzeroconfplugin.so +%defattr(-,root,root,-) +%doc COPYING ChangeLog RoadMap +%{_kde4_bindir}/ktmagnetdownloader +%{_kde4_bindir}/ktorrent +%{_kde4_bindir}/ktupnptest +%{_kde4_modulesdir}/kio_magnet.so +%{_kde4_modulesdir}/ktbwschedulerplugin.so +%{_kde4_modulesdir}/ktdownloadorderplugin.so +%{_kde4_modulesdir}/ktinfowidgetplugin.so +%{_kde4_modulesdir}/ktipfilterplugin.so +%{_kde4_modulesdir}/ktlogviewerplugin.so %{_kde4_modulesdir}/ktmagnetgeneratorplugin.so -%{_kde4_sharedir}/services/ktzeroconfplugin.desktop -%{_kde4_sharedir}/services/ktshutdownplugin.desktop +%{_kde4_modulesdir}/ktmediaplayerplugin.so +%{_kde4_modulesdir}/ktscanfolderplugin.so +%{_kde4_modulesdir}/ktscriptingplugin.so +%{_kde4_modulesdir}/ktsearchplugin.so %{_kde4_modulesdir}/ktshutdownplugin.so -%{_kde4_sharedir}/services/ktmagnetgeneratorplugin.desktop -%{_mandir}/man1/* - -%files -n libktcore12 -%defattr(-,root,root) -%{_libdir}/libktcore.so.12* +%{_kde4_modulesdir}/ktstatsplugin.so +%{_kde4_modulesdir}/ktsyndicationplugin.so +%{_kde4_modulesdir}/ktupnpplugin.so +%{_kde4_modulesdir}/ktwebinterfaceplugin.so +%{_kde4_modulesdir}/ktzeroconfplugin.so +%{_kde4_modulesdir}/plasma_applet_ktorrent.so +%{_kde4_modulesdir}/plasma_engine_ktorrent.so +%{_kde4_applicationsdir}/ktorrent.desktop +%{_kde4_htmldir}/en/ktorrent/ +%{_kde4_iconsdir}/*/*/actions/kt-add-feeds.* +%{_kde4_iconsdir}/*/*/actions/kt-add-filters.* +%{_kde4_iconsdir}/*/*/actions/kt-bandwidth-scheduler.* +%{_kde4_iconsdir}/*/*/actions/kt-change-tracker.* +%{_kde4_iconsdir}/*/*/actions/kt-check-data.* +%{_kde4_iconsdir}/*/*/actions/kt-chunks.* +%{_kde4_iconsdir}/*/*/actions/kt-encrypted.* +%{_kde4_iconsdir}/*/*/actions/kt-info-widget.* +%{_kde4_iconsdir}/*/*/actions/kt-magnet.* +%{_kde4_iconsdir}/*/*/actions/kt-pause.* +%{_kde4_iconsdir}/*/*/actions/kt-plugins.* +%{_kde4_iconsdir}/*/*/actions/kt-queue-manager.* +%{_kde4_iconsdir}/*/*/actions/kt-remove-feeds.* +%{_kde4_iconsdir}/*/*/actions/kt-remove-filters.* +%{_kde4_iconsdir}/*/*/actions/kt-remove.* +%{_kde4_iconsdir}/*/*/actions/kt-restore-defaults.* +%{_kde4_iconsdir}/*/*/actions/kt-set-max-download-speed.* +%{_kde4_iconsdir}/*/*/actions/kt-set-max-upload-speed.* +%{_kde4_iconsdir}/*/*/actions/kt-show-hide.* +%{_kde4_iconsdir}/*/*/actions/kt-show-statusbar.* +%{_kde4_iconsdir}/*/*/actions/kt-speed-limits.* +%{_kde4_iconsdir}/*/*/actions/kt-start-all.* +%{_kde4_iconsdir}/*/*/actions/kt-start.* +%{_kde4_iconsdir}/*/*/actions/kt-stop-all.* +%{_kde4_iconsdir}/*/*/actions/kt-stop.* +%{_kde4_iconsdir}/*/*/actions/kt-upnp.* +%{_kde4_iconsdir}/*/*/apps/ktorrent.* +%{_kde4_iconsdir}/*/*/mimetypes/torrent.* +%{_kde4_appsdir}/ktorrent/ +%{_kde4_sharedir}/config.kcfg/magnetsettings.kcfg +%{_kde4_servicesdir}/ktbwschedulerplugin.desktop +%{_kde4_servicesdir}/ktdownloadorderplugin.desktop +%{_kde4_servicesdir}/ktinfowidgetplugin.desktop +%{_kde4_servicesdir}/ktipfilterplugin.desktop +%{_kde4_servicesdir}/ktlogviewerplugin.desktop +%{_kde4_servicesdir}/ktmagnetgeneratorplugin.desktop +%{_kde4_servicesdir}/ktmediaplayerplugin.desktop +%{_kde4_servicesdir}/ktscanfolderplugin.desktop +%{_kde4_servicesdir}/ktscriptingplugin.desktop +%{_kde4_servicesdir}/ktsearchplugin.desktop +%{_kde4_servicesdir}/ktshutdownplugin.desktop +%{_kde4_servicesdir}/ktstatsplugin.desktop +%{_kde4_servicesdir}/ktsyndicationplugin.desktop +%{_kde4_servicesdir}/ktupnpplugin.desktop +%{_kde4_servicesdir}/ktwebinterfaceplugin.desktop +%{_kde4_servicesdir}/ktzeroconfplugin.desktop +%{_kde4_servicesdir}/magnet.protocol +%{_kde4_servicesdir}/plasma-applet-ktorrent.desktop +%{_kde4_servicesdir}/plasma-dataengine-ktorrent.desktop +%{_kde4_servicetypesdir}/ktorrentplugin.desktop +%doc %{_mandir}/man1/* %files devel -%defattr(-,root,root) -%_libdir/libktcore.so +%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