- up to 1.2.0

- back to original URL (it works again)
- %files and some cleaning
- c++.patch obsoleted

Changed files:
    deluge.spec -> 1.50

diff --git a/deluge.spec b/deluge.spec
index 4e92cc4ec46b4275bb7ee96639ff548e5e9ab777..8029b84517c5accfb117259dcef6106a50d30cd7 100644 (file)
--- a/deluge.spec
+++ b/deluge.spec
@@ -1,34 +1,40 @@
 Summary:       A Python BitTorrent client with support for UPnP and DHT
 Summary(pl.UTF-8):     Klient BitTorrenta napisany w Pythonie ze wspraciem dla UPnP i DHT
 Name:          deluge
-Version:       1.1.9
-Release:       7
+Version:       1.2.0
+Release:       1
 License:       GPL v3
 Group:         X11/Applications/Networking
-Source0:       http://download.deluge-torrent.org/source/%{name}-%{version}.tar.bz2
-# Source0-md5: 38b9dbf255ed9620760d546dbb757882
-Patch0:                %{name}-c++.patch
+Source0:       http://download.deluge-torrent.info/pub/deluge/source/%{name}-%{version}.tar.bz2
+# Source0-md5: 13ac84e9b5b0293eccb5d89a9fc49461
 URL:           http://deluge-torrent.org/
-BuildRequires: boost-devel >= 1.36.0
-BuildRequires: boost-python-devel >= 1.36.0
 BuildRequires: desktop-file-utils
-BuildRequires: libtool
-BuildRequires: openssl-devel
 BuildRequires: python-devel >= 1:2.5
+BuildRequires: python-libtorrent-rasterbar
 BuildRequires: python-setuptools
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: zlib-devel
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
 Requires:      /bin/sh
 Requires:      hicolor-icon-theme
+# for svg pixbuf loader
 Requires:      librsvg
+Requires:      python-Mako
+Requires:      python-TwistedCore >= 8.1
+Requires:      python-TwistedWeb >= 8.1
+Requires:      python-chardet
 Requires:      python-dbus
-Requires:      python-gnome-extras-mozilla
-Requires:      python-pygtk-glade
+Requires:      python-libtorrent-rasterbar >= 0.14.5
+Requires:      python-pyOpenSSL
+Requires:      python-pygame
+Requires:      python-pygtk-glade >= 2:2.12
+Requires:      python-pygtk-gtk >= 2:2.12
+Requires:      python-pynotify
 Requires:      python-pyxdg
 Requires:      python-setuptools
+Requires:      xdg-utils
+Suggests:      GeoIP-db-Country
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,8 +54,7 @@ Plug-n-Play), co pozwala łatwiej współdzielić dane BitTorrenta nawet
 zza routera praktycznie bez konfiguracji przekierowywania portów.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q 
 
 %build
 %ifarch %{x8664} ppc64 sparc64
@@ -65,20 +70,18 @@ rm -rf $RPM_BUILD_ROOT
 # move lang files into %{_datadir}/locale, find_lang does not work on
 # this. Looks really ugly, if you know a better way please do use it :)
 install -d $RPM_BUILD_ROOT%{_localedir}
