August 2009 - openSUSE Commits - openSUSE Mailing Lists

commit virt-manager for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at Sat Aug 29 01:15:59 CEST 2009. -------- --- virt-manager/virt-manager.changes 2009-07-31 04:01:22.000000000 +0200 +++ virt-manager/virt-manager.changes 2009-08-29 00:44:20.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 28 16:44:17 MDT 2009 - carnold(a)novell.com + +- Building for 11.1 or sles11 fails because of changes in the + schemas location. Fix spec file to handle it. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.kAoTTY/_old 2009-08-29 01:15:14.000000000 +0200 +++ /var/tmp/diff_new_pack.kAoTTY/_new 2009-08-29 01:15:14.000000000 +0200 @@ -26,7 +26,7 @@ %define virtinst_rel 0 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} Version: 0.8.0 -Release: 1 +Release: 2 Summary: Virtual Machine Manager Group: System/Monitoring License: LGPL v2.1 or later @@ -193,10 +193,13 @@ %doc COPYING AUTHORS ChangeLog # %dir %attr(775,root,root) /etc/gconf # %dir %attr(775,root,root) /etc/gconf/schemas -# %config %{gsysconfdir}/gconf/schemas/%{name}.schemas +%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} %dir %{_datadir}/gconf %dir %{_datadir}/gconf/schemas %config %{_datadir}/gconf/schemas/%{name}.schemas +%else +%{gsysconfdir}/gconf/schemas/%{name}.schemas +%endif %{_bindir}/%{name} %{_libexecdir}/%{name}-launch %dir %{_datadir}/%{name} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-logilab-common for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package python-logilab-common for openSUSE:Factory checked in at Sat Aug 29 01:14:58 CEST 2009. -------- --- python-logilab-common/python-logilab-common.changes 2008-09-12 18:06:11.000000000 +0200 +++ python-logilab-common/python-logilab-common.changes 2009-08-10 12:54:29.000000000 +0200 @@ -1,0 +2,98 @@ +Sun Aug 9 12:43:26 CEST 2009 - coolo(a)novell.com + +- use new python macros + +------------------------------------------------------------------- +Wed Aug 5 15:15:22 CEST 2009 - hpj(a)urpla.net + +- Update to 0.43.0: + * dbf: a DBF reader which reads Visual Fox Pro DBF format with Memo field + (module from Yusdi Santoso) + * shellutils: + - #9764 add title to shellutils.ProgressBar + - #9796 new confirm function + + 2009-07-17 -- 0.42.0 + * pyro_ext: new module for pyro utilities + * adbh: fix default set_null_allowed implementation, new case_sensitive + resource descriptor + + 2009-06-03 -- 0.41.0 + * modutils: new extrapath argument to modpath_from_file (see function's + docstring for explanation) + + * adbh: new alter_column_support flag, sql_set_null_allowed and + sql_change_col_type methods + + 2009-05-28 -- 0.40.1 + * date: handle both mx.DateTime and datetime representations + * db: use sqlite native module's Binary, not StringIO + + 2009-05-14 -- 0.40.0 + * python < 2.3 are now officially unsupported + * #9162: new module with some sphinx utilities + * #9166: use a global variable to control mx datetime / py datetime usage + * db: add time adapter for pysqlite2, fix mysql bool and string handling + * configuration: don't print default for store_true / store_false option + or option with None as default + + 2009-04-07 -- 0.39.1 + * fix #6760 umessage.decode_QP() crashes on unknown encoding + + 2009-03-25 -- 0.39.0 + * fix #7915 (shellutils unusable under windows) + * testlib: + * new profile option using cProfile + * allows to skip a module by raising TestSkipped from module import + * modutils: locate modules in zip/egg archive + * db: USE_MX_DATETIME global to control usage of mx.DateTime / py datetime + + 2009-01-26 -- 0.38.0 + * setuptools / easy_install support! + * removed some old backward compat code + * adbh: new intersect_all_support attribute + * contexts: new pushd context manager + * shellutils: enhance acquire_lock method w/ race condition + * configuration: fix case sensitivity pb w/ config file sections + * pytest: reimplemented colorization + + 2009-01-08 -- 0.37.2 + * configuration: encoding handling for configuration file generation + * adbh: fix Datetime type map for mysql + * logging_ext: drop lldebug level which shouldn't be there + + 2008-12-11 -- 0.37.1 + * contexts: make the module syntactically correct wrt python2.4 + + 2008-12-09 -- 0.37.0 + * contexts: new module for context managers, keeping py <2.4 syntax compat + for distribution (only `tempdir` cm for now) + * tasksqueue: new module containing a class to handle prioritized tasks queue + * proc: new module for process information / resource control + * optik_ext: new time/bytes option types, using textutils conversion function + * logging_ext: new set_log_methods / init_log utility functions + + 2008-10-30 -- 0.36.0 + * configuration: + - option yn is now behaving like a flag (i.e --ex : if ex.default=True + and --ex in sys.args then ex.value=False) + - new attribute hide in option (i.e --ex : if --ex has 'hide':True then + the option will not be displayed in man or --help) + * pytest: + - add colors in display + - new option --restart that skips tests that succeeded on last run + * cache: new herits from dict class + * decorators: add @require_version @require_module that skip test if + decorators are not satisfied + + 2008-10-09 -- 0.35.3 + * graph: new has_path method + + 2008-10-01 -- 0.35.2 + * configuration: + - fix #6011: lgc.configuration ignore customized option values + - fix #3278: man page generation broken + * dropped context.py module which broke the debian package when + some python <2.5 is installed (#5979) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- logilab-common-0.35.0.tar.bz2 New: ---- logilab-common-0.43.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-logilab-common.spec ++++++ --- /var/tmp/diff_new_pack.oj9VSq/_old 2009-08-29 01:13:12.000000000 +0200 +++ /var/tmp/diff_new_pack.oj9VSq/_new 2009-08-29 01:13:12.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-logilab-common (Version 0.35.0) +# spec file for package python-logilab-common (Version 0.43.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: python-logilab-common Summary: Python lowlevel functionality shared by logilab projects -Version: 0.35.0 +Version: 0.43.0 Release: 1 BuildRequires: python-devel Source: logilab-common-%{version}.tar.bz2 @@ -29,6 +29,11 @@ Url: http://www.logilab.org/projects/common/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} +%if %suse_version <= 1110 +%define python_sitelib %py_sitedir +%else +BuildArch: noarch +%endif %description The package logilab.common contains several modules providing low level @@ -73,7 +78,7 @@ # %doc ureports # %doc test # FIXME: Why are these not part of INSTALLED_FILES ? -%{py_sitedir}/logilab/__init__.py -%{py_sitedir}/logilab/common/test/data/* +%{python_sitelib}/logilab/__init__.py +%{python_sitelib}/logilab/common/test/data/* %changelog ++++++ logilab-common-0.35.0.tar.bz2 -> logilab-common-0.43.0.tar.bz2 ++++++ ++++ 9576 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-cmdln for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package python-cmdln for openSUSE:Factory checked in at Sat Aug 29 01:12:56 CEST 2009. -------- --- python-cmdln/python-cmdln.changes 2008-03-06 09:46:02.000000000 +0100 +++ python-cmdln/python-cmdln.changes 2009-08-28 22:31:36.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Aug 28 22:31:23 CEST 2009 - coolo(a)novell.com + +- merge build service with factory + +------------------------------------------------------------------- +Mon Jun 9 02:14:10 CEST 2008 - poeml(a)suse.de + +- don't make the "Release" tag a macro + +------------------------------------------------------------------- +Thu May 1 12:33:29 CEST 2008 - poeml(a)suse.de + +- This package is not a noarch package -- fix the build. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cmdln.spec ++++++ --- /var/tmp/diff_new_pack.1MJq7W/_old 2009-08-29 01:12:23.000000000 +0200 +++ /var/tmp/diff_new_pack.1MJq7W/_new 2009-08-29 01:12:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-cmdln (Version MACRO) +# spec file for package python-cmdln (Version 1.1.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,9 +25,9 @@ Name: python-cmdln Version: %{version} -Release: 4 +Release: 5 Source0: %{_name}-%{unmangled_version}.tar.bz2 -License: X11/MIT +License: MIT License (or similar) Group: Development/Libraries/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: %{_prefix} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-cairo for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package python-cairo for openSUSE:Factory checked in at Sat Aug 29 01:12:04 CEST 2009. -------- --- python-cairo/python-cairo.changes 2009-03-20 00:57:49.000000000 +0100 +++ python-cairo/python-cairo.changes 2009-07-21 13:20:55.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jul 21 13:16:50 CEST 2009 - lmedinas(a)gmail.com + +- Update to version 1.8.6: + + Bug Fixes: + - ImageSurface.create_from_png _read_func fix + - ToyFontFace type fix + - fdo#19221: restore cairo.Matrix '*' operator to the way it + originally worked. + + Documentation completed + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pycairo-1.8.4.tar.bz2 New: ---- pycairo-1.8.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cairo.spec ++++++ --- /var/tmp/diff_new_pack.NzxPgo/_old 2009-08-29 01:11:09.000000000 +0200 +++ /var/tmp/diff_new_pack.NzxPgo/_new 2009-08-29 01:11:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-cairo (Version 1.8.4) +# spec file for package python-cairo (Version 1.8.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,10 +22,10 @@ BuildRequires: cairo-devel BuildRequires: fdupes BuildRequires: python-devel -License: LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) +License: LGPL v2.1 or later ; MPL .. Group: Development/Libraries/Python Summary: Python Bindings for Cairo -Version: 1.8.4 +Version: 1.8.6 Release: 1 Url: http://www.cairographics.org/ Source: pycairo-%{version}.tar.bz2 @@ -44,7 +44,7 @@ Maarten Breddels %package devel -License: LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) +License: LGPL v2.1 or later ; MPL .. Summary: Headers for python-cairo Group: Development/Libraries/Python Requires: %name = %{version} ++++++ pycairo-1.8.4.tar.bz2 -> pycairo-1.8.6.tar.bz2 ++++++ ++++ 4477 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-OpenEXR for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package python-OpenEXR for openSUSE:Factory checked in at Sat Aug 29 01:10:55 CEST 2009. -------- --- python-OpenEXR/python-OpenEXR.changes 2009-06-02 08:56:06.000000000 +0200 +++ python-OpenEXR/python-OpenEXR.changes 2009-08-26 15:46:55.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 26 13:46:15 UTC 2009 - mvyskocil(a)suse.cz + +- Update to 1.0.3: + * Improvements to error messages, argument parsing, and module + * initialisation, thanks to Campbell Barton. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- OpenEXR-1.0.tar.bz2 New: ---- OpenEXR-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-OpenEXR.spec ++++++ --- /var/tmp/diff_new_pack.Q7ll2j/_old 2009-08-29 01:09:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Q7ll2j/_new 2009-08-29 01:09:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-OpenEXR (Version 1.0) +# spec file for package python-OpenEXR (Version 1.0.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: python-OpenEXR -Version: 1.0 -Release: 2 +Version: 1.0.3 +Release: 1 Summary: Python bindings for OpenEXR Group: Development/Libraries/Python License: BSD 3-clause (or similar) Url: http://excamera.com/articles/26/openexr.html -Source0: http://excamera.com/files/OpenEXR-%{version}.tar.bz2 +Source0: http://pypi.python.org/packages/source/O/OpenEXR/OpenEXR-%{version}.tar.bz2 Source1: http://excamera.com/files/OpenEXR.pdf # license will be included in future release # see http://www.mail-archive.com/openexr-devel@nongnu.org/msg00844.html @@ -90,6 +90,7 @@ python setup.py install \ --root=%{buildroot} \ --prefix=%{_prefix} \ + --install-data=%{_datadir}/%{name}-%{version} \ --record-rpm=INSTALLED_FILES %clean @@ -97,7 +98,8 @@ %files -f INSTALLED_FILES %defattr(-,root,root,0755) -%doc index.rst license.txt +%doc license.txt +%dir %{_datadir}/%{name}-%{version}/ %files doc %defattr(-,root,root,0755) ++++++ OpenEXR-1.0.tar.bz2 -> OpenEXR-1.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/Imath.py new/OpenEXR-1.0.3/Imath.py --- old/OpenEXR-1.0/Imath.py 2009-05-26 02:33:41.000000000 +0200 +++ new/OpenEXR-1.0.3/Imath.py 2009-08-15 17:31:01.000000000 +0200 @@ -20,7 +20,7 @@ pass class Box: - """Box is a 2D box, specified by its two corners *min* and *max*.""" + """Box is a 2D box, specified by its two corners *min* and *max*, both of which are :class:`point` """ def __init__(self, min = None, max = None): self.min = min self.max = max @@ -83,6 +83,7 @@ PIZ_COMPRESSION = 4 PXR24_COMPRESSION = 5 def __init__(self, v): + """l""" self.v = v def __repr__(self): return [ "NO_COMPRESSION", "RLE_COMPRESSION", "ZIPS_COMPRESSION", "ZIP_COMPRESSION", "PIZ_COMPRESSION", "PXR24_COMPRESSION"][self.v] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/MANIFEST new/OpenEXR-1.0.3/MANIFEST --- old/OpenEXR-1.0/MANIFEST 2009-05-26 02:51:36.000000000 +0200 +++ new/OpenEXR-1.0.3/MANIFEST 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -Imath.py -OpenEXR.cpp -setup.py -test.py -MANIFEST -Makefile -conf.py -index.rst -intro.rst -openexr.rst -imath.rst -lena.jpg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/Makefile new/OpenEXR-1.0.3/Makefile --- old/OpenEXR-1.0/Makefile 2009-05-25 21:12:47.000000000 +0200 +++ new/OpenEXR-1.0.3/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . - -.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest - -help: - @echo "Please use \`make <target>' where <target> is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - -rm -rf _build/* - -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html - @echo - @echo "Build finished. The HTML pages are in _build/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml - @echo - @echo "Build finished. The HTML pages are in _build/dirhtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) _build/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in _build/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in _build/qthelp, like this:" - @echo "# qcollectiongenerator _build/qthelp/OpenEXR.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile _build/qthelp/OpenEXR.qhc" - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex - @echo - @echo "Build finished; the LaTeX files are in _build/latex." - @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ - "run these through (pdf)latex." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes - @echo - @echo "The overview file is in _build/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in _build/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in _build/doctest/output.txt." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/OpenEXR.cpp new/OpenEXR-1.0.3/OpenEXR.cpp --- old/OpenEXR-1.0/OpenEXR.cpp 2009-05-26 02:34:38.000000000 +0200 +++ new/OpenEXR-1.0.3/OpenEXR.cpp 2009-08-21 20:54:25.000000000 +0200 @@ -43,7 +43,7 @@ static PyObject *OpenEXR_error = NULL; static PyObject *pModuleImath; -static PyObject *PyObject_StealAttrString(PyObject* o, char *name) +static PyObject *PyObject_StealAttrString(PyObject* o, const char *name) { PyObject *r = PyObject_GetAttrString(o, name); Py_DECREF(r); @@ -72,7 +72,7 @@ char *cname; PyObject *pixel_type = NULL; - char *keywords[] = { "channel_name", "pixel_type", "scanLine1", "scanLine2", NULL }; + char *keywords[] = { (char*)"channel_name", (char*)"pixel_type", (char*)"scanLine1", (char*)"scanLine2", NULL }; if (!PyArg_ParseTupleAndKeywords(args, kw, "s|Oii", keywords, &cname, &pixel_type, &miny, &maxy)) return NULL; @@ -148,6 +148,112 @@ return r; } +static PyObject *channels(PyObject *self, PyObject *args, PyObject *kw) +{ + InputFile *file = &((InputFileC *)self)->i; + + Box2i dw = file->header().dataWindow(); + int miny, maxy; + + miny = dw.min.y; + maxy = dw.max.y; + + PyObject *clist; + PyObject *pixel_type = NULL; + char *keywords[] = { (char*)"channel_name", (char*)"pixel_type", (char*)"scanLine1", (char*)"scanLine2", NULL }; + if (!PyArg_ParseTupleAndKeywords(args, kw, "O|Oii", keywords, &clist, &pixel_type, &miny, &maxy)) + return NULL; + + if (maxy < miny) { + PyErr_SetString(PyExc_TypeError, "scanLine1 must be <= scanLine2"); + return NULL; + } + if (miny < dw.min.y) { + PyErr_SetString(PyExc_TypeError, "scanLine1 cannot be outside dataWindow"); + return NULL; + } + if (maxy > dw.max.y) { + PyErr_SetString(PyExc_TypeError, "scanLine2 cannot be outside dataWindow"); + return NULL; + } + + ChannelList channels = file->header().channels(); + FrameBuffer frameBuffer; + + int width = dw.max.x - dw.min.x + 1; + int height = maxy - miny + 1; + + PyObject *retval = PyList_New(0); + PyObject *iterator = PyObject_GetIter(clist); + if (iterator == NULL) { + PyErr_SetString(PyExc_TypeError, "Channel list must be iterable"); + return NULL; + } + PyObject *item; + + while ((item = PyIter_Next(iterator)) != NULL) { + char *cname = PyString_AsString(item); + Channel *channelPtr = channels.findChannel(cname); + if (channelPtr == NULL) { + return PyErr_Format(PyExc_TypeError, "There is no channel '%s' in the image", cname); + } + + Imf::PixelType pt; + if (pixel_type != NULL) { + pt = PixelType(PyLong_AsLong(PyObject_StealAttrString(pixel_type, "v"))); + } else { + pt = channelPtr->type; + } + + // Use pt to compute typeSize + size_t typeSize; + switch (pt) { + case HALF: + typeSize = 2; + break; + + case FLOAT: + case UINT: + typeSize = 4; + break; + + default: + PyErr_SetString(PyExc_TypeError, "Unknown type"); + return NULL; + } + + size_t xstride = typeSize; + size_t ystride = typeSize * width; + + PyObject *r = PyString_FromStringAndSize(NULL, typeSize * width * height); + PyList_Append(retval, r); + Py_DECREF(r); + + char *pixels = PyString_AsString(r); + + try + { + frameBuffer.insert(cname, + Slice(pt, + pixels - dw.min.x * xstride - miny * ystride, + xstride, + ystride, + 1,1, + 0.0)); + } + catch (const std::exception &e) + { + PyErr_SetString(PyExc_IOError, e.what()); + return NULL; + } + Py_DECREF(item); + } + Py_DECREF(iterator); + file->setFrameBuffer(frameBuffer); + file->readPixels(miny, maxy); + + return retval; +} static PyObject *inclose(PyObject *self, PyObject *args) { InputFileC *pc = ((InputFileC *)self); @@ -187,12 +293,10 @@ PyObject *pt[2]; pt[0] = PyObject_CallObject(pPointFunc, ptargs[0]); pt[1] = PyObject_CallObject(pPointFunc, ptargs[1]); - PyObject *boxArgs = Py_BuildValue("OO", pt[0], pt[1]); + PyObject *boxArgs = Py_BuildValue("NN", pt[0], pt[1]); ob = PyObject_CallObject(pBoxFunc, boxArgs); Py_DECREF(boxArgs); - Py_DECREF(pt[0]); - Py_DECREF(pt[1]); Py_DECREF(ptargs[0]); Py_DECREF(ptargs[1]); } else if (const PreviewImageAttribute *pia = dynamic_cast <const PreviewImageAttribute *> (a)) { @@ -215,13 +319,12 @@ for (ChannelList::ConstIterator j = cl.begin(); j != cl.end(); ++j) { PyObject *ptarg = Py_BuildValue("(i)", j.channel().type); PyObject *pt = PyObject_CallObject(pPTFunc, ptarg); - PyObject *chanarg = Py_BuildValue("Oii", + PyObject *chanarg = Py_BuildValue("Nii", pt, j.channel().xSampling, j.channel().ySampling); PyObject *C = PyObject_CallObject(pChanFunc, chanarg); PyDict_SetItemString(CS, j.name(), C); - Py_DECREF(pt); Py_DECREF(C); Py_DECREF(ptarg); Py_DECREF(chanarg); @@ -267,11 +370,19 @@ return dict_from_header(file->header()); } +static PyObject *isComplete(PyObject *self, PyObject *args) +{ + InputFile *file = &((InputFileC *)self)->i; + return PyBool_FromLong(file->isComplete()); +} + /* Method table */ static PyMethodDef InputFile_methods[] = { {"header", inheader, METH_VARARGS}, {"channel", (PyCFunction)channel, METH_KEYWORDS}, + {"channels", (PyCFunction)channels, METH_KEYWORDS}, {"close", inclose, METH_VARARGS}, + {"isComplete", isComplete, METH_VARARGS}, {NULL, NULL}, }; @@ -302,7 +413,7 @@ static PyTypeObject InputFile_Type = { PyObject_HEAD_INIT(&PyType_Type) 0, - "InputFile", + "OpenEXR.InputFile", sizeof(InputFileC), 0, (destructor)InputFile_dealloc, @@ -323,7 +434,7 @@ 0, - Py_TPFLAGS_CHECKTYPES, + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 0, 0, @@ -333,27 +444,27 @@ /* the rest are NULLs */ }; -PyObject *makeInputFile(PyObject *self, PyObject *args) +int makeInputFile(PyObject *self, PyObject *args, PyObject *kwds) { - InputFileC *object; + InputFileC *object = ((InputFileC *)self); char *filename; - if (!PyArg_ParseTuple(args, "s", &filename)) - return NULL; + if (!PyArg_ParseTuple(args, "s:InputFile", &filename)) + return -1; - object = PyObject_NEW(InputFileC, &InputFile_Type); - object->is_opened = 1; try { new(&object->i) InputFile(filename); } catch (const std::exception &e) { + // Py_DECREF(object); PyErr_SetString(PyExc_IOError, e.what()); - return NULL; + return -1; } + object->is_opened = 1; - return (PyObject *)object; + return 0; } @@ -375,8 +486,9 @@ Box2i dw = file->header().dataWindow(); int width = dw.max.x - dw.min.x + 1; int height = dw.max.y - dw.min.y + 1; - PyObject *pixeldata = PyTuple_GetItem(args, 0); - if (!PyArg_ParseTuple(args, "O|i", &pixeldata, &height)) + PyObject *pixeldata; + + if (!PyArg_ParseTuple(args, "O!|i:writePixels", &PyDict_Type, &pixeldata, &height)) return NULL; FrameBuffer frameBuffer; @@ -430,8 +542,8 @@ } catch (const std::exception &e) { - PyErr_SetString(PyExc_IOError, e.what()); - return NULL; + PyErr_SetString(PyExc_IOError, e.what()); + return NULL; } Py_RETURN_NONE; @@ -488,7 +600,7 @@ static PyTypeObject OutputFile_Type = { PyObject_HEAD_INIT(&PyType_Type) 0, - "OutputFile", + "OpenEXR.OutputFile", sizeof(OutputFileC), 0, (destructor)OutputFile_dealloc, @@ -509,7 +621,7 @@ 0, - Py_TPFLAGS_CHECKTYPES, + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 0, 0, @@ -519,16 +631,15 @@ /* the rest are NULLs */ }; -PyObject *makeOutputFile(PyObject *self, PyObject *args) +int makeOutputFile(PyObject *self, PyObject *args, PyObject *kwds) { char *filename; PyObject *header_dict; - if (!PyArg_ParseTuple(args, "sO", &filename, &header_dict)) - return NULL; + if (!PyArg_ParseTuple(args, "sO!:OutputFile", &filename, &PyDict_Type, &header_dict)) + return -1; - OutputFileC *object = PyObject_NEW(OutputFileC, &OutputFile_Type); - object->is_opened = 1; + OutputFileC *object = (OutputFileC *)self; Header header(64, 64); @@ -611,10 +722,11 @@ } catch (const std::exception &e) { - PyErr_SetString(PyExc_IOError, e.what()); - return NULL; + PyErr_SetString(PyExc_IOError, e.what()); + return -1; } - return (PyObject *)object; + object->is_opened = 1; + return 0; } //////////////////////////////////////////////////////////////////////// @@ -622,7 +734,7 @@ PyObject *makeHeader(PyObject *self, PyObject *args) { int w, h; - if (!PyArg_ParseTuple(args, "ii", &w, &h)) + if (!PyArg_ParseTuple(args, "ii:Header", &w, &h)) return NULL; Header header(w, h); header.channels().insert("R", Channel(FLOAT)); @@ -646,7 +758,7 @@ PyObject *_isOpenExrFile(PyObject *self, PyObject *args) { char *filename; - if (!PyArg_ParseTuple(args, "s", &filename)) + if (!PyArg_ParseTuple(args, "s:isOpenExrFile", &filename)) return NULL; return PyBool_FromLong(isOpenExrFile(filename)); } @@ -654,34 +766,43 @@ //////////////////////////////////////////////////////////////////////// static PyMethodDef methods[] = { - {"InputFile", makeInputFile, METH_VARARGS}, - {"OutputFile", makeOutputFile, METH_VARARGS}, - {"Header", makeHeader, METH_VARARGS}, - {"isOpenExrFile", _isOpenExrFile, METH_VARARGS}, - {NULL, NULL}, + {"Header", makeHeader, METH_VARARGS}, + {"isOpenExrFile", _isOpenExrFile, METH_VARARGS}, + {NULL, NULL}, }; extern "C" void initOpenEXR() { - PyObject *m, *d; + PyObject *m, *d, *item; Imf::staticInitialize(); m = Py_InitModule("OpenEXR", methods); d = PyModule_GetDict(m); - pModuleImath = PyImport_Import(PyString_FromString("Imath")); + pModuleImath = PyImport_Import(item= PyString_FromString("Imath")); Py_DECREF(item); /* initialize module variables/constants */ + InputFile_Type.tp_new = PyType_GenericNew; + InputFile_Type.tp_init = makeInputFile; + OutputFile_Type.tp_new = PyType_GenericNew; + OutputFile_Type.tp_init = makeOutputFile; + if (PyType_Ready(&InputFile_Type) != 0) + return; + if (PyType_Ready(&OutputFile_Type) != 0) + return; + PyModule_AddObject(m, "InputFile", (PyObject *)&InputFile_Type); + PyModule_AddObject(m, "OutputFile", (PyObject *)&OutputFile_Type); #if PYTHON_API_VERSION >= 1007 - OpenEXR_error = PyErr_NewException("OpenEXR.error", NULL, NULL); + OpenEXR_error = PyErr_NewException((char*)"OpenEXR.error", NULL, NULL); #else - OpenEXR_error = Py_BuildValue("s", "OpenEXR.error"); + OpenEXR_error = PyString_FromString("OpenEXR.error"); #endif PyDict_SetItemString(d, "error", OpenEXR_error); + Py_DECREF(OpenEXR_error); - PyDict_SetItemString(d, "UINT", PyLong_FromLong(UINT)); - PyDict_SetItemString(d, "HALF", PyLong_FromLong(HALF)); - PyDict_SetItemString(d, "FLOAT", PyLong_FromLong(FLOAT)); + PyDict_SetItemString(d, "UINT", item= PyLong_FromLong(UINT)); Py_DECREF(item); + PyDict_SetItemString(d, "HALF", item= PyLong_FromLong(HALF)); Py_DECREF(item); + PyDict_SetItemString(d, "FLOAT", item= PyLong_FromLong(FLOAT)); Py_DECREF(item); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/PKG-INFO new/OpenEXR-1.0.3/PKG-INFO --- old/OpenEXR-1.0/PKG-INFO 2009-05-26 05:33:00.000000000 +0200 +++ new/OpenEXR-1.0.3/PKG-INFO 2009-08-21 21:29:13.000000000 +0200 @@ -1,10 +1,10 @@ Metadata-Version: 1.0 Name: OpenEXR -Version: 1.0 -Summary: UNKNOWN +Version: 1.0.3 +Summary: Python bindings for ILM's OpenEXR image file format Home-page: http://excamera.com/articles/26/openexr.html Author: James Bowman Author-email: jamesb(a)excamera.com License: UNKNOWN -Description: UNKNOWN +Description: Python bindings for ILM's OpenEXR image file format Platform: UNKNOWN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/conf.py new/OpenEXR-1.0.3/conf.py --- old/OpenEXR-1.0/conf.py 2009-05-26 00:35:31.000000000 +0200 +++ new/OpenEXR-1.0.3/conf.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,194 +0,0 @@ -# -*- coding: utf-8 -*- -# -# OpenEXR documentation build configuration file, created by -# sphinx-quickstart on Mon May 25 12:12:47 2009. -# -# This file is execfile()d with the current directory set to its containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys, os - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.append(os.path.abspath('.')) - -# -- General configuration ----------------------------------------------------- - -# Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.doctest', 'sphinx.ext.autodoc'] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'Python OpenEXR' -copyright = u'2009, James Bowman' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '1.0' -# The full version, including alpha/beta/rc tags. -release = '1.0' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of documents that shouldn't be included in the build. -#unused_docs = [] - -# List of directories, relative to source directory, that shouldn't be searched -# for source files. -exclude_trees = ['_build'] - -# The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - - -# -- Options for HTML output --------------------------------------------------- - -# The theme to use for HTML and HTML Help pages. Major themes that come with -# Sphinx are currently 'default' and 'sphinxdoc'. -html_theme = 'default' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# "<project> v<release> documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_use_modindex = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a <link> tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = '' - -# Output file base name for HTML help builder. -htmlhelp_basename = 'OpenEXRdoc' - - -# -- Options for LaTeX output -------------------------------------------------- - -# The paper size ('letter' or 'a4'). -#latex_paper_size = 'letter' - -# The font size ('10pt', '11pt' or '12pt'). -#latex_font_size = '10pt' - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass [howto/manual]). -latex_documents = [ - ('index', 'OpenEXR.tex', u'OpenEXR Documentation', - u'James Bowman', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# Additional stuff for the LaTeX preamble. -#latex_preamble = '' - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_use_modindex = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/imath.rst new/OpenEXR-1.0.3/imath.rst --- old/OpenEXR-1.0/imath.rst 2009-05-26 00:33:28.000000000 +0200 +++ new/OpenEXR-1.0.3/imath.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -.. automodule:: Imath - :members: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/index.rst new/OpenEXR-1.0.3/index.rst --- old/OpenEXR-1.0/index.rst 2009-05-26 02:56:28.000000000 +0200 +++ new/OpenEXR-1.0.3/index.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -======================== -Python OpenEXR |version| -======================== - -.. toctree:: - :maxdepth: 2 - - intro - openexr - imath - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/intro.rst new/OpenEXR-1.0.3/intro.rst --- old/OpenEXR-1.0/intro.rst 2009-05-26 02:16:36.000000000 +0200 +++ new/OpenEXR-1.0.3/intro.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -Introduction -============ - -.. index:: ILM, Industrial Light & Magic, high dynamic range - -OpenEXR is an image format developed by ILM. Its main innovation is -support for high dynamic range: it supports floating point pixels. - -These modules provide Python bindings for the OpenEXR libraries: it -allows you to read and write OpenEXR files from Python. - -Note that this module only loads and stores images: it does not do -any image manipulation operations. For that you might want to use -one of: - -.. index:: PIL, NumPy, vop, OpenCV, HALF, UINT, FLOAT - -* Python's standard `array <http://docs.python.org/library/array.html>`_ module. You can access the raw data of FLOAT and UINT images. -* The `Python Imaging Library <http://www.pythonware.com/library/pil/handbook/index.htm>`_. This library supports a single FLOAT channel image format. -* `Numeric or NumPy <http://numpy.scipy.org/>`_. It's just math, so you will have to write your own imaging operations. Supports UINT and FLOAT formats. -* Module `vop <http://www.excamera.com/articles/25/vop.html>`_. NumPy subset, but faster. Supports FLOAT and HALF. -* `OpenCV <http://opencv.willowgarage.com/wiki/>`_. Supports multi channel UINT and FLOAT formats. - Files old/OpenEXR-1.0/lena.jpg and new/OpenEXR-1.0.3/lena.jpg differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/openexr.rst new/OpenEXR-1.0.3/openexr.rst --- old/OpenEXR-1.0/openexr.rst 2009-05-26 04:11:10.000000000 +0200 +++ new/OpenEXR-1.0.3/openexr.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,247 +0,0 @@ -:mod:`OpenEXR` --- Read and write EXR format images -=================================================== - -.. module:: OpenEXR - :synopsis: Read and write EXR format images - -Available Types ---------------- - -.. class:: InputFile - - A :class:`InputFile` object is used to read an EXR file. - - .. doctest:: - :options: -ELLIPSIS, +NORMALIZE_WHITESPACE - - >>> import OpenEXR - >>> print len(OpenEXR.InputFile("GoldenGate.exr").channel('R')), "bytes of red data" - 2170640 bytes of red data - - The following data items and methods are supported: - - .. method:: InputFile.header() - - Return the header of the open file. The header is a dictionary as described below. - - .. index:: scanline - - .. method:: channel(cname[, pixel_type[, scanLine1[, scanLine2]]]) -> string - - Read a channel from the OpenEXR image. *cname* is the name - of the channel in the image, for example "R". - This method reads the - channel data in the format specified by *pixel_type* (see - :class:`Imath.PixelType`), or the format of the data specified in the image itself by default. - If *scanLine1* and *scanLine2* are not supplied, then the method reads the - entire image. Note that this method returns the channel as a - Python string: the caller must then convert it to the appropriate - format as necessary. - - .. index:: destructor - - .. method:: close() - - Close the open file. Calling this method is mandantory, otherwise - the file will be incomplete. However, as a convenience, the - object's destructor calls this method, so any open files are - automatically closed at program exit. - - -.. class:: OutputFile(filename, header) - - Creates the EXR file *filename*, with given *header*. *header* - contains the image's properties and is a dict created by - :func:`Header`. - - .. doctest:: - - >>> import OpenEXR, array - >>> data = array.array('f', [ 1.0 ] * (640 * 480)).tostring() - >>> exr = OpenEXR.OutputFile("out.exr", OpenEXR.Header(640,480)) - >>> exr.writePixels({'R': data, 'G': data, 'B': data}) - - The following data items and methods are supported: - - .. index:: scanline - - .. method:: writePixels(dict, [scanlines]) - - Write the specified channels to the OpenEXR image. *dict* - specifies multiple channels. If *scanlines* is not specified, - then the entire image is assumed. dict specifies each channel's - data as channel:data, where channel and data are both strings. - This method uses the file's header - to determine the format of the data (FLOAT, HALF or UINT) for - each channel. If the string data is not of the appropriate size, - this method raises an exception. - - .. method:: currentScanLine() - - Return the current scan line being written. - - .. index:: destructor - - .. method:: close() - - Close the open file. This method may be called multiple times. - As a convenience, the object's destructor calls this method. - -Available Functions -------------------- -.. function:: isOpenExrFile(filename) -> bool - - Returns True if the *filename* exists, is readable, and contains a valid EXR image. - - .. doctest:: - - >>> import OpenEXR - >>> print OpenEXR.isOpenExrFile("no-such-file") - False - >>> print OpenEXR.isOpenExrFile("lena.jpg") - False - >>> print OpenEXR.isOpenExrFile("GoldenGate.exr") - True - -.. function:: Header(width, height) -> dict - - Convenience function that creates the EXR header for an image - of size *width* x *height* with EXR mandatory entries set to - appropriate defaults. An EXR header is a dictionary - - see :ref:`headers` for details of legal header contents. - - .. doctest:: - :options: -ELLIPSIS, +NORMALIZE_WHITESPACE - - >>> import OpenEXR - >>> print OpenEXR.Header(640,480) - {'compression': ZIP_COMPRESSION, - 'pixelAspectRatio': 1.0, - 'displayWindow': (0, 0) - (639, 479), - 'channels': {'R': FLOAT (1, 1), 'B': FLOAT (1, 1), 'G': FLOAT (1, 1)}, - 'dataWindow': (0, 0) - (639, 479), - 'screenWindowCenter': (0.0, 0.0), - 'screenWindowWidth': 1.0, - 'lineOrder': INCREASING_Y} - - -.. _headers: - -EXR header values ------------------ - -.. index:: - pair: header; values - -This module represents EXR headers as regular Python dictionaries. -In this dictionary the keys are strings, and the values are such -that OpenEXR can determine their type. The module Imath provides -many of the classes for attribute types. - - .. doctest:: - :options: -ELLIPSIS, +NORMALIZE_WHITESPACE - - >>> import OpenEXR - >>> print OpenEXR.InputFile("GoldenGate.exr").header() - {'tiles': None, - 'capDate': '2004:01:04 18:10:00', - 'compression': PIZ_COMPRESSION, - 'latitude': 37.827701568603516, - 'pixelAspectRatio': 1.0, - 'altitude': 274.5, - 'displayWindow': (0, 0) - (1261, 859), - 'focus': inf, - 'comments': 'View from Hawk Hill towards San Francisco', - 'screenWindowWidth': 1.1499999761581421, - 'channels': {'R': HALF (1, 1), 'B': HALF (1, 1), 'G': HALF (1, 1)}, - 'isoSpeed': 50.0, - 'utcOffset': 28800.0, - 'longitude': -122.49960327148438, - 'dataWindow': (0, 0) - (1261, 859), - 'screenWindowCenter': (0.0, 0.0), - 'aperture': 2.7999999523162842, - 'preview': <Imath.PreviewImage instance 100x68>, - 'owner': 'Copyright 2004 Industrial Light & Magic', - 'expTime': 8.0, - 'lineOrder': INCREASING_Y} - - Values in the dictionary may be: - -.. index:: - single: header; string - -string - - :: - - header['owner'] = 'Copyright 2007 James Bowman' - -.. index:: - single: header; float - -float - - :: - - header['isoSpeed'] = 50.0 - -.. index:: - single: header; int - -int - - :: - - header['version'] = 1001 - -.. index:: - single: header; dict - -dict - - A dict represents the image's channels. In the dict, the keys are the channel names, and the values are of class Imath.Channel:: - - header['channels'] = { 'L' : Imath.Channel(PixelType(OpenEXR.HALF)), - 'Z' : Imath.Channel(PixelType(OpenEXR.FLOAT))} - -:class:`Imath.Box2i` - - :: - - header['dataWindow'] = Imath.Box2i(Imath.point(0,0), Imath.point(640,480)) - -:class:`Imath.Box2f` - - :: - - header['regionOfInterest'] = Imath.Box2f(Imath.point(75.0,75.0), - Imath.point(100.0,100.0)) - - -:class:`Imath.V2f` - - :: - - header['originMarker'] = Imath.point(0.378, 0.878) - -:class:`Imath.LineOrder` - - :: - - header['lineOrder'] = Imath.LineOrder(Imath.LineOrder.INCREASING_Y) - -:class:`Imath.PreviewImage` - - A preview image, specified by height, width, and a string of length 4*width*height. The pixels are in RGBA order.:: - - header['preview'] = Imath.PreviewImage(320,200,pixels) - - or to use a `PIL <http://www.pythonware.com/products/pil/>`_ image as an EXR preview:: - - header['preview'] = Imath.PreviewImage(im.size[0], im.size[1], im.convert("RGBA").tostring()) - -:class:`Imath.Compression` - - :: - - header['Compression'] = Imath.Compression(Imath.Compression.PIZ_COMPRESSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/setup.py new/OpenEXR-1.0.3/setup.py --- old/OpenEXR-1.0/setup.py 2009-05-26 04:34:44.000000000 +0200 +++ new/OpenEXR-1.0.3/setup.py 2009-08-21 20:54:25.000000000 +0200 @@ -9,12 +9,18 @@ author = 'James Bowman', author_email = 'jamesb(a)excamera.com', url = 'http://excamera.com/articles/26/openexr.html', - version='1.0', + description = "Python bindings for ILM's OpenEXR image file format", + long_description = "Python bindings for ILM's OpenEXR image file format", + version='1.0.3', + data_files=['test-exr.py'], ext_modules=[ - Extension('OpenEXR', - ['OpenEXR.cpp'], - include_dirs=['/usr/include/OpenEXR', '/usr/local/include/OpenEXR'], - library_dirs=['/usr/local/lib'], - libraries=['Iex', 'Half', 'Imath', 'IlmImf', 'z'], - extra_compile_args=['-g']) - ], py_modules=['Imath'],) + Extension('OpenEXR', + ['OpenEXR.cpp'], + include_dirs=['/usr/include/OpenEXR', '/usr/local/include/OpenEXR'], + library_dirs=['/usr/local/lib'], + libraries=['Iex', 'Half', 'Imath', 'IlmImf', 'z'], + extra_compile_args=['-g']) + ], + py_modules=['Imath'], + # scripts=['test-exr.py'] +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/test-exr.py new/OpenEXR-1.0.3/test-exr.py --- old/OpenEXR-1.0/test-exr.py 1970-01-01 01:00:00.000000000 +0100 +++ new/OpenEXR-1.0.3/test-exr.py 2009-08-21 20:54:25.000000000 +0200 @@ -0,0 +1,130 @@ +import unittest +import random +import array + +import Imath +import OpenEXR + +class TestDirected(unittest.TestCase): + + def setUp(self): + self.FLOAT = Imath.PixelType(Imath.PixelType.FLOAT) + self.UINT = Imath.PixelType(Imath.PixelType.UINT) + self.HALF = Imath.PixelType(Imath.PixelType.HALF) + + def load_red(self, filename): + oexr = OpenEXR.InputFile(filename) + return oexr.channel('R') + + def test_write_chunk(self): + """ Write the pixels to two images, first as a single call, + then as multiple calls. Verify that the images are identical. + """ + for w,h,step in [(100, 10, 1), (64,48,6), (1, 100, 2), (640, 480, 4)]: + data = array.array('f', [ random.random() for x in range(w * h) ]).tostring() + + hdr = OpenEXR.Header(w,h) + x = OpenEXR.OutputFile("out0.exr", hdr) + x.writePixels({'R': data, 'G': data, 'B': data}) + x.close() + + hdr = OpenEXR.Header(w,h) + x = OpenEXR.OutputFile("out1.exr", hdr) + for y in range(0, h, step): + subdata = data[y * w * 4:(y+step) * w * 4] + x.writePixels({'R': subdata, 'G': subdata, 'B': subdata}, step) + x.close() + + oexr0 = self.load_red("out0.exr") + oexr1 = self.load_red("out1.exr") + self.assert_(oexr0 == oexr1) + + def test_fail(self): + self.assertRaises(IOError, lambda: OpenEXR.InputFile("non-existent")) + hdr = OpenEXR.Header(640, 480) + self.assertRaises(IOError, lambda: OpenEXR.OutputFile("/forbidden", hdr)) + + def test_channel_channels(self): + """ Check that the channel method and channels method return the same data """ + oexr = OpenEXR.InputFile("samples/openexr-images-1.5.0/ScanLines/MtTamWest.exr") + cl = sorted(oexr.header()['channels'].keys()) + a = [oexr.channel(c) for c in cl] + b = oexr.channels(cl) + self.assert_(a == b) + + def test_one(self): + oexr = OpenEXR.InputFile("samples/openexr-images-1.5.0/ScanLines/MtTamWest.exr") + for k,v in sorted(oexr.header().items()): + print "%20s: %s" % (k, v) + first_header = oexr.header() + + default_size = len(oexr.channel('R')) + half_size = len(oexr.channel('R', Imath.PixelType(Imath.PixelType.HALF))) + float_size = len(oexr.channel('R', Imath.PixelType(Imath.PixelType.FLOAT))) + uint_size = len(oexr.channel('R', Imath.PixelType(Imath.PixelType.UINT))) + + self.assert_(default_size in [ half_size, float_size, uint_size]) + self.assert_(float_size == uint_size) + self.assert_((float_size / 2) == half_size) + + self.assert_(len(oexr.channel('R', pixel_type = self.FLOAT, scanLine1 = 10, scanLine2 = 10)) == (4 * (first_header['dataWindow'].max.x + 1))) + + data = " " * (4 * 100 * 100) + h = OpenEXR.Header(100,100) + x = OpenEXR.OutputFile("out.exr", h) + x.writePixels({'R': data, 'G': data, 'B': data}) + x.close() + + def test_types(self): + for original in [ [0,0,0], range(10), range(100,200,3) ]: + for code,t in [ ('I', self.UINT), ('f', self.FLOAT) ]: + data = array.array(code, original).tostring() + hdr = OpenEXR.Header(len(original), 1) + hdr['channels'] = {'L': Imath.Channel(t)} + + x = OpenEXR.OutputFile("out.exr", hdr) + x.writePixels({'L': data}) + x.close() + + xin = OpenEXR.InputFile("out.exr") + # Implicit type + self.assert_(array.array(code, xin.channel('L')).tolist() == original) + # Explicit type + self.assert_(array.array(code, xin.channel('L', t)).tolist() == original) + # Explicit type as kwarg + self.assert_(array.array(code, xin.channel('L', pixel_type = t)).tolist() == original) + + def test_conversion(self): + """ Write an image as UINT, read as FLOAT. And the reverse. """ + codemap = { 'f': self.FLOAT, 'I': self.UINT } + original = [0, 1, 33, 79218] + for frm_code,to_code in [ ('f','I'), ('I','f') ]: + hdr = OpenEXR.Header(len(original), 1) + hdr['channels'] = {'L': Imath.Channel(codemap[frm_code])} + x = OpenEXR.OutputFile("out.exr", hdr) + x.writePixels({'L': array.array(frm_code, original).tostring()}) + x.close() + + xin = OpenEXR.InputFile("out.exr") + self.assert_(array.array(to_code, xin.channel('L', codemap[to_code])).tolist() == original) + + def test_leak(self): + hdr = OpenEXR.Header(10, 10) + data = array.array('f', [ 0.1 ] * (10 * 10)).tostring() + for i in range(1000): + x = OpenEXR.OutputFile("out.exr", hdr) + x.writePixels({'R': data, 'G': data, 'B': data}) + x.close() + return + + for i in range(1000): + oexr = OpenEXR.InputFile("out.exr") + h = oexr.header() + +if __name__ == '__main__': + if 1: + unittest.main() + else: + suite = unittest.TestSuite() + suite.addTest(TestDirected('test_one')) + unittest.TextTestRunner(verbosity=2).run(suite) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenEXR-1.0/test.py new/OpenEXR-1.0.3/test.py --- old/OpenEXR-1.0/test.py 2009-05-26 05:03:23.000000000 +0200 +++ new/OpenEXR-1.0.3/test.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,116 +0,0 @@ -import unittest -import Imath -import OpenEXR -import random -import array - -class TestDirected(unittest.TestCase): - - def setUp(self): - self.FLOAT = Imath.PixelType(Imath.PixelType.FLOAT) - self.UINT = Imath.PixelType(Imath.PixelType.UINT) - self.HALF = Imath.PixelType(Imath.PixelType.HALF) - - def load_red(self, filename): - oexr = OpenEXR.InputFile(filename) - return oexr.channel('R') - - def test_write_chunk(self): - """ Write the pixels to two images, first as a single call, - then as multiple calls. Verify that the images are identical. - """ - for w,h,step in [(100, 10, 1), (64,48,6), (1, 100, 2), (640, 480, 4)]: - data = array.array('f', [ random.random() for x in range(w * h) ]).tostring() - - hdr = OpenEXR.Header(w,h) - x = OpenEXR.OutputFile("out0.exr", hdr) - x.writePixels({'R': data, 'G': data, 'B': data}) - x.close() - - hdr = OpenEXR.Header(w,h) - x = OpenEXR.OutputFile("out1.exr", hdr) - for y in range(0, h, step): - subdata = data[y * w * 4:(y+step) * w * 4] - x.writePixels({'R': subdata, 'G': subdata, 'B': subdata}, step) - x.close() - - oexr0 = self.load_red("out0.exr") - oexr1 = self.load_red("out1.exr") - self.assert_(oexr0 == oexr1) - - def test_one(self): - oexr = OpenEXR.InputFile("MtTamWest.exr") - for k,v in sorted(oexr.header().items()): - print "%20s: %s" % (k, v) - first_header = oexr.header() - - default_size = len(oexr.channel('R')) - half_size = len(oexr.channel('R', Imath.PixelType(Imath.PixelType.HALF))) - float_size = len(oexr.channel('R', Imath.PixelType(Imath.PixelType.FLOAT))) - uint_size = len(oexr.channel('R', Imath.PixelType(Imath.PixelType.UINT))) - - self.assert_(default_size in [ half_size, float_size, uint_size]) - self.assert_(float_size == uint_size) - self.assert_((float_size / 2) == half_size) - - self.assert_(len(oexr.channel('R', pixel_type = self.FLOAT, scanLine1 = 10, scanLine2 = 10)) == (4 * (first_header['dataWindow'].max.x + 1))) - - data = " " * (4 * 100 * 100) - h = OpenEXR.Header(100,100) - x = OpenEXR.OutputFile("out.exr", h) - x.writePixels({'R': data, 'G': data, 'B': data}) - x.close() - - def test_types(self): - for original in [ [0,0,0], range(10), range(100,200,3) ]: - for code,t in [ ('I', self.UINT), ('f', self.FLOAT) ]: - data = array.array(code, original).tostring() - hdr = OpenEXR.Header(len(original), 1) - hdr['channels'] = {'L': Imath.Channel(t)} - - x = OpenEXR.OutputFile("out.exr", hdr) - x.writePixels({'L': data}) - x.close() - - xin = OpenEXR.InputFile("out.exr") - # Implicit type - self.assert_(array.array(code, xin.channel('L')).tolist() == original) - # Explicit type - self.assert_(array.array(code, xin.channel('L', t)).tolist() == original) - # Explicit type as kwarg - self.assert_(array.array(code, xin.channel('L', pixel_type = t)).tolist() == original) - - def test_conversion(self): - """ Write an image as UINT, read as FLOAT. And the reverse. """ - codemap = { 'f': self.FLOAT, 'I': self.UINT } - original = [0, 1, 33, 79218] - for frm_code,to_code in [ ('f','I'), ('I','f') ]: - hdr = OpenEXR.Header(len(original), 1) - hdr['channels'] = {'L': Imath.Channel(codemap[frm_code])} - x = OpenEXR.OutputFile("out.exr", hdr) - x.writePixels({'L': array.array(frm_code, original).tostring()}) - x.close() - - xin = OpenEXR.InputFile("out.exr") - self.assert_(array.array(to_code, xin.channel('L', codemap[to_code])).tolist() == original) - - def test_leak(self): - hdr = OpenEXR.Header(10, 10) - data = array.array('f', [ 0.1 ] * (10 * 10)).tostring() - for i in range(1000): - x = OpenEXR.OutputFile("out.exr", hdr) - x.writePixels({'R': data, 'G': data, 'B': data}) - x.close() - return - - for i in range(1000): - oexr = OpenEXR.InputFile("out.exr") - h = oexr.header() - -if __name__ == '__main__': - if 1: - unittest.main() - else: - suite = unittest.TestSuite() - suite.addTest(TestDirected('test_one')) - unittest.TextTestRunner(verbosity=2).run(suite) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit procps for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at Sat Aug 29 01:09:22 CEST 2009. -------- --- procps/procps.changes 2009-08-13 11:27:26.000000000 +0200 +++ procps/procps.changes 2009-08-24 13:37:28.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 19 14:45:52 CEST 2009 - werner(a)suse.de + +- Be aware that on XEN and VMware systems Div can become zero (bnc#529981) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- procps-3.2.6-xen.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.IRujUE/_old 2009-08-29 01:08:26.000000000 +0200 +++ /var/tmp/diff_new_pack.IRujUE/_new 2009-08-29 01:08:26.000000000 +0200 @@ -27,7 +27,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.8 -Release: 3 +Release: 4 Summary: ps utilities for /proc Provides: ps Obsoletes: ps @@ -61,6 +61,7 @@ Patch25: procps-3.2.7-cgroups_flag.diff Patch26: procps-3.2.8-pgrep_coption.dif Patch27: procps-3.2.7-terabyte.dif +Patch28: procps-3.2.6-xen.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -116,6 +117,7 @@ %patch25 -p1 %patch26 %patch27 +%patch28 %build make CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \ ++++++ procps-3.2.6-xen.dif ++++++ --- vmstat.c +++ vmstat.c 2009-08-19 12:37:57.000000000 +0000 @@ -184,7 +184,7 @@ static void new_format(void) { unsigned int intr[2], ctxt[2]; unsigned int sleep_half; unsigned long kb_per_page = sysconf(_SC_PAGESIZE) / 1024ul; - int debt = 0; // handle idle ticks running backwards + long long debt = 0; // handle idle ticks running backwards sleep_half=(sleep_time/2); new_header(); @@ -203,6 +203,8 @@ static void new_format(void) { dstl= *cpu_zzz; Div= duse+dsys+didl+diow+dstl; divo2= Div/2UL; + if (Div == 0) + Div++; printf(format, running, blocked, unitConvert(kb_swap_used), unitConvert(kb_main_free), @@ -242,16 +244,18 @@ static void new_format(void) { /* idle can run backwards for a moment -- kernel "feature" */ if(debt){ - didl = (int)didl + debt; - debt = 0; + didl = (long long)didl + debt; + debt = 0LL; } - if( (int)didl < 0 ){ - debt = (int)didl; - didl = 0; + if((long long)didl < 0){ + debt = (long long)didl; + didl = 0ULL; } Div= duse+dsys+didl+diow+dstl; divo2= Div/2UL; + if (Div == 0) + continue; printf(format, running, blocked, unitConvert(kb_swap_used),unitConvert(kb_main_free), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit poppler for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at Sat Aug 29 01:08:10 CEST 2009. -------- --- GNOME/poppler/poppler.changes 2009-08-03 14:57:49.000000000 +0200 +++ poppler/poppler.changes 2009-08-25 17:52:03.000000000 +0200 @@ -1,0 +2,26 @@ +Tue Aug 25 17:48:49 CEST 2009 - vuntz(a)novell.com + +- Update to version 0.11.3: + + core: + - Optimization in the Cairo renderer for some fonts + - Do not apply masks when fill color space mode is csPattern in + the Cairo renderer. fdo#22216 + - Check for overflow when parsing integers. fdo#23078 + - Do not save the font file twice for FreeType fonts in the + Cairo renderer. fdo#20491 + - Use current fill_opacity when drawing images in the Cairo renderer + - Fix alpha rendering in some files in the Splash renderer. + fdo#22143, fdo#22152 + - Implement tiling patterns in the Cairo renderer + - When converting a cm matrix to PS write 4 significant digits + for numbers < 1 not 4 decimals. fdo#23332 + - Fix changing of locale, now poppler no longer changes LC_NUMERIC to "C" + - Return PDF version as two integers instead of as a double + + Qt4: + - Addition of the Color Management API + - Small fix to documentation + - Fix backwards text search + + utils: + - Add the -png flag to pdftoppm to output to PNG + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- poppler-0.11.2.tar.bz2 New: ---- poppler-0.11.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.s21Y6B/_old 2009-08-29 01:06:34.000000000 +0200 +++ /var/tmp/diff_new_pack.s21Y6B/_new 2009-08-29 01:06:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package poppler (Version 0.11.2) +# spec file for package poppler (Version 0.11.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ BuildRequires: qt3-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel -Version: 0.11.2 +Version: 0.11.3 Release: 1 # Actual version of poppler-data: %define poppler_data_version 0.2.1 ++++++ poppler-0.11.2.tar.bz2 -> poppler-0.11.3.tar.bz2 ++++++ ++++ 3022 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit desktop-file-utils for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package desktop-file-utils for openSUSE:Factory checked in at Sat Aug 29 01:05:46 CEST 2009. -------- --- desktop-file-utils/desktop-file-utils.changes 2009-08-20 10:57:38.000000000 +0200 +++ desktop-file-utils/desktop-file-utils.changes 2009-08-20 10:58:32.000000000 +0200 @@ -6,0 +7,7 @@ +Mon Aug 17 10:57:18 CEST 2009 - vuntz(a)novell.com + +- Remove emacs-nox BuildRequires, and instead pass --with-lispdir + to configure to break a build loop. +- Update description. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-file-utils.spec ++++++ --- /var/tmp/diff_new_pack.BBWhMq/_old 2009-08-29 01:04:37.000000000 +0200 +++ /var/tmp/diff_new_pack.BBWhMq/_new 2009-08-29 01:04:37.000000000 +0200 @@ -19,11 +19,11 @@ Name: desktop-file-utils -BuildRequires: emacs-nox glib2-devel pkg-config +BuildRequires: glib2-devel pkg-config License: GPL v2 or later Group: Development/Tools/Other Version: 0.15 -Release: 83 +Release: 84 Source: %{name}-%{version}.tar.bz2 Source1: SuSEconfig.desktop-file-utils Patch: desktop-file-utils-suse-keys.patch @@ -34,25 +34,19 @@ Summary: Utilities for Manipulating Desktop Files %description -Desktop-file-utils contains a couple of command line utilities for -working with desktop entries. +This packages contains a couple of command line utilities for +working with desktop files. -Right now the only documentation is "desktop-file-install --help". -desktop-file-validate takes a single argument, the file to validate. - - - -Authors: --------- - Havoc Pennington <hp(a)redhat.com> - Alex Larsson <alexl(a)redhat.com> +More information about desktop files can be found at: +http://freedesktop.org/wiki/Specifications/desktop-entry-spec %prep %setup %patch %build -%configure +%configure \ + --with-lispdir=%{_datadir}/emacs/site-lisp make %{?jobs:-j%jobs} %install @@ -79,6 +73,9 @@ %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* +# Own directories to not require emacs installed. +%dir %{_datadir}/emacs +%dir %{_datadir}/emacs/site-lisp %{_datadir}/emacs/site-lisp/*.el* %ghost %{_datadir}/applications/mimeinfo.cache /sbin/conf.d/SuSEconfig.* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cntlm for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package cntlm for openSUSE:Factory checked in at Sat Aug 29 01:03:24 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ cntlm/cntlm.changes 2009-08-27 21:43:49.000000000 +0200 @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Thu Aug 27 21:30:59 CEST 2009 - chris(a)computersalat.de + +- spec mods + o replace check for existing user with getent + +------------------------------------------------------------------- +Sat Aug 22 12:58:32 CEST 2009 - chris(a)computersalat.de + +- cleanup spec + o removed ^#----- + +------------------------------------------------------------------- +Mon Jul 6 14:55:07 CEST 2009 - chris(a)computersalat.de + +- added missing rclink + +------------------------------------------------------------------- +Wed May 6 18:37:10 CEST 2009 - chris(a)computersalat.de + +- initial build for Version 0.35.1 + calling whatdependson for head-i586 New: ---- cntlm-0.35.1-Makefile.patch cntlm-0.35.1-config.patch cntlm-0.35.1.tar.bz2 cntlm.changes cntlm.init cntlm.spec cntlm.sysconfig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cntlm.spec ++++++ # # spec file for package cntlm (Version 0.35.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 Scorpio IT, Deidesheim, Germany # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: cntlm Summary: Fast NTLM authentication proxy with tunneling Version: 0.35.1 Release: 1 License: GNU GPL V2 Group: Productivity/Networking/Web/Proxy Url: http://cntlm.sourceforge.net/ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.sysconfig Patch: %{name}-0.35.1-config.patch Patch1: %{name}-0.35.1-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils grep %description Cntlm is a fast and efficient NTLM proxy, with support for TCP/IP tunneling, authenticated connection caching, ACLs, proper daemon logging and behaviour and much more. It has up to ten times faster responses than similar NTLM proxies, while using by orders or magnitude less RAM and CPU. Manual page contains detailed information. Contact: David Kubicek <dave(a)awk.cz> %prep %setup -q -n %{name}-%{version} %patch -p1 %patch1 -p1 %build ./configure %{__make} SYSCONFDIR=%{_sysconfdir} \ BINDIR=%{_sbindir} \ MANDIR=%{_mandir} %install %makeinstall SYSCONFDIR=$RPM_BUILD_ROOT/%{_sysconfdir} \ BINDIR=$RPM_BUILD_ROOT/%{_sbindir} \ MANDIR=$RPM_BUILD_ROOT/%{_mandir} %{__install} -d $RPM_BUILD_ROOT/var/run/%{name} %{__install} -D -m 755 %{S:1} $RPM_BUILD_ROOT/%{_initrddir}/%{name} %{__ln_s} -f ../..%{_sysconfdir}/init.d/%{name} ${RPM_BUILD_ROOT}/usr/sbin/rc%{name} %{__install} -D -m 644 %{S:2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name} %pre # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 # user cntlm if [ -z "`%{_bindir}/getent passwd "%{name}"`" ]; then %{_sbindir}/useradd -c "CNTLM Proxy Auth" -d /var/run/%{name} -g nogroup \ -r -s /bin/false %{name} 2>/dev/null; fi %preun # on `rpm -e` PARAM is 0 %stop_on_removal cntlm #if [ "$1" -eq 0 ]; then # %{_sbindir}/userdel %{name} 2>/dev/null #fi %post # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 %{fillup_and_insserv cntlm} %postun # on `rpm -e` PARAM is 0 %restart_on_update cntlm %{insserv_cleanup} %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYRIGHT LICENSE README VERSION %config(noreplace) %{_sysconfdir}/%{name}.conf %config(noreplace) %{_initrddir}/%{name} %{_sbindir}/* %{_mandir}/man1/%{name}.1* %dir %attr(755,%{name},root) /var/run/%{name} /var/adm/fillup-templates/sysconfig.%{name} %changelog ++++++ cntlm-0.35.1-Makefile.patch ++++++ diff -ruN cntlm-0.35.1-orig/Makefile cntlm-0.35.1/Makefile --- cntlm-0.35.1-orig/Makefile 2007-11-21 01:18:24.000000000 +0100 +++ cntlm-0.35.1/Makefile 2009-05-06 18:09:53.000000000 +0200 @@ -42,10 +42,10 @@ install -O root -G system -M 644 -f $(MANDIR)/man1 doc/$(NAME).1; \ install -O root -G system -M 600 -c $(SYSCONFDIR) doc/$(NAME).conf; \ else \ - install -D -o root -g root -m 755 -s $(NAME) $(BINDIR)/$(NAME); \ - install -D -o root -g root -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \ + install -D -m 755 -s $(NAME) $(BINDIR)/$(NAME); \ + install -D -m 644 doc/$(NAME).1 $(MANDIR)/man1/$(NAME).1; \ [ -f $(SYSCONFDIR)/$(NAME).conf -o -z "$(SYSCONFDIR)" ] \ - || install -D -o root -g root -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \ + || install -D -m 600 doc/$(NAME).conf $(SYSCONFDIR)/$(NAME).conf; \ fi @echo; echo "Cntlm will look for configuration in $(SYSCONFDIR)/$(NAME).conf" Dateien cntlm-0.35.1-orig/.Makefile.swp und cntlm-0.35.1/.Makefile.swp sind verschieden. ++++++ cntlm-0.35.1-config.patch ++++++ diff -ruN cntlm-0.35.1-orig/doc/cntlm.conf cntlm-0.35.1/doc/cntlm.conf --- cntlm-0.35.1-orig/doc/cntlm.conf 2007-11-02 02:07:11.000000000 +0100 +++ cntlm-0.35.1/doc/cntlm.conf 2009-05-06 16:49:22.000000000 +0200 @@ -7,8 +7,15 @@ Username testuser Domain corp-uk -Password password # Use hashes instead (-H) -#Workstation netbios_hostname # Should be auto-guessed +Password password +# Use hashes instead call "cntlm -H" +#PassLM 1AD35398BE6565DDB5C4EF70C0593492 +#PassNT 77B9081511704EE852F94227CF48A793 +### Only for user 'testuser', domain 'corp-uk' +#PassNTLMv2 D5826E9C665C37C80B53397D5C07BBCB + +### Should be auto-guessed +#Workstation netbios_hostname Proxy 10.217.112.41:8080 Proxy 10.217.112.42:8080 @@ -16,7 +23,12 @@ # # This is the port number where Cntlm will listen # -Listen 3128 +################################################## +# consider to change Listen Parameter in +# /etc/sysconfig/cntlm +# as a default 127.0.0.1:3128 is used +# but if defined here it takes precedence over sysconfig +#Listen 3128 # # If you wish to use the SOCKS5 proxy feature as well, uncomment ++++++ cntlm.init ++++++ #!/bin/sh # # Copyright (c) 2009 Scorpio IT, Deidesheim, Germany # # Author: Christian Wittmer # Please send feedback to rpm (at) scorpio-it (dot) net # # /etc/init.d/cntlm # and its symbolic link # /(usr/)sbin/rccntlm # ### BEGIN INIT INFO # Provides: cntlm # Required-Start: $syslog $network $time # Should-Start: $remote_fs # Required-Stop: $syslog $network $time # Should-Stop: $remote_fs # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: start/stop the cntlm proxy # Description: ntlm is meant to be given your proxy address and becomming # the primary proxy then, listening on a selected local port. # You point all your proxy-aware programs to it and don't ever # have to deal with proxy authentication again. ### END INIT INFO # # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) # # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance cntlm_bin="/usr/sbin/cntlm" test -x $cntlm_bin || { echo "$cntlm_bin not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed sysconfig file and read it cntlm_config="/etc/cntlm.conf" test -r $cntlm_config || { echo "$cntlm_config not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Check for existence of needed sysconfig file and read it cntlm_sysconfig="/etc/sysconfig/cntlm" test -r $cntlm_sysconfig || { echo "$cntlm_sysconfig not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $cntlm_sysconfig # some defaults cntlm_desc="CNTLM Authentication Proxy" cntlm_pid="/var/run/cntlm/cntlmd.pid" cntlm_lock="/var/lock/subsys/cntlm" cntlm_user="-U ${CNTLM_USER:=cntlm}" cntlm_opts=${CNTLM_OPTS:=""} # if no "Proxy" is set in cntlm.conf try '127.0.0.1:3128' as a default if [ `/bin/cat $cntlm_config | grep -e "^Listen" >/dev/null; echo $?` -eq 0 ]; then cntlm_listen= else cntlm_listen="-l ${CNTLM_LISTEN:=127.0.0.1:3128}" fi # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. # This is currently not used by UnitedLinux based distributions and # not needed for init scripts for UnitedLinux only. If it is used, # the functions from rc.status should not be sourced or used. #. /lib/lsb/init-functions # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) echo -n "Starting ${cntlm_desc}: " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. /sbin/startproc -p $cntlm_pid $cntlm_bin -P $cntlm_pid $cntlm_listen $cntlm_user $cntlm_opts &>/dev/null # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down ${cntlm_desc}: " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. /sbin/killproc -p $cntlm_pid -TERM $cntlm_bin &>/dev/null # Remember status and be verbose rc_status -v ;; try-restart|condrestart) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload|reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart the service if it ## is running. # cntlm does not support SIGHUP, so restart echo -n "Reload ${cntlm_desc}: " ## if it supports it: #/sbin/killproc -p $cntlm_pid -HUP $cntlm_bin # Remember status and be verbose #rc_status -v ## Otherwise: $0 try-restart # Remember status and be quiet rc_status ;; status) echo -n "Checking for ${cntlm_desc}: " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service up and running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running (unused) # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. /sbin/checkproc -p $cntlm_pid $cntlm_bin # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. # Remember status and be verbose rc_status -v ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" exit 1 ;; esac rc_exit ++++++ cntlm.sysconfig ++++++ ## Path: Productivity/Networking/Web/Proxy ## Description: Basic configuration of cntlm auth proxy ## Config: cntlm ## Type: string ## Default: "cntlm" # CNTLM_USER="" ## Type: string ## Default: "" # # -A <address>[/<net>] # New ACL allow rule. Address can be an IP or a hostname, net must be a number (CIDR notation) # -a ntlm | nt | lm # Authentication parameter - combined NTLM, just LM, or just NT. Default is to, # send both, NTLM. It is the most versatile setting and likely to work for you. # -B Enable NTLM-to-basic authentication. # -c <config_file> # Configuration file. Other arguments can be used as well, overriding # config file settings. # -D <address>[/<net>] # New ACL deny rule. Syntax same as -A. # -d <domain> # Domain/workgroup can be set separately. # -f Run in foreground, do not fork into daemon mode. # -F <flags> # NTLM authentication flags. # -G <pattern> # User-Agent matching for the trans-isa-scan plugin. # -g Gateway mode - listen on all interfaces, not only loopback. # -L [<saddr>:]<lport>:<rhost>:<rport> # Forwarding/tunneling a la OpenSSH. Same syntax - listen on lport # and forward all connections through the proxy to rhost:rport. # Can be used for direct tunneling without corkscrew, etc. # -O [<saddr>:]<lport> # Enable SOCKS5 proxy and make it listen on the specified port (and address). # -p <password> # Account password. Will not be visible in "ps", /proc, etc. # -r "HeaderName: value" # Add a header substitution. All such headers will be added/replaced # in the client's requests. # -S <size_in_kb> # Enable transparent handler of ISA AV scanner plugin for files up to size_in_kb KiB. # -s Do not use threads, serialize all requests - for debugging only. # -U <uid> # Run as uid. It is an important security measure not to run as root. # -u <user>[@<domain] # Domain/workgroup can be set separately. # -v Print debugging information. # -w <workstation> # Some proxies require correct NetBIOS hostname. # CNTLM_OPTS="" ## Type: string ## Default: "127.0.0.1:3128" if not set in cntlm.conf # # -l [<saddr>:]<lport> # Main listening port for the NTLM proxy. # CNTLM_LISTEN="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hyena for openSUSE:Factory
by root＠Hilbert.suse.de 28 Aug '09

