September 2013 - openSUSE Commits - openSUSE Mailing Lists

commit python-kombu for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package python-kombu for openSUSE:Factory checked in at 2013-09-03 22:03:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kombu (Old) and /work/SRC/openSUSE:Factory/.python-kombu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-kombu" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kombu/python-kombu.changes 2013-08-13 13:21:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-kombu.new/python-kombu.changes 2013-09-03 22:03:27.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 3 08:08:47 UTC 2013 - dmueller(a)suse.com + +- update to 2.5.14: + * safe_str did not work properly resulting in UnicodeDecodeError + * Now depends on amqp 1.0.13 + * Fixed typo in Django functional tests. + * Tests no longer depends on distribute, which was deprecated + and merged back into setuptools. + +------------------------------------------------------------------- @@ -4 +14 @@ -- update to 1.0.12: +- update to 2.5.12: Old: ---- kombu-2.5.12.tar.gz New: ---- kombu-2.5.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kombu.spec ++++++ --- /var/tmp/diff_new_pack.fjUF4w/_old 2013-09-03 22:03:28.000000000 +0200 +++ /var/tmp/diff_new_pack.fjUF4w/_new 2013-09-03 22:03:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-kombu -Version: 2.5.12 +Version: 2.5.14 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause @@ -72,7 +72,7 @@ # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py # NOTE(saschpe): We have a newer python-amqp, but this shouldn't be an issue: -sed -i -e "s|amqp>=1.0.12,<1.1.0|amqp>=1.0.12|" requirements/default.txt kombu.egg-info/requires.txt +sed -i -e "s|amqp>=1.0.13,<1.1.0|amqp>=1.0.13|" requirements/default.txt kombu.egg-info/requires.txt # NOTE(saschpe): Testsuite requires mkgpack-python < 0.2.0 because it dropped # Python-2.5 support. This makes no sense for us, thus: #sed -i "s/msgpack-python.*/msgpack-python/" requirements/test.txt ++++++ kombu-2.5.12.tar.gz -> kombu-2.5.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/AUTHORS new/kombu-2.5.14/AUTHORS --- old/kombu-2.5.12/AUTHORS 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/AUTHORS 2013-08-23 17:09:28.000000000 +0200 @@ -20,6 +20,7 @@ Christophe Chauvet <christophe.chauvet(a)gmail.com> Christopher Grebs <cg(a)webshox.org> Clay Gerrard <clay.gerrard(a)gmail.com> +Corentin Ardeois <cardeois(a)iweb.com> Dan LaMotte <lamotte85(a)gmail.com> Dan McGee <dan(a)archlinux.org> Dane Guempel <daneguempel(a)gmail.com> @@ -31,7 +32,7 @@ Flavio [FlaPer87] Percoco Premoli <flaper87(a)flaper87.org> Florian Munz <surf(a)theflow.de> Franck Cuny <fcuny(a)saymedia.com> -German M. Bravo <german.mb(a)deipi.com> +Germán M. Bravo <german.mb(a)gmail.com> Gregory Haskins <greg(a)greghaskins.com> Hong Minhee <minhee(a)dahlia.kr> Ian Eure <ian.eure(a)gmail.com> @@ -69,6 +70,7 @@ Rumyana Neykova <rumi.neykova(a)gmail.com> Rune Halvorsen <runeh(a)opera.com> Ryan Petrello <lists(a)ryanpetrello.com> +Sascha Peilicke <saschpe(a)gmx.de> Scott Lyons <scottalyons(a)gmail.com> Sean Bleier <sebleier(a)gmail.com> Sean Creeley <sean.creeley(a)gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/Changelog new/kombu-2.5.14/Changelog --- old/kombu-2.5.12/Changelog 2013-06-28 16:26:59.000000000 +0200 +++ new/kombu-2.5.14/Changelog 2013-08-23 18:05:37.000000000 +0200 @@ -4,6 +4,41 @@ Change history ================ +.. _version-2.5.14: + +2.5.14 +====== +:release-date: 2014-08-23 17:00 P.M BST + +- safe_str did not work properly resulting in + :exc:`UnicodeDecodeError` (Issue #248). + +.. _version-2.5.13: + +2.5.13 +====== +:release-date: 2013-08-16 16:00 P.M BST + +- Now depends on :mod:`amqp` 1.0.13 + +- Fixed typo in Django functional tests. + +- safe_str now returns Unicode in Python 2.x + + Fix contributed by Germán M. Bravo. + +- amqp: Transport options are now merged with arguments + supplied to the connection. + +- Tests no longer depends on distribute, which was deprecated + and merged back into setuptools. + + Fix contributed by Sascha Peilicke. + +- ConsumerMixin now also restarts on channel related errors. + + Fix contributed by Corentin Ardeois. + .. _version-2.5.12: 2.5.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/PKG-INFO new/kombu-2.5.14/PKG-INFO --- old/kombu-2.5.12/PKG-INFO 2013-06-28 16:28:18.000000000 +0200 +++ new/kombu-2.5.14/PKG-INFO 2013-08-23 18:08:32.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kombu -Version: 2.5.12 +Version: 2.5.14 Summary: Messaging Framework for Python Home-page: http://kombu.readthedocs.org Author: Ask Solem @@ -12,7 +12,7 @@ kombu - Messaging Framework for Python ======================================== - :Version: 2.5.12 + :Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/README new/kombu-2.5.14/README --- old/kombu-2.5.12/README 2013-06-28 16:27:11.000000000 +0200 +++ new/kombu-2.5.14/README 2013-08-23 17:10:06.000000000 +0200 @@ -4,7 +4,7 @@ kombu - Messaging Framework for Python ======================================== -:Version: 2.5.12 +:Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/README.rst new/kombu-2.5.14/README.rst --- old/kombu-2.5.12/README.rst 2013-06-28 16:27:11.000000000 +0200 +++ new/kombu-2.5.14/README.rst 2013-08-23 17:10:06.000000000 +0200 @@ -4,7 +4,7 @@ kombu - Messaging Framework for Python ======================================== -:Version: 2.5.12 +:Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/docs/changelog.rst new/kombu-2.5.14/docs/changelog.rst --- old/kombu-2.5.12/docs/changelog.rst 2013-06-28 16:26:59.000000000 +0200 +++ new/kombu-2.5.14/docs/changelog.rst 2013-08-23 18:05:37.000000000 +0200 @@ -4,6 +4,41 @@ Change history ================ +.. _version-2.5.14: + +2.5.14 +====== +:release-date: 2014-08-23 17:00 P.M BST + +- safe_str did not work properly resulting in + :exc:`UnicodeDecodeError` (Issue #248). + +.. _version-2.5.13: + +2.5.13 +====== +:release-date: 2013-08-16 16:00 P.M BST + +- Now depends on :mod:`amqp` 1.0.13 + +- Fixed typo in Django functional tests. + +- safe_str now returns Unicode in Python 2.x + + Fix contributed by Germán M. Bravo. + +- amqp: Transport options are now merged with arguments + supplied to the connection. + +- Tests no longer depends on distribute, which was deprecated + and merged back into setuptools. + + Fix contributed by Sascha Peilicke. + +- ConsumerMixin now also restarts on channel related errors. + + Fix contributed by Corentin Ardeois. + .. _version-2.5.12: 2.5.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/docs/introduction.rst new/kombu-2.5.14/docs/introduction.rst --- old/kombu-2.5.12/docs/introduction.rst 2013-06-28 16:27:11.000000000 +0200 +++ new/kombu-2.5.14/docs/introduction.rst 2013-08-23 17:10:06.000000000 +0200 @@ -4,7 +4,7 @@ kombu - Messaging Framework for Python ======================================== -:Version: 2.5.12 +:Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/docs/reference/kombu.rst new/kombu-2.5.14/docs/reference/kombu.rst --- old/kombu-2.5.12/docs/reference/kombu.rst 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/docs/reference/kombu.rst 2013-08-23 17:09:28.000000000 +0200 @@ -128,7 +128,7 @@ .. code-block:: python - >>> bound_sicence_news.declare() + >>> bound_science_news.declare() >>> bound_science_news.purge() >>> bound_science_news.delete() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/funtests/tests/test_django.py new/kombu-2.5.14/funtests/tests/test_django.py --- old/kombu-2.5.12/funtests/tests/test_django.py 2013-06-25 12:23:18.000000000 +0200 +++ new/kombu-2.5.14/funtests/tests/test_django.py 2013-08-16 16:39:53.000000000 +0200 @@ -29,7 +29,7 @@ 'NAME': ':memory:', }, }, - INSTALLED_APPS=('kombu.transports.django', ), + INSTALLED_APPS=('kombu.transport.django', ), ) from django.core.management import call_command call_command('syncdb') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/__init__.py new/kombu-2.5.14/kombu/__init__.py --- old/kombu-2.5.12/kombu/__init__.py 2013-06-28 16:27:11.000000000 +0200 +++ new/kombu-2.5.14/kombu/__init__.py 2013-08-23 17:09:56.000000000 +0200 @@ -1,7 +1,7 @@ """Messaging Framework for Python""" from __future__ import absolute_import -VERSION = (2, 5, 12) +VERSION = (2, 5, 14) __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:]) __author__ = 'Ask Solem' __contact__ = 'ask(a)celeryproject.org' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/mixins.py new/kombu-2.5.14/kombu/mixins.py --- old/kombu-2.5.12/kombu/mixins.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/mixins.py 2013-08-23 17:09:28.000000000 +0200 @@ -13,6 +13,7 @@ from contextlib import contextmanager from functools import partial from itertools import count +from time import sleep from .common import ignore_errors from .messaging import Consumer @@ -158,13 +159,18 @@ def extra_context(self, connection, channel): yield - def run(self): + def run(self, _tokens=1): + restart_limit = self.restart_limit + errors = (self.connection.connection_errors + + self.connection.channel_errors) while not self.should_stop: try: - if self.restart_limit.can_consume(1): + if restart_limit.can_consume(_tokens): for _ in self.consume(limit=None): pass - except self.connection.connection_errors: + else: + sleep(restart_limit.expected_time(_tokens)) + except errors: warn('Connection to broker lost. ' 'Trying to re-establish the connection...') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/tests/test_serialization.py new/kombu-2.5.14/kombu/tests/test_serialization.py --- old/kombu-2.5.12/kombu/tests/test_serialization.py 2013-06-28 16:24:56.000000000 +0200 +++ new/kombu-2.5.14/kombu/tests/test_serialization.py 2013-08-23 17:09:28.000000000 +0200 @@ -55,8 +55,6 @@ msgpack_py_data = dict(py_data) -# msgpack only supports tuples -msgpack_py_data['list'] = tuple(msgpack_py_data['list']) # Unicode chars are lost in transmit :( msgpack_py_data['unicode'] = 'Th quick brown fox jumps over th lazy dog' msgpack_data = b64decode("""\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/tests/utilities/test_encoding.py new/kombu-2.5.14/kombu/tests/utilities/test_encoding.py --- old/kombu-2.5.12/kombu/tests/utilities/test_encoding.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/tests/utilities/test_encoding.py 2013-08-23 18:04:17.000000000 +0200 @@ -8,7 +8,7 @@ from mock import patch from nose import SkipTest -from kombu.utils.encoding import safe_str +from kombu.utils.encoding import bytes_t, safe_str, default_encoding from kombu.tests.utils import TestCase @@ -26,16 +26,16 @@ class test_default_encoding(TestCase): - @patch('sys.getfilesystemencoding') - def test_default(self, getfilesystemencoding): - getfilesystemencoding.return_value = 'ascii' + @patch('sys.getdefaultencoding') + def test_default(self, getdefaultencoding): + getdefaultencoding.return_value = 'ascii' with clean_encoding() as encoding: enc = encoding.default_encoding() if sys.platform.startswith('java'): self.assertEqual(enc, 'utf-8') else: self.assertEqual(enc, 'ascii') - getfilesystemencoding.assert_called_with() + getdefaultencoding.assert_called_with() class test_encoding_utils(TestCase): @@ -60,16 +60,36 @@ class test_safe_str(TestCase): - def test_when_str(self): + def setUp(self): + self._cencoding = patch('sys.getdefaultencoding') + self._encoding = self._cencoding.__enter__() + self._encoding.return_value = 'ascii' + + def tearDown(self): + self._cencoding.__exit__() + + def test_when_bytes(self): self.assertEqual(safe_str('foo'), 'foo') def test_when_unicode(self): - self.assertIsInstance(safe_str(u'foo'), str) + self.assertIsInstance(safe_str(u'foo'), bytes_t) + + def test_when_encoding_utf8(self): + with patch('sys.getdefaultencoding') as encoding: + encoding.return_value = 'utf-8' + self.assertEqual(default_encoding(), 'utf-8') + s = u'The quiæk fåx jømps øver the lazy dåg' + res = safe_str(s) + self.assertIsInstance(res, bytes_t) + self.assertGreater(len(res), len(s)) def test_when_containing_high_chars(self): - s = u'The quiæk fåx jømps øver the lazy dåg' - res = safe_str(s) - self.assertIsInstance(res, str) + with patch('sys.getdefaultencoding') as encoding: + encoding.return_value = 'ascii' + s = u'The quiæk fåx jømps øver the lazy dåg' + res = safe_str(s) + self.assertIsInstance(res, bytes_t) + self.assertEqual(len(s), len(res)) def test_when_not_string(self): o = object() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/transport/librabbitmq.py new/kombu-2.5.14/kombu/transport/librabbitmq.py --- old/kombu-2.5.12/kombu/transport/librabbitmq.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/transport/librabbitmq.py 2013-08-23 17:09:28.000000000 +0200 @@ -105,15 +105,17 @@ setattr(conninfo, name, default_value) if conninfo.ssl: raise NotImplementedError(NO_SSL_ERROR) - conn = self.Connection(host=conninfo.host, - userid=conninfo.userid, - password=conninfo.password, - virtual_host=conninfo.virtual_host, - login_method=conninfo.login_method, - insist=conninfo.insist, - ssl=conninfo.ssl, - connect_timeout=conninfo.connect_timeout, - **conninfo.transport_options or {}) + opts = dict({ + 'host': conninfo.host, + 'userid': conninfo.userid, + 'password': conninfo.password, + 'virtual_host': conninfo.virtual_host, + 'login_method': conninfo.login_method, + 'insist': conninfo.insist, + 'ssl': conninfo.ssl, + 'connect_timeout': conninfo.connect_timeout, + }, **conninfo.transport_options or {}) + conn = self.Connection(**opts) conn.client = self.client self.client.drain_events = conn.drain_events return conn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/transport/pyamqp.py new/kombu-2.5.14/kombu/transport/pyamqp.py --- old/kombu-2.5.12/kombu/transport/pyamqp.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/transport/pyamqp.py 2013-08-23 17:09:28.000000000 +0200 @@ -75,14 +75,17 @@ channel_errors = (StdChannelError, ) + amqp.Connection.channel_errors nb_keep_draining = True - driver_name = "py-amqp" - driver_type = "amqp" + driver_name = 'py-amqp' + driver_type = 'amqp' supports_heartbeats = True supports_ev = True def __init__(self, client, **kwargs): self.client = client - self.default_port = kwargs.get("default_port") or self.default_port + self.default_port = kwargs.get('default_port') or self.default_port + + def driver_version(self): + return amqp.__version__ def create_channel(self, connection): return connection.channel() @@ -98,16 +101,18 @@ setattr(conninfo, name, default_value) if conninfo.hostname == 'localhost': conninfo.hostname = '127.0.0.1' - conn = self.Connection(host=conninfo.host, - userid=conninfo.userid, - password=conninfo.password, - login_method=conninfo.login_method, - virtual_host=conninfo.virtual_host, - insist=conninfo.insist, - ssl=conninfo.ssl, - connect_timeout=conninfo.connect_timeout, - heartbeat=conninfo.heartbeat, - **conninfo.transport_options or {}) + opts = dict({ + 'host': conninfo.host, + 'userid': conninfo.userid, + 'password': conninfo.password, + 'login_method': conninfo.login_method, + 'virtual_host': conninfo.virtual_host, + 'insist': conninfo.insist, + 'ssl': conninfo.ssl, + 'connect_timeout': conninfo.connect_timeout, + 'heartbeat': conninfo.heartbeat, + }, **conninfo.transport_options or {}) + conn = self.Connection(**opts) conn.client = self.client return conn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/utils/encoding.py new/kombu-2.5.14/kombu/utils/encoding.py --- old/kombu-2.5.12/kombu/utils/encoding.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/utils/encoding.py 2013-08-23 18:03:52.000000000 +0200 @@ -22,7 +22,7 @@ else: def default_encoding(): # noqa - return sys.getfilesystemencoding() + return sys.getdefaultencoding() if is_py3k: # pragma: no cover diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu.egg-info/PKG-INFO new/kombu-2.5.14/kombu.egg-info/PKG-INFO --- old/kombu-2.5.12/kombu.egg-info/PKG-INFO 2013-06-28 16:28:05.000000000 +0200 +++ new/kombu-2.5.14/kombu.egg-info/PKG-INFO 2013-08-23 18:08:25.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kombu -Version: 2.5.12 +Version: 2.5.14 Summary: Messaging Framework for Python Home-page: http://kombu.readthedocs.org Author: Ask Solem @@ -12,7 +12,7 @@ kombu - Messaging Framework for Python ======================================== - :Version: 2.5.12 + :Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu.egg-info/requires.txt new/kombu-2.5.14/kombu.egg-info/requires.txt --- old/kombu-2.5.12/kombu.egg-info/requires.txt 2013-06-28 16:28:05.000000000 +0200 +++ new/kombu-2.5.14/kombu.egg-info/requires.txt 2013-08-23 18:08:25.000000000 +0200 @@ -1,2 +1,2 @@ anyjson>=0.3.3 -amqp>=1.0.12,<1.1.0 \ No newline at end of file +amqp>=1.0.13,<1.1.0 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/requirements/default.txt new/kombu-2.5.14/requirements/default.txt --- old/kombu-2.5.12/requirements/default.txt 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/requirements/default.txt 2013-08-23 17:09:28.000000000 +0200 @@ -1,2 +1,2 @@ anyjson>=0.3.3 -amqp>=1.0.12,<1.1.0 +amqp>=1.0.13,<1.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/requirements/test-py3k.txt new/kombu-2.5.14/requirements/test-py3k.txt --- old/kombu-2.5.12/requirements/test-py3k.txt 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/requirements/test-py3k.txt 2013-08-23 17:09:28.000000000 +0200 @@ -1,4 +1,4 @@ -distribute +setuptools>=0.7 nose nose-cover3 mock>=0.7.0 -- 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-Jinja2 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package python-Jinja2 for openSUSE:Factory checked in at 2013-09-03 22:03:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Jinja2 (Old) and /work/SRC/openSUSE:Factory/.python-Jinja2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Jinja2" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Jinja2/python-Jinja2.changes 2013-08-15 12:29:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Jinja2.new/python-Jinja2.changes 2013-09-03 22:03:22.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 2 15:03:25 UTC 2013 - speilicke(a)suse.com + +- Avoid "Recommends:" on old rpm distros + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Jinja2.spec ++++++ --- /var/tmp/diff_new_pack.WF8LyH/_old 2013-09-03 22:03:23.000000000 +0200 +++ /var/tmp/diff_new_pack.WF8LyH/_new 2013-09-03 22:03:23.000000000 +0200 @@ -58,7 +58,9 @@ License: BSD-3-Clause Group: Productivity/Text/Editors Requires: %{name} = %{version} +%if 0%{?suse_version} >= 1010 Recommends: vim +%endif %description vim Vim syntax highlighting scheme for Jinja2 templates. @@ -68,7 +70,9 @@ License: GPL-2.0+ Group: Productivity/Text/Editors Requires: %{name} = %{version} +%if 0%{?suse_version} >= 1010 Recommends: emacs +%endif %description emacs Emacs syntax highlighting scheme for Jinja2 templates. -- 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-google-apputils for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package python-google-apputils for openSUSE:Factory checked in at 2013-09-03 22:03:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-google-apputils (Old) and /work/SRC/openSUSE:Factory/.python-google-apputils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-google-apputils" Changes: -------- New Changes file: --- /dev/null 2013-07-23 23:44:04.804033756 +0200 +++ /work/SRC/openSUSE:Factory/.python-google-apputils.new/python-google-apputils.changes 2013-09-03 22:03:20.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Tue Aug 20 18:41:43 UTC 2013 - rschweikert(a)suse.com + +- Initial build + New: ---- apputils_stripShebang.patch google-apputils-0.4.0.tar.gz python-google-apputils.changes python-google-apputils.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-google-apputils.spec ++++++ # # spec file for package google-apputils # # Copyright (c) 2013 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/ # Name: python-google-apputils Version: 0.4.0 Release: 0 Summary: Python application utilities License: Apache-2.0 Group: Development/Languages/Python URL: http://code.google.com/p/google-apputils-python Source0: google-apputils-%{version}.tar.gz Patch0: apputils_stripShebang.patch BuildRequires: python BuildRequires: python-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description This project is a small collection of utilities for building Python applications. It includes some of the same set of utilities used to build and run internal Python apps at Google. Features: + Simple application startup integrated with python-gflags. + Subcommands for command-line applications. + Option to drop into pdb on uncaught exceptions. + Helper functions for dealing with files. + High-level profiling tools. + Timezone-aware wrappers for datetime.datetime classes. + Improved TestCase with many of the same methods as unittest2, plus helpful flags for test startup. + google_test setuptools command for running tests. + Helper module for creating application stubs. %prep %setup -q -n google-apputils-%{version} %patch0 -p1 %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %doc LICENSE README %{python_sitelib}/* %changelog ++++++ apputils_stripShebang.patch ++++++ Index: google-apputils-0.4.0/google/apputils/__init__.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/__init__.py +++ google-apputils-0.4.0/google/apputils/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python try: import pkg_resources pkg_resources.declare_namespace(__name__) Index: google-apputils-0.4.0/google/apputils/app.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/app.py +++ google-apputils-0.4.0/google/apputils/app.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2003 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); Index: google-apputils-0.4.0/google/apputils/basetest.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/basetest.py +++ google-apputils-0.4.0/google/apputils/basetest.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2010 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); Index: google-apputils-0.4.0/google/apputils/datelib.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/datelib.py +++ google-apputils-0.4.0/google/apputils/datelib.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2002 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); Index: google-apputils-0.4.0/google/apputils/debug.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/debug.py +++ google-apputils-0.4.0/google/apputils/debug.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2004 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); Index: google-apputils-0.4.0/google/apputils/file_util.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/file_util.py +++ google-apputils-0.4.0/google/apputils/file_util.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2007 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); Index: google-apputils-0.4.0/google/apputils/humanize.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/humanize.py +++ google-apputils-0.4.0/google/apputils/humanize.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # Copyright 2008 Google Inc. All Rights Reserved. Index: google-apputils-0.4.0/google/apputils/resources.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/resources.py +++ google-apputils-0.4.0/google/apputils/resources.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2010 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); Index: google-apputils-0.4.0/google/apputils/run_script_module.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/run_script_module.py +++ google-apputils-0.4.0/google/apputils/run_script_module.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2010 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); Index: google-apputils-0.4.0/google/apputils/setup_command.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/setup_command.py +++ google-apputils-0.4.0/google/apputils/setup_command.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2010 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); Index: google-apputils-0.4.0/google/apputils/shellutil.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/shellutil.py +++ google-apputils-0.4.0/google/apputils/shellutil.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # This code must be source compatible with Python 2.4 through 3.3. # # Copyright 2003 Google Inc. All Rights Reserved. Index: google-apputils-0.4.0/google/apputils/stopwatch.py =================================================================== --- google-apputils-0.4.0.orig/google/apputils/stopwatch.py +++ google-apputils-0.4.0/google/apputils/stopwatch.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright 2005 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); -- 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-cmd2 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package python-cmd2 for openSUSE:Factory checked in at 2013-09-03 22:03:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cmd2 (Old) and /work/SRC/openSUSE:Factory/.python-cmd2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cmd2" Changes: -------- --- /work/SRC/openSUSE:Factory/python-cmd2/python-cmd2.changes 2013-08-15 12:29:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-cmd2.new/python-cmd2.changes 2013-09-03 22:03:02.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 3 08:04:14 UTC 2013 - dmueller(a)suse.com + +- update to 0.6.6.1: + * go back to pyparsing 1.5.7 + +------------------------------------------------------------------- Old: ---- cmd2-0.6.6.tar.gz New: ---- cmd2-0.6.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cmd2.spec ++++++ --- /var/tmp/diff_new_pack.n7tOFh/_old 2013-09-03 22:03:03.000000000 +0200 +++ /var/tmp/diff_new_pack.n7tOFh/_new 2013-09-03 22:03:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-cmd2 -Version: 0.6.6 +Version: 0.6.6.1 Release: 0 Summary: Extra features for standard library's cmd module License: MIT @@ -25,7 +25,7 @@ Url: http://packages.python.org/cmd2/ Source: http://pypi.python.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz BuildRequires: python-devel -Requires: python-pyparsing +Requires: python-pyparsing == 1.5.7 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} ++++++ cmd2-0.6.6.tar.gz -> cmd2-0.6.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmd2-0.6.6/PKG-INFO new/cmd2-0.6.6.1/PKG-INFO --- old/cmd2-0.6.6/PKG-INFO 2013-08-06 13:51:07.000000000 +0200 +++ new/cmd2-0.6.6.1/PKG-INFO 2013-08-14 22:45:28.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cmd2 -Version: 0.6.6 +Version: 0.6.6.1 Summary: Extra features for standard library's cmd module Home-page: http://packages.python.org/cmd2/ Author: Catherine Devlin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmd2-0.6.6/cmd2.egg-info/PKG-INFO new/cmd2-0.6.6.1/cmd2.egg-info/PKG-INFO --- old/cmd2-0.6.6/cmd2.egg-info/PKG-INFO 2013-08-06 13:51:07.000000000 +0200 +++ new/cmd2-0.6.6.1/cmd2.egg-info/PKG-INFO 2013-08-14 22:45:28.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cmd2 -Version: 0.6.6 +Version: 0.6.6.1 Summary: Extra features for standard library's cmd module Home-page: http://packages.python.org/cmd2/ Author: Catherine Devlin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmd2-0.6.6/cmd2.egg-info/requires.txt new/cmd2-0.6.6.1/cmd2.egg-info/requires.txt --- old/cmd2-0.6.6/cmd2.egg-info/requires.txt 2013-08-06 13:51:07.000000000 +0200 +++ new/cmd2-0.6.6.1/cmd2.egg-info/requires.txt 2013-08-14 22:45:28.000000000 +0200 @@ -1 +1 @@ -pyparsing >= 2.0.0 \ No newline at end of file +pyparsing == 1.5.7 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmd2-0.6.6/cmd2.py new/cmd2-0.6.6.1/cmd2.py --- old/cmd2-0.6.6/cmd2.py 2013-08-06 12:24:59.000000000 +0200 +++ new/cmd2-0.6.6.1/cmd2.py 2013-08-14 22:38:44.000000000 +0200 @@ -42,7 +42,7 @@ from optparse import make_option import pyparsing -__version__ = '0.6.6' +__version__ = '0.6.6.1' if sys.version_info[0] == 2: pyparsing.ParserElement.enablePackrat() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmd2-0.6.6/setup.cfg new/cmd2-0.6.6.1/setup.cfg --- old/cmd2-0.6.6/setup.cfg 2013-08-06 13:51:07.000000000 +0200 +++ new/cmd2-0.6.6.1/setup.cfg 2013-08-14 22:45:28.000000000 +0200 @@ -1,5 +1,5 @@ [egg_info] -tag_svn_revision = 0 -tag_date = 0 tag_build = +tag_date = 0 +tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmd2-0.6.6/setup.py new/cmd2-0.6.6.1/setup.py --- old/cmd2-0.6.6/setup.py 2013-08-06 12:24:37.000000000 +0200 +++ new/cmd2-0.6.6.1/setup.py 2013-08-14 22:38:59.000000000 +0200 @@ -14,7 +14,7 @@ setup( name="cmd2", - version="0.6.6", + version="0.6.6.1", py_modules=["cmd2"], use_2to3=True, -- 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-cliff for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package python-cliff for openSUSE:Factory checked in at 2013-09-03 22:02:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cliff (Old) and /work/SRC/openSUSE:Factory/.python-cliff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cliff" Changes: -------- --- /work/SRC/openSUSE:Factory/python-cliff/python-cliff.changes 2013-06-29 14:32:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-cliff.new/python-cliff.changes 2013-09-03 22:02:58.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 3 08:01:39 UTC 2013 - dmueller(a)suse.com + +- update to 1.4.4: + - Provide better error handling for unknown commands run from the + command line. (Contributed by Christophe Chauvet.) + +------------------------------------------------------------------- Old: ---- cliff-1.4.tar.gz New: ---- cliff-1.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cliff.spec ++++++ --- /var/tmp/diff_new_pack.3jncfa/_old 2013-09-03 22:02:59.000000000 +0200 +++ /var/tmp/diff_new_pack.3jncfa/_new 2013-09-03 22:02:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-cliff -Version: 1.4 +Version: 1.4.4 Release: 0 Url: https://github.com/dreamhost/cliff Summary: Command Line Interface Formulation Framework @@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-argparse BuildRequires: python-devel -BuildRequires: python-distribute +BuildRequires: python-setuptools BuildRequires: python-tablib # Test requirements: BuildRequires: python-PrettyTable ++++++ cliff-1.4.tar.gz -> cliff-1.4.4.tar.gz ++++++ ++++ 2170 lines of diff (skipped) -- 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-cffi for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package python-cffi for openSUSE:Factory checked in at 2013-09-03 22:02:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cffi (Old) and /work/SRC/openSUSE:Factory/.python-cffi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cffi" Changes: -------- New Changes file: --- /dev/null 2013-07-23 23:44:04.804033756 +0200 +++ /work/SRC/openSUSE:Factory/.python-cffi.new/python-cffi.changes 2013-09-03 22:02:47.000000000 +0200 @@ -0,0 +1,17 @@ +------------------------------------------------------------------- +Mon Aug 19 13:27:16 UTC 2013 - mvyskocil(a)suse.com + +- Update to 0.7.2 + * add implicit bool + * standard names are handled as defaults in cdef declarations + * enum types follow GCC rules and not just int + * supports simple slices x[start:stop] + * enums are handled like ints + * new ffi.new_handle(python_object) + * and various bugfixes + +------------------------------------------------------------------- +Sun Feb 10 09:28:56 UTC 2013 - saschpe(a)suse.de + +- Initial version + New: ---- cffi-0.7.2.tar.gz python-cffi.changes python-cffi.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cffi.spec ++++++ # # spec file for package python-cffi # # Copyright (c) 2013 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/ Name: python-cffi Version: 0.7.2 Release: 0 License: MIT Summary: Foreign Function Interface for Python calling C code Url: http://cffi.readthedocs.org Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/c/cffi/cffi-%{version}.tar.gz BuildRequires: libffi47-devel BuildRequires: python-devel BuildRequires: python-distribute # Documentation requirements: BuildRequires: python-Sphinx # Test requirements: #BuildRequires: python-nose #BuildRequires: python-py BuildRequires: python-pycparser #BuildRequires: python-pytest Requires: python-pycparser BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %endif %description Foreign Function Interface for Python calling C code. The aim of this project is to provide a convenient and reliable way of calling C code from Python. %prep %setup -q -n cffi-%{version} %build CFLAGS="%{optflags}" python setup.py build python setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check python setup.py test %files %defattr(-,root,root,-) %doc LICENSE build/sphinx/html/ %{python_sitearch}/* %changelog -- 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-boto for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package python-boto for openSUSE:Factory checked in at 2013-09-03 22:02:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-boto (Old) and /work/SRC/openSUSE:Factory/.python-boto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-boto" Changes: -------- --- /work/SRC/openSUSE:Factory/python-boto/python-boto.changes 2013-08-18 22:34:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-boto.new/python-boto.changes 2013-09-03 22:02:42.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Sep 3 08:17:39 UTC 2013 - dmueller(a)suse.com + +- update to 2.11.0: + * Added Public IP address support within VPCs created by EC2. (:sha:`be132d1`) + * All services can now easily use GovCloud. (:issue:`1651`, :sha:`542a301`, + :sha:`3c56121`, :sha:`9167d89`) + * Added ``db_subnet_group`` to + ``RDSConnection.restore_dbinstance_from_point_in_time``. (:issue:`1640`, + :sha:`06592b9`) + * Added ``monthly_backups`` to EC2's ``trim_snapshots``. (:issue:`1688`, + :sha:`a2ad606`, :sha:`2998c11`, :sha:`e32d033`) + * Added ``get_all_reservations`` & ``get_only_instances`` methods to EC2. + (:issue:`1572`, :sha:`ffc6cc0`) + +------------------------------------------------------------------- Old: ---- boto-2.9.9.tar.gz New: ---- boto-2.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-boto-doc.spec ++++++ --- /var/tmp/diff_new_pack.j5KjHx/_old 2013-09-03 22:02:43.000000000 +0200 +++ /var/tmp/diff_new_pack.j5KjHx/_new 2013-09-03 22:02:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-boto-doc -Version: 2.9.9 +Version: 2.11.0 Release: 0 Url: http://code.google.com/p/boto/ Summary: Amazon Web Services Library python-boto.spec: same change ++++++ boto-2.9.9.tar.gz -> boto-2.11.0.tar.gz ++++++ ++++ 9417 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-cup for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package java-cup for openSUSE:Factory checked in at 2013-09-03 22:02:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-cup (Old) and /work/SRC/openSUSE:Factory/.java-cup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-cup" Changes: -------- --- /work/SRC/openSUSE:Factory/java-cup/java-cup-bootstrap.changes 2013-01-30 11:16:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-cup.new/java-cup-bootstrap.changes 2013-09-03 22:02:36.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 29 07:47:30 UTC 2013 - mvyskocil(a)suse.com + +- Add conflicts for each variant +- Sync .changes +- Drop weird jpackage-prepare script and use standard pre_checkin.sh + +------------------------------------------------------------------- +Fri Aug 23 08:06:54 UTC 2013 - mvyskocil(a)suse.com + +- Disable build of javadoc + * drop java-cup-javadoc.patch +------------------------------------------------------------------- @@ -7 +19,7 @@ -Mon Nov 8 11:54:44 UTC 2010 - mvyskocil(a)suse.cz +Mon Jun 4 13:08:48 UTC 2012 - cfarrell(a)suse.com + +- license update: HPND + SPDX syntax + +------------------------------------------------------------------- +Mon Nov 8 11:55:22 UTC 2010 - mvyskocil(a)suse.cz --- /work/SRC/openSUSE:Factory/java-cup/java-cup.changes 2012-10-18 21:50:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-cup.new/java-cup.changes 2013-09-03 22:02:36.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Aug 29 07:47:30 UTC 2013 - mvyskocil(a)suse.com + +- Add conflicts for each variant +- Sync .changes +- Drop weird jpackage-prepare script and use standard pre_checkin.sh + +------------------------------------------------------------------- +Fri Aug 23 08:06:54 UTC 2013 - mvyskocil(a)suse.com + +- Disable build of javadoc + * drop java-cup-javadoc.patch +------------------------------------------------------------------- +Fri Jan 25 15:36:53 UTC 2013 - coolo(a)suse.com + +- sync licenses + +------------------------------------------------------------------- Old: ---- java-cup-javadoc.patch jpackage-bootstrap-prepare.sh New: ---- pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-cup-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.v5oaFL/_old 2013-09-03 22:02:37.000000000 +0200 +++ /var/tmp/diff_new_pack.v5oaFL/_new 2013-09-03 22:02:37.000000000 +0200 @@ -16,20 +16,13 @@ # -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} ##### WARNING: please do not edit this auto generated spec file. Use the java-cup.spec! ##### -%define with_bootstrap 1 +%global with_bootstrap 1 %bcond_with bootstrap -%define section free %define cvs_version 11a %define real_name java-cup Name: java-cup-bootstrap -# This line is not a comment, please do not remove it! -#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name}) Version: 0.11 Release: 0 Summary: LALR Parser Generator in Java @@ -42,8 +35,6 @@ Source2: java-cup-generated-files.tar.bz2 # From http://www2.cs.tum.edu/projects/cup/ Source3: java-cup.license -Source1000: jpackage-bootstrap-prepare.sh -Patch0: java-cup-javadoc.patch Patch1: java-cup-no-classpath-in-manifest.patch Patch2: java-cup-no-cup-no-jflex.patch Patch3: java-cup-classpath.patch @@ -64,6 +55,13 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +# bootstrap variant is just stripped down java-cup, so it conflicts +%if %without bootstrap +Conflicts: java-cup-bootstrap +%else +Conflicts: java-cup +%endif + %description java-cup is a LALR Parser Generator in Java. With v0.11, you can: * use CUP in an Ant-Target @@ -72,9 +70,7 @@ myGrammar.cup * use generic parametrized classes (since Java 1.5) as datatypes for - non - -* terminals and terminals + non terminals and terminals * have Your own symbol classes @@ -82,26 +78,6 @@ %if %without bootstrap -%package javadoc -Summary: LALR Parser Generator in Java -Group: Development/Libraries/Java - -%description javadoc -java-cup is a LALR Parser Generator in Java. With v0.11, you can: * - use CUP in an Ant-Target - -* start CUP by a simple command like java -jar java-cup-11a.jar - myGrammar.cup - -* use generic parametrized classes (since Java 1.5) as datatypes for - non - -* terminals and terminals - -* have Your own symbol classes - - - %package manual Summary: LALR Parser Generator in Java Group: Development/Libraries/Java @@ -126,7 +102,6 @@ %prep %setup -q -n develop -%patch0 -p1 %patch1 -p1 %if %with bootstrap %setup -q -T -D -a 2 -n develop @@ -148,9 +123,6 @@ %endif export OPT_JAR_LIST=: %ant -%if %without bootstrap -%ant javadoc -%endif %install # jar @@ -160,12 +132,6 @@ (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done) # compatibility symlinks (cd %{buildroot}%{_javadir} && %{__ln_s} %{real_name}.jar java_cup.jar && %{__ln_s} %{real_name}-runtime.jar java_cup-runtime.jar) -%if %without bootstrap -# javadoc -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -a dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %{__ln_s} %{name}-%{version} %{name}) -%endif %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name} @@ -183,10 +149,6 @@ %defattr(0644,root,root,0755) %doc manual.html -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} %endif %changelog ++++++ java-cup.spec ++++++ --- /var/tmp/diff_new_pack.v5oaFL/_old 2013-09-03 22:02:37.000000000 +0200 +++ /var/tmp/diff_new_pack.v5oaFL/_new 2013-09-03 22:02:37.000000000 +0200 @@ -16,19 +16,12 @@ # -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} -%define _without_bootstrap 1 +%global _without_bootstrap 1 %bcond_with bootstrap -%define section free %define cvs_version 11a %define real_name java-cup Name: java-cup -# This line is not a comment, please do not remove it! -#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name}) Version: 0.11 Release: 0 Summary: LALR Parser Generator in Java @@ -41,8 +34,6 @@ Source2: java-cup-generated-files.tar.bz2 # From http://www2.cs.tum.edu/projects/cup/ Source3: java-cup.license -Source1000: jpackage-bootstrap-prepare.sh -Patch0: java-cup-javadoc.patch Patch1: java-cup-no-classpath-in-manifest.patch Patch2: java-cup-no-cup-no-jflex.patch Patch3: java-cup-classpath.patch @@ -63,6 +54,13 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +# bootstrap variant is just stripped down java-cup, so it conflicts +%if %without bootstrap +Conflicts: java-cup-bootstrap +%else +Conflicts: java-cup +%endif + %description java-cup is a LALR Parser Generator in Java. With v0.11, you can: * use CUP in an Ant-Target @@ -79,26 +77,6 @@ %if %without bootstrap -%package javadoc -Summary: LALR Parser Generator in Java -Group: Development/Libraries/Java - -%description javadoc -java-cup is a LALR Parser Generator in Java. With v0.11, you can: * - use CUP in an Ant-Target - -* start CUP by a simple command like java -jar java-cup-11a.jar - myGrammar.cup - -* use generic parametrized classes (since Java 1.5) as datatypes for - non - -* terminals and terminals - -* have Your own symbol classes - - - %package manual Summary: LALR Parser Generator in Java Group: Development/Libraries/Java @@ -123,7 +101,6 @@ %prep %setup -q -n develop -%patch0 -p1 %patch1 -p1 %if %with bootstrap %setup -q -T -D -a 2 -n develop @@ -145,9 +122,6 @@ %endif export OPT_JAR_LIST=: %ant -%if %without bootstrap -%ant javadoc -%endif %install # jar @@ -157,12 +131,6 @@ (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done) # compatibility symlinks (cd %{buildroot}%{_javadir} && %{__ln_s} %{real_name}.jar java_cup.jar && %{__ln_s} %{real_name}-runtime.jar java_cup-runtime.jar) -%if %without bootstrap -# javadoc -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -a dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %{__ln_s} %{name}-%{version} %{name}) -%endif %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name} @@ -180,10 +148,6 @@ %defattr(0644,root,root,0755) %doc manual.html -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} %endif %changelog ++++++ pre_checkin.sh ++++++ #!/bin/bash NAME1=java-cup NAME2=java-cup-bootstrap COPY_CHANGES=true EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ${NAME1}.spec! #####\n" sed "s/^%global _without_bootstrap.*$/${EDIT_WARNING}%global with_bootstrap 1/; s/^$Name:.*$$/\1-bootstrap/; " < ${NAME1}.spec > ${NAME2:-${NAME1}-bootstrap}.spec if ${COPY_CHANGES}; then cp ${NAME1}.changes ${NAME2:-${NAME1}-bootstrap}.changes fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jasper5 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package jasper5 for openSUSE:Factory checked in at 2013-09-03 22:02:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jasper5 (Old) and /work/SRC/openSUSE:Factory/.jasper5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jasper5" Changes: -------- --- /work/SRC/openSUSE:Factory/jasper5/jasper5.changes 2011-09-23 02:04:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jasper5.new/jasper5.changes 2013-09-03 22:02:31.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 2 11:29:42 UTC 2013 - dvaleev(a)suse.com + +- Remove dropped servlet4-javadoc pacakge from BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jasper5.spec ++++++ --- /var/tmp/diff_new_pack.eGpzr5/_old 2013-09-03 22:02:32.000000000 +0200 +++ /var/tmp/diff_new_pack.eGpzr5/_new 2013-09-03 22:02:32.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jasper5 (Version 5.0.19) +# spec file for package jasper5 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,11 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: jasper5 -BuildRequires: ant jakarta-commons-collections jakarta-commons-daemon jakarta-commons-el jakarta-commons-logging java2-devel-packages junit servletapi5 servletapi5-javadoc xalan-j2 xml-commons-apis +BuildRequires: ant +BuildRequires: jakarta-commons-collections +BuildRequires: jakarta-commons-daemon +BuildRequires: jakarta-commons-el +BuildRequires: jakarta-commons-logging +BuildRequires: java2-devel-packages +BuildRequires: junit +BuildRequires: servletapi5 +BuildRequires: xalan-j2 +BuildRequires: xml-commons-apis %define full_name jakarta-%{name} %define majversion 5.0 %define release 1jpp @@ -42,24 +49,25 @@ %define commondir %{_localstatedir}/lib/%{name}/common %define shareddir %{_localstatedir}/lib/%{name}/shared Summary: Apache JSP Engine, RI for Servlet JSP 2.0 API -Version: 5.0.19 -Release: 338 License: Apache-2.0 Group: Development/Libraries/Java +Version: 5.0.19 +Release: 0 Url: http://jakarta.apache.org/tomcat/ BuildArch: noarch Source: http://jakarta.apache.org/builds/jakarta-tomcat-5.0/release/v%{version}/src… Patch0: jasper5_command.patch Patch1: jasper5_build150.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: ant >= 1.5.4, jpackage-utils >= 1.5.32 +Requires: ant >= 1.5.4 +Requires: jakarta-commons-collections >= 2.1 +Requires: jakarta-commons-daemon >= 1.0 +Requires: jakarta-commons-el >= 1.0 +Requires: jakarta-commons-logging >= 1.0.3 +Requires: jpackage-utils >= 1.5.32 Requires: servletapi5 >= 5.0.18 Requires: xerces-j2 >= 2.6.0 Requires: xml-commons-apis >= 1.0 -Requires: jakarta-commons-el >= 1.0 -Requires: jakarta-commons-collections >= 2.1 -Requires: jakarta-commons-logging >= 1.0.3 -Requires: jakarta-commons-daemon >= 1.0 BuildRequires: jpackage-utils >= 1.5.32 %description @@ -69,7 +77,6 @@ %package javadoc -License: Apache-2.0 Summary: Javadoc for jasper5 Group: Development/Libraries/Java PreReq: coreutils -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dom4j for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '13