-mv -f $RPM_BUILD_ROOT%{py_sitedir}/%{name}/i18n/* $RPM_BUILD_ROOT%{_localedir}
+mv -f $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}/i18n/* $RPM_BUILD_ROOT%{_localedir}
+# clean *.py files from the package, macro doesn't catch those
+find $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name} -name '*.py' -exec %{__rm} {} \;
 
 # unsupported(?)
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/iu
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/jv
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/la
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/pms
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/si
 
 %{__rm} $RPM_BUILD_ROOT%{_localedir}/deluge.pot
 
-# Remove *.py files. We don't package them.
-find $RPM_BUILD_ROOT%{py_sitedir}/%{name} -type f -name '*.py' -print0 | xargs -0 rm -f
-
 # Move svg icon to proper place
 install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps
 mv -f $RPM_BUILD_ROOT%{_iconsdir}/scalable/apps/deluge.svg $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/
@@ -98,102 +101,46 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog README
 %attr(755,root,root) %{_bindir}/deluge
+%attr(755,root,root) %{_bindir}/deluge-console
+%attr(755,root,root) %{_bindir}/deluge-gtk
+%attr(755,root,root) %{_bindir}/deluge-web
 %attr(755,root,root) %{_bindir}/deluged
 %{_pixmapsdir}/%{name}.xpm
-%dir %{py_sitedir}/%{name}
-%dir %{py_sitedir}/%{name}/core
-%dir %{py_sitedir}/%{name}/data
-%dir %{py_sitedir}/%{name}/data/pixmaps
-%dir %{py_sitedir}/%{name}/data/pixmaps/flags
-%dir %{py_sitedir}/%{name}/plugins
-%dir %{py_sitedir}/%{name}/ui
-%dir %{py_sitedir}/%{name}/ui/console
-%dir %{py_sitedir}/%{name}/ui/console/commands
-%dir %{py_sitedir}/%{name}/ui/gtkui
-%dir %{py_sitedir}/%{name}/ui/gtkui/glade
-%dir %{py_sitedir}/%{name}/ui/webui
-%dir %{py_sitedir}/%{name}/ui/webui/lib
-%dir %{py_sitedir}/%{name}/ui/webui/lib/newforms_portable
-%dir %{py_sitedir}/%{name}/ui/webui/lib/newforms_portable/django
-%dir %{py_sitedir}/%{name}/ui/webui/lib/newforms_portable/django/core
-%dir %{py_sitedir}/%{name}/ui/webui/lib/newforms_portable/django/utils
-%dir %{py_sitedir}/%{name}/ui/webui/lib/webpy022
-%dir %{py_sitedir}/%{name}/ui/webui/lib/webpy022/wsgiserver
-%dir %{py_sitedir}/%{name}/ui/webui/scripts
-%dir %{py_sitedir}/%{name}/ui/webui/static
-%dir %{py_sitedir}/%{name}/ui/webui/static/images
-%dir %{py_sitedir}/%{name}/ui/webui/static/images/16
-%dir %{py_sitedir}/%{name}/ui/webui/templates
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/render
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/render/html
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/css
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/icons
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/icons/16
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/icons/32
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/images
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/js
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/classic
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/classic/mime_icons
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/white
-%dir %{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/white/mime_icons
-%dir %{py_sitedir}/%{name}/ui/webui/templates/classic
-%dir %{py_sitedir}/%{name}/ui/webui/templates/white
-%attr(755,root,root) %{py_sitedir}/%{name}/*.so
-%{py_sitedir}/%{name}/*.py[co]
-%{py_sitedir}/%{name}/core/*.py[co]
-%{py_sitedir}/%{name}/data/GeoIP.dat
-%{py_sitedir}/%{name}/data/pixmaps/*.ico
-%{py_sitedir}/%{name}/data/pixmaps/*.png
-%{py_sitedir}/%{name}/data/pixmaps/*.svg
-%{py_sitedir}/%{name}/data/pixmaps/flags/*.png
-%{py_sitedir}/%{name}/plugins/*.py[co]
-%{py_sitedir}/%{name}/ui/*.py[co]
-%{py_sitedir}/%{name}/ui/console/*.py[co]
-%{py_sitedir}/%{name}/ui/console/commands/*.py[co]
-%{py_sitedir}/%{name}/ui/gtkui/*.py[co]
-%{py_sitedir}/%{name}/ui/gtkui/glade/*.glade
-%{py_sitedir}/%{name}/ui/webui/*.py[co]
-%{py_sitedir}/%{name}/ui/webui/lib/*.py[co]
-%{py_sitedir}/%{name}/ui/webui/lib/newforms_portable/*.py[co]
-%{py_sitedir}/%{name}/ui/webui/lib/newforms_portable/django/*.py[co]
-%{py_sitedir}/%{name}/ui/webui/lib/newforms_portable/django/core/*.py[co]
-%{py_sitedir}/%{name}/ui/webui/lib/newforms_portable/django/utils/*.py[co]
-%{py_sitedir}/%{name}/ui/webui/lib/webpy022/*.py[co]
-%{py_sitedir}/%{name}/ui/webui/lib/webpy022/wsgiserver/*.py[co]
-%{py_sitedir}/%{name}/ui/webui/scripts/*
-%{py_sitedir}/%{name}/ui/webui/static/*.css
-%{py_sitedir}/%{name}/ui/webui/static/*.js
-%{py_sitedir}/%{name}/ui/webui/static/images/*.gif
-%{py_sitedir}/%{name}/ui/webui/static/images/*.jpg
-%{py_sitedir}/%{name}/ui/webui/static/images/*.png
-%{py_sitedir}/%{name}/ui/webui/static/images/16/*.png
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/*.cfg
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/*.css
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/*.html
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/*.js
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/render/html/*.html
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/css/*.css
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/icons/16/*.png
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/icons/32/*.png
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/images/*.gif
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/js/*.js
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/classic/*.css
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/classic/*.png
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/classic/mime_icons/*.png
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/white/*.css
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/white/*.png
-%{py_sitedir}/%{name}/ui/webui/templates/ajax/static/themes/white/mime_icons/*.png
-%{py_sitedir}/%{name}/ui/webui/templates/classic/*.cfg
-%{py_sitedir}/%{name}/ui/webui/templates/classic/*.html
-%{py_sitedir}/%{name}/ui/webui/templates/classic/*.js
-%{py_sitedir}/%{name}/ui/webui/templates/classic/*.txt
-%{py_sitedir}/%{name}/ui/webui/templates/white/*.cfg
-%{py_sitedir}/%{name}/ui/webui/templates/white/*.css
-%{py_sitedir}/%{name}/ui/webui/templates/white/*.html
-%{py_sitedir}/%{name}-%{version}-py*.egg-info
+%dir %{py_sitescriptdir}/%{name}
+%dir %{py_sitescriptdir}/%{name}/core
+%dir %{py_sitescriptdir}/%{name}/data
+%dir %{py_sitescriptdir}/%{name}/data/pixmaps
+%dir %{py_sitescriptdir}/%{name}/data/pixmaps/flags
+%dir %{py_sitescriptdir}/%{name}/plugins
+%dir %{py_sitescriptdir}/%{name}/ui
+%dir %{py_sitescriptdir}/%{name}/ui/console
+%dir %{py_sitescriptdir}/%{name}/ui/console/commands
+%dir %{py_sitescriptdir}/%{name}/ui/gtkui
+%dir %{py_sitescriptdir}/%{name}/ui/gtkui/glade
+%dir %{py_sitescriptdir}/%{name}/ui/web
+%{py_sitescriptdir}/%{name}/*.py[co]
+%{py_sitescriptdir}/%{name}/core/*.py[co]
+%{py_sitescriptdir}/%{name}/data/pixmaps/*.ico
+%{py_sitescriptdir}/%{name}/data/pixmaps/*.png
+%{py_sitescriptdir}/%{name}/data/pixmaps/*.svg
+%{py_sitescriptdir}/%{name}/data/pixmaps/flags/*.png
+%{py_sitescriptdir}/%{name}/plugins/*.py[co]
+%{py_sitescriptdir}/%{name}/plugins/*.egg
+%{py_sitescriptdir}/%{name}/ui/*.py[co]
+%{py_sitescriptdir}/%{name}/ui/console/*.py[co]
+%{py_sitescriptdir}/%{name}/ui/console/commands/*.py[co]
+%{py_sitescriptdir}/%{name}/ui/gtkui/*.py[co]
+%{py_sitescriptdir}/%{name}/ui/gtkui/glade/*.glade
+%{py_sitescriptdir}/%{name}/ui/web/*.js
+%{py_sitescriptdir}/%{name}/ui/web/*.py[co]
+%{py_sitescriptdir}/%{name}/ui/web/css
+%{py_sitescriptdir}/%{name}/ui/web/icons
+%{py_sitescriptdir}/%{name}/ui/web/images
+%{py_sitescriptdir}/%{name}/ui/web/index.html
+%{py_sitescriptdir}/%{name}/ui/web/js
+%{py_sitescriptdir}/%{name}/ui/web/render
+%{py_sitescriptdir}/%{name}/ui/web/themes
+%{py_sitescriptdir}/%{name}-*-py*.egg-info
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
 %{_iconsdir}/hicolor/16x16/apps/deluge.png
@@ -207,6 +154,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/96x96/apps/deluge.png
 %{_iconsdir}/hicolor/128x128/apps/deluge.png
 %{_iconsdir}/hicolor/192x192/apps/deluge.png
+%{_iconsdir}/hicolor/256x256/apps/deluge.png
 %{_iconsdir}/hicolor/scalable/apps/deluge.svg
 %{_mandir}/man1/deluge.1*
 %{_mandir}/man1/deluged.1*
+%{_mandir}/man1/deluge-console.1*
+%{_mandir}/man1/deluge-gtk.1*
+%{_mandir}/man1/deluge-web.1*