rpms/deluge/devel deluge-setup.py-build-against-system-libtorrent.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 deluge.spec, 1.1, 1.2 sources, 1.2, 1.3 COPYING, 1.1, NONE deluge.desktop, 1.1, NONE

Sun Feb 25 01:01:38 UTC 2007

Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17823

Modified Files:
	.cvsignore deluge.spec sources 
Added Files:
	deluge-setup.py-build-against-system-libtorrent.patch 
Removed Files:
	COPYING deluge.desktop 
Log Message:
Update to new upstream release (0.5 Beta 2).

deluge-setup.py-build-against-system-libtorrent.patch:

--- NEW FILE deluge-setup.py-build-against-system-libtorrent.patch ---
--- setup.py.old	2007-02-24 16:44:31.000000000 -0800
+++ setup.py	2007-02-24 16:47:43.000000000 -0800
@@ -1,4 +1,6 @@
 # Copyright (c) 2006 Zach Tibbitts ('zachtib') <zach at collegegeek.org>
+# Modified by Peter Gordon ('codergeek42') <peter at thecodergeek.com> to build
+# against a system-installed copy of libtorrent, not the included sources.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,20 +26,15 @@
 
 pythonVersion = platform.python_version()[0:3]
 
-removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes']
 additions = ['-DNDEBUG', '-O2']
 
 if pythonVersion == '2.5':
 	cv_opt = sysconfig.get_config_vars()["CFLAGS"]
-	for removal in removals:
-		cv_opt = cv_opt.replace(removal, " ")
 	for addition in additions:
 		cv_opt = cv_opt + " " + addition
 	sysconfig.get_config_vars()["CFLAGS"] = ' '.join(cv_opt.split())
 else:
 	cv_opt = sysconfig.get_config_vars()["OPT"]
-	for removal in removals:
-		cv_opt = cv_opt.replace(removal, " ")
 	for addition in additions:
 		cv_opt = cv_opt + " " + addition
 	sysconfig.get_config_vars()["OPT"] = ' '.join(cv_opt.split())
@@ -46,46 +43,11 @@
 
 
 deluge_core = Extension('deluge_core',
-                    include_dirs = ['./libtorrent', './libtorrent/include', './libtorrent/include/libtorrent',
-												'/usr/include/python' + pythonVersion],
-                    libraries = ['boost_filesystem', 'boost_date_time',
-											'boost_program_options', 'boost_regex',
-											'boost_serialization', 'boost_thread', 'z', 'pthread'],
-                    extra_compile_args = ["-Wno-missing-braces"],
-                    sources = ['src/deluge_core.cpp',
-                    					 'libtorrent/src/alert.cpp',
-										 'libtorrent/src/allocate_resources.cpp',
-										 'libtorrent/src/bt_peer_connection.cpp',
-										 'libtorrent/src/entry.cpp',
-										 'libtorrent/src/escape_string.cpp',
-										 'libtorrent/src/file.cpp',
-										 'libtorrent/src/http_tracker_connection.cpp',
-					                	 'libtorrent/src/identify_client.cpp',
-										 'libtorrent/src/ip_filter.cpp',
- 										 'libtorrent/src/peer_connection.cpp',
-						             	 'libtorrent/src/piece_picker.cpp',     
-										 'libtorrent/src/policy.cpp',       
-					                	 'libtorrent/src/session.cpp',   
-					                	 'libtorrent/src/session_impl.cpp',
-                               			 'libtorrent/src/sha1.cpp',
-									     'libtorrent/src/stat.cpp',
-									     'libtorrent/src/storage.cpp',
-								       	 'libtorrent/src/torrent.cpp',
-										 'libtorrent/src/torrent_handle.cpp',
-										 'libtorrent/src/torrent_info.cpp',
-										 'libtorrent/src/tracker_manager.cpp',
-										 'libtorrent/src/udp_tracker_connection.cpp',
-					                	 'libtorrent/src/web_peer_connection.cpp',
-										 'libtorrent/src/kademlia/closest_nodes.cpp',
-										 'libtorrent/src/kademlia/dht_tracker.cpp',
-										 'libtorrent/src/kademlia/find_data.cpp',
-										 'libtorrent/src/kademlia/node.cpp',
-										 'libtorrent/src/kademlia/node_id.cpp',
-										 'libtorrent/src/kademlia/refresh.cpp',
-										 'libtorrent/src/kademlia/routing_table.cpp',
-										 'libtorrent/src/kademlia/rpc_manager.cpp',
-										 'libtorrent/src/kademlia/traversal_algorithm.cpp'])
-
+	include_dirs = [sysconfig.get_python_inc(), '/usr/include', '/usr/include/libtorrent'],
+	libraries = ['boost_filesystem', 'torrent'],
+	extra_compile_args = ["-Wno-missing-braces"],
+	sources = ['src/deluge_core.cpp'])
+	
 data = [('share/deluge/glade',  glob.glob('glade/*.glade')),
         ('share/deluge/pixmaps', glob.glob('pixmaps/*.png')),
         ('share/applications' , ['deluge.desktop']),
@@ -104,6 +66,6 @@
 	packages=['deluge'],
 	package_dir = {'deluge': 'src'},
 	data_files=data,
-    ext_package='deluge',
+	ext_package='deluge',
 	ext_modules=[deluge_core]
 	)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Feb 2007 01:52:01 -0000	1.2