03 Sep '13

Hello community, here is the log from the commit of package dom4j for openSUSE:Factory checked in at 2013-09-03 22:02:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dom4j (Old) and /work/SRC/openSUSE:Factory/.dom4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dom4j" Changes: -------- --- /work/SRC/openSUSE:Factory/dom4j/dom4j.changes 2012-03-29 07:45:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dom4j.new/dom4j.changes 2013-09-03 22:02:22.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 28 13:57:11 UTC 2013 - mvyskocil(a)suse.com + +- use add_maven_depmap from javapackages-tools +- drop repolib part (never built) +- drop pointless jarjar +- unversioned javadoc + +------------------------------------------------------------------- Old: ---- dom4j-1.6.1-component-info.xml dom4j-jarjar-build.xml dom4j-jarjar-component-info.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dom4j.spec ++++++ --- /var/tmp/diff_new_pack.a9oPIz/_old 2013-09-03 22:02:23.000000000 +0200 +++ /var/tmp/diff_new_pack.a9oPIz/_new 2013-09-03 22:02:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dom4j # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -16,21 +16,13 @@ # -%define _with_repolib 1 -%define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0} -%define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0} -%define repodir %{_javadir}/repository.jboss.com/dom4j/1.6.1-brew -%define repodirlib %{repodir}/lib -%define repodirsrc %{repodir}/src -%define section free - Name: dom4j Version: 1.6.1 -Release: 2 +Release: 0 Summary: JarJar of dom4j for JBoss License: Apache-1.1 -Url: http://www.dom4j.org/ Group: Development/Libraries/Java +Url: http://www.dom4j.org/ #Source0: dom4j-1.6.1.tar.gz # Debian sources don't need a proprietary msv for build, so that's why I used them # svn co svn://svn.debian.org/svn/pkg-java/trunk/dom4j @@ -41,27 +33,21 @@ # tar --exclude-vcs -cjf dom4j-1.6.1-debian.tar.bz2 dom4j/ Source0: dom4j-1.6.1-debian.tar.bz2 Source1: dom4j_rundemo.sh -#Source2: dom4j-build.xml -Source3: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom -Source4: dom4j-1.6.1-component-info.xml -# http://repository.jboss.com/jboss/dom4j-jarjar/1.6.1/build/build.xml -Source5: dom4j-jarjar-build.xml -Source6: dom4j-jarjar-component-info.xml +Source2: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom Patch0: dom4j-1.6.1-bug1618750.patch -BuildRequires: jpackage-utils >= 1.7.4 -BuildRequires: jarjar -BuildRequires: java-devel >= 1.5.0 BuildRequires: ant >= 1.6.5 -BuildRequires: junit +BuildRequires: ant-apache-resolver BuildRequires: ant-junit BuildRequires: ant-trax -BuildRequires: ant-apache-resolver -BuildRequires: jtidy -BuildRequires: junitperf +BuildRequires: bea-stax BuildRequires: isorelax +BuildRequires: java-devel >= 1.5.0 BuildRequires: jaxen-bootstrap >= 1.1 +BuildRequires: jpackage-utils >= 1.7.4 +BuildRequires: jtidy +BuildRequires: junit +BuildRequires: junitperf BuildRequires: relaxngDatatype -BuildRequires: bea-stax BuildRequires: stax_1_0_api BuildRequires: ws-jaxme BuildRequires: xalan-j2 >= 2.7 @@ -69,17 +55,17 @@ #BuildRequires: jaxp = 1.2 BuildRequires: xpp2 BuildRequires: xpp3 -Requires: java >= 1.5.0 -Requires: xpp2 -Requires: xpp3 -Requires: xerces-j2 -Requires: relaxngDatatype +Requires: bea-stax Requires: isorelax +Requires: java >= 1.5.0 Requires: jaxen >= 1.1 -Requires: bea-stax +Requires: relaxngDatatype Requires: stax_1_0_api Requires: ws-jaxme Requires: xalan-j2 +Requires: xerces-j2 +Requires: xpp2 +Requires: xpp3 #Requires: jaxp = 1.2 Requires(post): jpackage-utils >= 1.7.4 Requires(postun): jpackage-utils >= 1.7.4 @@ -87,58 +73,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -A jarjard version of dom4j that moves the classes to the -org.jboss.dom4j package space and strips the following packages: - -org.dom4j.jaxb.* org.dom4j.swing.* org.dom4j.xpath.* org.dom4j.xpp.* - - - -%if %{with_repolib} - -%package repolib -License: Apache-1.1 -Summary: XML, XPath and XSLT library for Java -Group: Development/Libraries/Java - -%description repolib dom4j is an easy to use Open Source XML, XPath and XSLT framework for Java using the Java Collections Framework. dom4j allows you to read, write, navigate, create and modify XML documents. dom4j integrates with DOM, SAX and JAXP and is seamlessly integrated with full XPath support. - - -%package jarjar -License: Apache-1.1 -Summary: JarJar of dom4j for JBoss -Group: Development/Libraries/Java - -%description jarjar -A jarjared version of dom4j that moves the classes to the -org.jboss.dom4j package space and strips the following packages: - -org.dom4j.jaxb.* org.dom4j.swing.* org.dom4j.xpath.* org.dom4j.xpp.* - - - -%package jarjar-repolib -License: Apache-1.1 -Summary: JarJar of dom4j for JBoss -Group: Development/Libraries/Java - -%description jarjar-repolib -A jarjared version of dom4j that moves the classes to the -org.jboss.dom4j package space and strips the following packages: - -org.dom4j.jaxb.* org.dom4j.swing.* org.dom4j.xpath.* org.dom4j.xpp.* - - - -%endif - %package demo -License: Apache-1.1 Summary: XML, XPath and XSLT library for Java Group: Development/Libraries/Java Requires: %{name} = %{version} @@ -152,20 +92,17 @@ %package manual -License: Apache-1.1 Summary: JarJar of dom4j for JBoss Group: Development/Libraries/Java %description manual -A jarjard version of dom4j that moves the classes to the -org.jboss.dom4j package space and strips the following packages: - -org.dom4j.jaxb.* org.dom4j.swing.* org.dom4j.xpath.* org.dom4j.xpp.* - +dom4j is an easy to use Open Source XML, XPath and XSLT framework for +Java using the Java Collections Framework. dom4j allows you to read, +write, navigate, create and modify XML documents. dom4j integrates with +DOM, SAX and JAXP and is seamlessly integrated with full XPath support. %package javadoc -License: Apache-1.1 Summary: XML, XPath and XSLT library for Java Group: Development/Libraries/Java @@ -194,8 +131,7 @@ rm -f src/test/org/dom4j/io/StaxTest.java %patch0 -p1 -b .bug1618750 perl -pi -e 's/\r//g' LICENSE.txt docs/clover/*.css docs/style/*.css docs/xref/*.css docs/xref-test/*.css src/doc/style/*.css docs/benchmarks/xpath/*.java -# jarjar -cp -p %{SOURCE5} dom4j-jarjar-build.xml + pushd lib ln -sf $(build-classpath xpp2) ln -sf $(build-classpath relaxngDatatype) @@ -232,25 +168,21 @@ ant package release-javadoc #export CLASSPATH=`pwd`/dom4j-1.6.1.jar:$(build-classpath xpp2) #ant samples -# jarjar -export CLASSPATH=$(build-classpath jarjar) -export OPT_JAR_LIST=: -ant -f dom4j-jarjar-build.xml %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -# jarjar -cp -p output/dom4j-jarjar.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-jarjar-%{version}.jar (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -%add_to_maven_depmap %{name} %{name} %{version} JPP %{name} -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom + +mkdir -p %{buildroot}/%{_mavenpomdir} +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap + # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # manual mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} rm -rf docs/apidocs @@ -262,52 +194,17 @@ cp -pr src/samples $RPM_BUILD_ROOT%{_datadir}/%{name}/src #cp -pr build/classes/org/dom4j/samples $RPM_BUILD_ROOT%{_datadir}/%{name}/classes/org/dom4j install -m 0755 run.sh $RPM_BUILD_ROOT%{_datadir}/%{name} -%if %{with_repolib} - install -d -m 755 $RPM_BUILD_ROOT%{repodir} - install -d -m 755 $RPM_BUILD_ROOT%{repodirlib} - install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{repodir}/component-info.xml - sed -i "s/@VERSION@/%{version}-brew/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml - tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'` - sed -i "s/@TAG@/$tag/g" build.xml $RPM_BUILD_ROOT%{repodir}/component-info.xml - install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc} - install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc} - cp -p $RPM_BUILD_ROOT%{_javadir}/dom4j-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/dom4j.jar - # jarjar - %define repodir %{_javadir}/repository.jboss.com/jboss/dom4j-jarjar/1.6.1-brew - install -d -m 755 $RPM_BUILD_ROOT%{repodir} - install -d -m 755 $RPM_BUILD_ROOT%{repodirlib} - install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{repodir}/component-info.xml - sed -i "s/@VERSION@/%{version}-brew/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml - tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'` - sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml - install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc} - install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc} - install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{repodirsrc} - cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-jarjar-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/dom4j-jarjar.jar -%endif - -%post -%update_maven_depmap - -%postun -%update_maven_depmap %files %defattr(0644,root,root,0755) %doc LICENSE.txt %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar -%{_datadir}/maven2/* +%{_mavenpomdir}/* %config %{_mavendepmapfragdir}/* -%files jarjar -%defattr(0644,root,root,0755) -%{_javadir}/%{name}-jarjar.jar -%{_javadir}/%{name}-jarjar-%{version}.jar - %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files manual @@ -317,17 +214,5 @@ %files demo %defattr(-,root,root,0755) %{_datadir}/%{name} -%if %{with_repolib} - -%files repolib -%defattr(0644,root,root,0755) -%dir %{_javadir}/repository.jboss.com -%{_javadir}/repository.jboss.com/dom4j - -%files jarjar-repolib -%defattr(0644,root,root,0755) -%dir %{_javadir}/repository.jboss.com -%{_javadir}/repository.jboss.com/jboss -%endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0