28 Aug '09

Hello community, here is the log from the commit of package hyena for openSUSE:Factory checked in at Sat Aug 29 01:01:11 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ hyena/hyena.changes 2009-08-18 23:48:06.000000000 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 18 14:44:51 PDT 2009 - gburt(a)suse.de + +- Version 0.1 + +------------------------------------------------------------------- +Thu Aug 13 12:47:52 PDT 2009 - gburt(a)suse.de + +- Initial release + calling whatdependson for head-i586 New: ---- hyena-0.1.tar.bz2 hyena.changes hyena.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyena.spec ++++++ # # spec file for package hyena (Version 0.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: hyena License: MIT License (or similar) Group: Development/Libraries/GNOME Version: 0.1 Release: 1 Summary: Library for .NET applications Url: http://banshee-project.org/ Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glib-sharp2 BuildRequires: gtk-sharp2 BuildRequires: mono-basic BuildRequires: mono-devel BuildRequires: mono-nunit BuildRequires: perl-XML-Parser BuildRequires: autoconf automake libtool make pkgconfig Requires: mono Requires: mono-core Requires: gtk-sharp2 AutoReqProv: on %description Hyena is a .NET library that powers Banshee and PDF Mod, among others. Authors: -------- Aaron Bockover <abockover(a)novell.com> Gabriel Burt <gabriel.burt(a)gmail.com> %prep %setup %build %configure make %install %makeinstall #%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) #%doc AUTHORS NEWS README COPYING %{_libdir}/%{name} %{_libdir}/pkgconfig/*.pc #%files lang -f %{name}.lang %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0