+++ .cvsignore	25 Feb 2007 01:01:05 -0000	1.3
@@ -1 +1 @@
-deluge-0.4.1.tar.gz
+deluge-0.4.90.2.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deluge.spec	24 Feb 2007 01:52:01 -0000	1.1
+++ deluge.spec	25 Feb 2007 01:01:05 -0000	1.2
@@ -1,32 +1,29 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.4.1
-Release:	6%{?dist}
+Version:	0.4.90.2
+Release:	1%{?dist}
 Summary:	A Python BitTorrent client with support for UPnP and DHT
 Group:		Applications/Editors
 License:	GPL
 URL:		http://deluge-torrent.org/           
 
 Source0:	http://deluge-torrent.org/downloads/%{name}-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	COPYING
+Patch0:		%{name}-setup.py-build-against-system-libtorrent.patch
+
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	python-devel
+BuildRequires:	rb_libtorrent-devel
 
 Requires:	/bin/sh
 Requires:	pyxdg
-Requires:	python-libtorrent >= 0.3.0-4
-Requires:	gnome-python2-libegg
+Requires:	rb_libtorrent
 Requires:	pygtk2-libglade
-Requires:	PyXML
-
-%if 0%{?fedora} >= 6
-Requires:	notify-python
-%endif
+Requires:	dbus-python
 
 %description
 Deluge is a new BitTorrent client, created using Python and GTK+. It is
@@ -39,35 +36,28 @@
 
 %prep
 %setup -q
+%patch0 -b .use-system-libtorrent
 
 
 %build
-## Nothing to build...
+CFLAGS="%{optflags}" %{__python} setup.py build
 
 
 %install
 rm -rf %{buildroot}
-## Copy the necessary files...
-install -p -m 0755 -d %{buildroot}%{python_sitelib}/%{name}/
-install -p -m 0755 -t %{buildroot}%{python_sitelib}/%{name}/ *.py
-cp -pr glade plugins pixmaps %{buildroot}%{python_sitelib}/%{name}/
-install -p -D -m 0644 pixmaps/%{name}-256.png	\
-	%{buildroot}%{_datadir}/pixmaps/%{name}.png 
-install -p -m 0644 %{SOURCE2} ./COPYING
-
-## ...Create the wrapper script...
-echo -e '#!/bin/sh\ncd %{python_sitelib}/%{name} && exec python ./deluge.py' > %{name}-wrapper.sh 
-install -D -m 0755 %{name}-wrapper.sh %{buildroot}%{_bindir}/%{name}
-
-## ...then strip the unneeded shebang lines from the plugins...
-for FILE in %{buildroot}/%{python_sitelib}/%{name}/plugins/*.py; do
-	sed -i 1d ${FILE};
-done  
-
-## ...Then install the .desktop file.
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	%{SOURCE1}
+	--copy-name-to-generic-name	\
+	--add-mime-type=application/x-bittorrent	\
+	--delete-original	\
+	%{buildroot}%{_datadir}/applications/%{name}.desktop
+## ...then strip the unneeded shebang lines from some of the plugins...
+pushd %{buildroot}/%{python_sitearch}/%{name}/
+	for FILE in delugegtk.py delugeplugins.py; do
+		sed -i 1d ${FILE};
+	done
+popd 
 
 
 %clean
@@ -76,13 +66,10 @@
 
 %files
 %defattr(-,root,root,-)
-## No LICENSE or COPYING text available in the source tarball, though each
-## source file has a header GPL comment block. I've submitted a bug report to
-## the upstream developers about this; and they will include such a file in
-## the next release of Deluge.
-%doc COPYING
-%{python_sitelib}/%{name}/
-%{_datadir}/pixmaps/%{name}.png
+%doc LICENSE 
+%{python_sitearch}/%{name}/
+%{_datadir}/%{name}/
+%{_datadir}/pixmaps/%{name}.xpm
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_bindir}/%{name}
 
@@ -96,6 +83,13 @@
 
 
 %changelog
+* Sat Feb 24 2007 Peter Gordon <peter at thecodergeek.com> - 0.4.90.2-1
+- Update to new upstream release (0.5 Beta 2)
+- Add patch to force building against system copy of rb_libtorrent:
+  + setup.py-build-against-system-libtorrent.patch
+- Remove python-libtorrent and a few other dependencies that are no longer
+  uses.
+
 * Fri Feb 23 2007 Peter Gordon <peter at thecodergeek.com> - 0.4.1-6
 - Fix Source0 URL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Feb 2007 01:52:01 -0000	1.2
+++ sources	25 Feb 2007 01:01:05 -0000	1.3
@@ -1 +1 @@
-4a6c33a11d076e78caba1da476970b6f  deluge-0.4.1.tar.gz
+0c8676b6dcd9ba067de5d7e3e892841c  deluge-0.4.90.2.tar.gz


--- COPYING DELETED ---


--- deluge.desktop DELETED ---


