rpms/deluge/devel deluge-fixed-setup.py, NONE, 1.1 .cvsignore, 1.4, 1.5 deluge.spec, 1.5, 1.6 sources, 1.4, 1.5 deluge-setup.py-build-against-system-libtorrent.patch, 1.2, NONE deluge-setup.py-dont-store-the-install-dir.patch, 1.1, NONE

[Peter Gordon (pgordon)]

Author: pgordon

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

Modified Files:
	.cvsignore deluge.spec sources 
Added Files:
	deluge-fixed-setup.py 
Removed Files:
	deluge-setup.py-build-against-system-libtorrent.patch 
	deluge-setup.py-dont-store-the-install-dir.patch 
Log Message:
Update to new upstream release (0.5 RC1); use a rewritten setup.py instead of patching it an ungodly amount, since that's easier to maintain across version updates and whatnot.


--- NEW FILE deluge-fixed-setup.py ---
# Copyright (c) 2006 Zach Tibbitts ('zachtib') <zach at collegegeek.org>
# Heavily modified by Peter Gordon ('codergeek42') <peter at thecodergeek.com>:
# (1) Forcibly build against a system copy of libtorrent (Rasterbar's);
# (2) Don't let the build script hardcode the RPM buildroot install path in the
#  installed files.
# (3) Use proper CFLAGS (e.g., don't strip any)
#
# 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
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# 
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
# 
# You should have received a copy of the GNU General Public License
# along with this program.  If not, write to:
# 	The Free Software Foundation, Inc.,
# 	51 Franklin Street, Fifth Floor
# 	Boston, MA  02110-1301, USA.

import platform, os, os.path, glob
from distutils.core import setup, Extension
from distutils import sysconfig
import shutil
from distutils import cmd
from distutils.command.install import install as _install
from distutils.command.install_data import install_data as _install_data
from distutils.command.build import build as _build
import msgfmt

pythonVersion = platform.python_version()[0:3]

APP_VERSION = "0.4.99.1"

additions = ['-DNDEBUG', '-O2']

if pythonVersion == '2.5':
	cv_opt = sysconfig.get_config_vars()["CFLAGS"]
	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 addition in additions:
		cv_opt = cv_opt + " " + addition
	sysconfig.get_config_vars()["OPT"] = ' '.join(cv_opt.split())


