Hello community, here is the log from the commit of package IPCE checked in at Wed Mar 26 00:59:05 CET 2008. -------- --- IPCE/IPCE.changes 2007-08-03 20:40:23.000000000 +0200 +++ /mounts/work_src_done/NOARCH/IPCE/IPCE.changes 2008-02-28 19:18:08.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Feb 27 20:15:21 MST 2008 - wberrier@suse.de + +- Update to r7 + -fix some path issues + -Include 2.x + -init fixes from svn: IPCE-fix_fepy_init.patch + +------------------------------------------------------------------- Old: ---- IPCE-r6.zip New: ---- IPCE-fix_fepy_init.patch IPCE-r7.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ IPCE.spec ++++++ --- /var/tmp/diff_new_pack.B30951/_old 2008-03-26 00:58:58.000000000 +0100 +++ /var/tmp/diff_new_pack.B30951/_new 2008-03-26 00:58:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package IPCE (Version r6) +# spec file for package IPCE (Version r7) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,15 +10,17 @@ # norootforbuild + Name: IPCE -Version: r6 +Version: r7 Release: 1 -License: Any permissive, Shared Source License for IronPython +License: Any permissive BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: mono-core mono-devel mono-winforms unzip -URL: http://www.codeplex.com/Wiki/View.aspx?ProjectName=IronPython +BuildRequires: mono-devel mono-winforms unzip +Url: http://www.codeplex.com/Wiki/View.aspx?ProjectName=IronPython Source0: %{name}-%{version}.zip +Patch0: IPCE-fix_fepy_init.patch Summary: Implementation of the Python programming language running on .NET Group: Development/Languages/Python Provides: IronPython @@ -45,40 +47,49 @@ -------- Jim Hugunin - %files %defattr(-, root, root) -%doc License.html FAQ.html Readme.html +%doc License.html /usr/bin/* /usr/lib/IPCE + %prep %setup -n %{name}-%{version} -q +%patch0 -p1 %build # For now, package prebuilt version, as it would be a lot of work # to put together the sources that fepy does for it's builds # (They don't ship them) If the point does come where we need # to patch a build, we could include the ironpython source, add their -# patches, and then their supplementary files, but what a mess... +# patches, and then their supplementary files. true %install # Create dirs mkdir -p ${RPM_BUILD_ROOT}/usr/bin mkdir -p ${RPM_BUILD_ROOT}/usr/lib/IPCE -mkdir -p ${RPM_BUILD_ROOT}/usr/lib/IPCE/Lib #Install binaries -cp *.exe *.dll ${RPM_BUILD_ROOT}/usr/lib/IPCE -cp -R Lib/* ${RPM_BUILD_ROOT}/usr/lib/IPCE/Lib +cp -a ipy ${RPM_BUILD_ROOT}/usr/lib/IPCE +cp -a ipy2 ${RPM_BUILD_ROOT}/usr/lib/IPCE +cp -a Lib ${RPM_BUILD_ROOT}/usr/lib/IPCE # Generate wrapper scripts -for f in `find . -name "*\.exe"` ; do - script_name=${RPM_BUILD_ROOT}/usr/bin/`basename $f .exe` - cat <<EOF > $script_name +for f in $(find . -name "*\.exe") ; do + # For the 2.x assemblies... + if test x$(dirname $f) == x"./ipy2" ; then + script_name="/usr/bin/$(basename $f .exe)2" + assembly="ipy2/$(basename $f)" + else + script_name="/usr/bin/$(basename $f .exe)" + assembly="ipy/$(basename $f)" + fi + cat <<EOF > ${RPM_BUILD_ROOT}$script_name #!/bin/sh -exec `which mono` /usr/lib/IPCE/`basename $f` "\$@" +exec $(which mono) /usr/lib/IPCE/$assembly "\$@" EOF - chmod 755 $script_name + chmod 755 ${RPM_BUILD_ROOT}$script_name done +# TODO: patch site.py # Substitute location of python interpreter to make sure the rpm doesn't depend on /usr/local/bin/python for i in lib/IPCE/Lib/cgi.py lib/IPCE/Lib/Crypto/Util/RFC1751.py ; do sed -i "s/\/usr\/local\/bin\/python/\/usr\/bin\/python/" ${RPM_BUILD_ROOT}/usr/$i @@ -88,36 +99,38 @@ %clean rm -rf "$RPM_BUILD_ROOT" -# auto dep/req generation for older distros (it will take a while for the .config scanning to get upstream) -%if 0%{?suse_version} <= 1040 || 0%{?fedora_version} <= 7 -%if 0%{?fedora_version} +%if 0%{?fedora_version} || 0%{?rhel_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif %define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' -%endif %changelog -* Fri Aug 03 2007 - wberrier@suse.de +* Wed Feb 27 2008 wberrier@suse.de +- Update to r7 + -fix some path issues + -Include 2.x + -init fixes from svn: IPCE-fix_fepy_init.patch +* Fri Aug 03 2007 wberrier@suse.de - Update to r6 (Includes IronPython 1.1) -several new modules (array, SHA, MD5, and select), support for XML Doc comments within the help system and _doc_ tags, as well as support for loading cached pre-compiled modules. -Other various Bug fixes -* Wed Apr 11 2007 - wberrier@novell.com +* Wed Apr 11 2007 wberrier@novell.com - Add mono dep/req for older distros -* Wed Jan 17 2007 - wberrier@suse.de +* Wed Jan 17 2007 wberrier@suse.de - Ship IPCE instead if IronPython and rename package to reflect this -* Wed Oct 25 2006 - wberrier@suse.de +* Tue Oct 24 2006 wberrier@suse.de - Add mono-devel to BuildRequires so mono rpm deps and requires get generated correctly -* Thu Sep 07 2006 - wberrier@suse.de +* Thu Sep 07 2006 wberrier@suse.de - Update to 1.0 final -* Wed Aug 30 2006 - wberrier@suse.de +* Wed Aug 30 2006 wberrier@suse.de - Update to 1.0 rc2 with several bugfixes. -* Wed Aug 02 2006 - wberrier@suse.de +* Tue Aug 01 2006 wberrier@suse.de - New package - Shell stuff in order to build with mono ++++++ IPCE-fix_fepy_init.patch ++++++ --- IPCE-r7/Lib/fepy/__init__.py.orig 2008-02-28 11:12:02.000000000 -0700 +++ IPCE-r7/Lib/fepy/__init__.py 2008-02-28 11:11:37.000000000 -0700 @@ -14,5 +14,8 @@ def override_builtin(name): import imp, sys, os sys.modules[name] = module = imp.new_module(name) - path = os.path.join(sys.prefix, 'Lib', name + '.py') - execfile(path, module.__dict__) + for path in sys.path: + file = os.path.join(path, name + '.py') + if os.path.exists(file): + break + execfile(file, module.__dict__) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de