- up to 1.0.5

- TODO added
- more verbose %files
- patch for libtorrent module added

Changed files:
    deluge.spec -> 1.21

diff --git a/deluge.spec b/deluge.spec
index 21aab5cfb8c36bc55ebdb21b4228b99fa7e529cd..f0fcb92a8887944662b9d9cf1bf5b200a0b2b303 100644 (file)
--- a/deluge.spec
+++ b/deluge.spec
@@ -1,20 +1,24 @@
+#
+# TODO:
+# - fix building with libtorrent-rasterbar libs, for now it is
+# disabled. Deluge uses its internal libtorrent module
+# - lang files
+#
 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:       0.5.9.1
-Release:       1
+Version:       1.0.5
+Release:       0.1
 License:       GPL v2+
 Group:         X11/Applications/Networking
 Source0:       http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f0545334af0011747d565d6a778a8b23
-#Source1:      %{name}-fixed-setup.py
-Patch0:                %{name}-pld.patch
+# Source0-md5: 24fd36978b2713212cf1ae679f8066d5
+Patch0:                %{name}-libtorrent.patch
 URL:           http://deluge-torrent.org/
-BuildRequires: boost-devel >= 1.35.0
+BuildRequires: boost-devel >= 1.36.0
 BuildRequires: desktop-file-utils
 BuildRequires: libtool
 BuildRequires: python-devel >= 1:2.5
-BuildRequires: rb_libtorrent-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.311
 Requires(post,postun): gtk+2
@@ -25,7 +29,6 @@ Requires:     python-dbus
 Requires:      python-gnome-extras-mozilla
 Requires:      python-pygtk-glade
 Requires:      python-pyxdg
-Requires:      rb_libtorrent
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,14 +48,10 @@ Plug-n-Play), co pozwala łatwiej współdzielić dane BitTorrenta nawet
 zza routera praktycznie bez konfiguracji przekierowywania portów.
 
 %prep
-%setup -q -n %{name}-torrent-%{version}
+%setup -q
 %patch0 -p1
 
 %build
-## We forcibly don't store the installation directory during the build, so
-## we need to ensure that it is properly inserted into the code as required.
-%{__sed} -i -e "s:INSTALL_PREFIX = '@datadir@':INSTALL_PREFIX = '%{_usr}':" \
-       src/common.py
 %ifarch %{x8664} ppc64 sparc64
        CFLAGS="%{rpmcflags} -DAMD64" %{__python} setup.py build
 %else
@@ -63,16 +62,7 @@ zza routera praktycznie bez konfiguracji przekierowywania portów.
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-## ...then strip the unneeded shebang lines from some of the plugins...
-# this seems, wrong, we don't pkg the .py
-# and if we do chmod -x on files should not fill autodeps
-#sed -i 1d $RPM_BUILD_ROOT%{py_sitedir}/%{name}/{delugegtk.py,delugeplugins.py}
-
-# unsupported(?)
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/la
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/pms
-
-%find_lang %{name}
+#%%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,13 +73,73 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %update_icon_cache hicolor
 
-%files -f %{name}.lang
+#%%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
-%doc LICENSE
+%doc ChangeLog LICENSE README
 %attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/%{name}d
 %dir %{py_sitedir}/%{name}
-%{py_sitedir}/%{name}/*.py[co]
+%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/gtkui
+%dir %{py_sitedir}/%{name}/ui/gtkui/glade
+%dir %{py_sitedir}/%{name}/ui/null
+%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/tango
+%dir %{py_sitedir}/%{name}/ui/webui/templates
+%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/revision
+%{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/gtkui/*.py[co]
+%{py_sitedir}/%{name}/ui/gtkui/glade/*.glade
+%{py_sitedir}/%{name}/ui/null/*.py[co]
+%{py_sitedir}/%{name}/ui/webui/LICENSE
+%{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/tango/*.png
+%{py_sitedir}/%{name}/ui/webui/templates/classic/*.cfg
+%{py_sitedir}/%{name}/ui/webui/templates/classic/*.html
+%{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
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
@@ -105,4 +155,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/128x128/apps/deluge.png
 %{_iconsdir}/hicolor/192x192/apps/deluge.png
 #{_iconsdir}/hicolor/256x256/apps/deluge.png
-%{_datadir}/%{name}