deluge_core = Extension('deluge_core',
	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'])



class build_trans(cmd.Command):
	description = 'Compile .po files into .mo files'
	
	def initialize_options(self):
		pass

	def finalize_options(self):		
		pass

	def run(self):
		po_dir = os.path.join(os.path.dirname(__file__), 'po')
		for path, names, filenames in os.walk(po_dir):
			for f in filenames:
				if f.endswith('.po'):
					lang = f[:len(f) - 3]
					src = os.path.join(path, f)
					dest_path = os.path.join('build', 'locale', lang, 'LC_MESSAGES')
					dest = os.path.join(dest_path, 'deluge.mo')
					if not os.path.exists(dest_path):
						os.makedirs(dest_path)
					if not os.path.exists(dest):
						print 'Compiling %s' % src
						msgfmt.make(src, dest)
					else:
						src_mtime = os.stat(src)[8]
						dest_mtime = os.stat(dest)[8]
						if src_mtime > dest_mtime:
							print 'Compiling %s' % src
							msgfmt.make(src, dest)

class build(_build):
	sub_commands = _build.sub_commands + [('build_trans', None)]
	def run(self):
		_build.run(self)

class install_data(_install_data):
	def run(self):
		for lang in os.listdir('build/locale/'):
			lang_dir = os.path.join('share', 'locale', lang, 'LC_MESSAGES')
			lang_file = os.path.join('build', 'locale', lang, 'LC_MESSAGES', 'deluge.mo')
			self.data_files.append( (lang_dir, [lang_file]) )
		_install_data.run(self)



cmdclass = {
	'build': build,
	'build_trans': build_trans,
	'install_data': install_data,
}

data = [('share/deluge/glade',  glob.glob('glade/*.glade')),
        ('share/deluge/pixmaps', glob.glob('pixmaps/*.png')),
        ('share/applications' , ['deluge.desktop']),
        ('share/pixmaps' , ['deluge.xpm'])]

for plugin in glob.glob('plugins/*'):
	data.append( ('share/deluge/' + plugin, glob.glob(plugin + '/*')) )

setup(name="deluge", fullname="Deluge BitTorrent Client", version=APP_VERSION,
	author="Zach Tibbitts, Alon Zakai",
	author_email="zach at collegegeek.org, kripkensteiner at gmail.com",
	description="A bittorrent client written in PyGTK",
	url="http://deluge-torrent.org",
	license="GPLv2",
	scripts=["scripts/deluge"],
	packages=['deluge'],
	package_dir = {'deluge': 'src'},
	data_files=data,
	ext_package='deluge',
	ext_modules=[deluge_core],
	cmdclass=cmdclass
	)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Mar 2007 05:23:50 -0000	1.4
+++ .cvsignore	7 Mar 2007 07:25:06 -0000	1.5
@@ -1 +1 @@
-deluge-0.4.90.3.tar.gz
+deluge-0.4.99.1.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- deluge.spec	3 Mar 2007 05:34:57 -0000	1.5
+++ deluge.spec	7 Mar 2007 07:25:06 -0000	1.6
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	0.4.90.3
+Version:	0.4.99.1
 Release:	1%{?dist}
 Summary:	A Python BitTorrent client with support for UPnP and DHT
 Group:		Applications/Editors
@@ -10,9 +10,8 @@
 URL:		http://deluge-torrent.org/           
 
 Source0:	http://deluge-torrent.org/downloads/%{name}-%{version}.tar.gz
-Patch0:		%{name}-setup.py-build-against-system-libtorrent.patch
-Patch1:		%{name}-64bit-python_long.patch
-Patch2:		%{name}-setup.py-dont-store-the-install-dir.patch
+Source1:	%{name}-fixed-setup.py
+Patch0:		%{name}-64bit-python_long.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,9 +36,8 @@
 
 %prep
 %setup -q
-%patch0 -b .use-system-libtorrent
-%patch1 -b .64bit-python_long
-%patch2 -b .dont-store-the-install-dir
+%patch0 -p0 -b .64bit-python_long
+install -m 0755 %{SOURCE1} ./setup.py
 
 
 %build
@@ -65,13 +63,14 @@
 		sed -i 1d ${FILE};
 	done
 popd 
+%find_lang %{name}
 
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc LICENSE 
 %{python_sitearch}/%{name}/
@@ -90,6 +89,15 @@
 
 
 %changelog
+* Tue Mar 06 2007 Peter Gordon <peter at thecodergeek.com> - 0.4.99.1-1
+- Update to new upstream release (0.5 RC1).
+- Use rewritten setup.py instead of patching it so much, since it's easier to
+  maintain across version upgrades and whatnot:
+  + fixed-setup.py
+- Remove the setup.py patches (no longer needed, since I'm packaging my own):
+  - setup.py-dont-store-the-install-dir.patch
+  - setup.py-build-against-system-libtorrent.patch
+
 * Fri Mar 02 2007 Peter Gordon <peter at thecodergeek.com> - 0.4.90.3-1
 - Update to new upstream release (0.5 Beta 3).
 - Add patch to fix storing of installation directory:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2007 05:23:50 -0000	1.4
+++ sources	7 Mar 2007 07:25:06 -0000	1.5
@@ -1 +1 @@
-eecdbae003a9240d93ec023d7a81cd97  deluge-0.4.90.3.tar.gz
+631c45e864a27df4925ecec8e8db415f  deluge-0.4.99.1.tar.gz


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


--- deluge-setup.py-dont-store-the-install-dir.patch DELETED ---