I have made the following changes intended for : nemo:devel:mw / pyOpenSSL nemo:devel:mw / telepathy-gabble nemo:devel:mw / python-twisted nemo:devel:mw / python-zope-interface nemo:devel:mw / telepathy-mission-control
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/192 Thank You, Reto Zingg [This message was auto-generated] --- Request # 192: Messages from BOSS: State: review at 2013-04-08T13:36:44 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:kontio:Telepathy / pyOpenSSL -> nemo:devel:mw / pyOpenSSL changes files: -------------- ++++++ new changes file: --- pyOpenSSL.changes +++ pyOpenSSL.changes @@ -0,0 +1,2 @@ +* Tue Apr 3 2013 Reto Zingg <[email protected]> - 0.13 +- Initial packaging for Nemo new: ---- pyOpenSSL-0.13.tar.gz pyOpenSSL.changes pyOpenSSL.spec spec files: ----------- ++++++ new spec file: --- pyOpenSSL.spec +++ pyOpenSSL.spec @@ -0,0 +1,44 @@ +%{!?python:%define python python} +%{!?python_sitearch: %define python_sitearch %(%{python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Name: pyOpenSSL +Version: 0.13 +Release: 0 +Summary: Python wrapper module around the OpenSSL library + +Group: Development/Libraries +License: ASL 2.0 +URL: http://pypi.python.org/packages/source/p/pyOpenSSL/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz + +BuildRequires: openssl-devel +BuildRequires: %{python}-devel +Requires: %{python} + + +%description +High-level wrapper around a subset of the OpenSSL library, includes among others + * SSL.Connection objects, wrapping the methods of Python's portable + sockets + * Callbacks written in Python + * Extensive error-handling mechanism, mirroring OpenSSL's error codes + +%prep +%setup -q + +# Fix permissions for debuginfo package +%{__chmod} -x OpenSSL/ssl/connection.c + +%build +CFLAGS="%{optflags} -fno-strict-aliasing" %{__python} setup.py build + + +%install +%{__python} setup.py install --skip-build --root %{buildroot} + +%files +%defattr(-,root,root,-) +%{python_sitearch}/OpenSSL/ +%{python_sitearch}/%{name}*.egg-info +%doc README + other changes: -------------- ++++++ pyOpenSSL-0.13.tar.gz (new) submit: home:kontio:Telepathy / telepathy-gabble -> nemo:devel:mw / telepathy-gabble changes files: -------------- --- telepathy-gabble.changes +++ telepathy-gabble.changes @@ -0,0 +1,3 @@ +* Tue Apr 8 2013 Reto Zingg <[email protected]> - 0.17.1 +- add -tests package for automated testing + new: ---- INSIGNIFICANT mktests.sh nemo-tests-dir-fix.patch spec files: ----------- --- telepathy-gabble.spec +++ telepathy-gabble.spec @@ -15,7 +15,10 @@ License: LGPLv2+ and BSD URL: http://telepathy.freedesktop.org/wiki/ Source0: http://telepathy.freedesktop.org/releases/telepathy-gabble/%{name}-%{version}.tar.gz +Source1: INSIGNIFICANT +Source2: mktests.sh Source100: telepathy-gabble.yaml +Patch0: nemo-tests-dir-fix.patch Requires: telepathy-filesystem Requires: telepathy-mission-control Requires(post): /sbin/ldconfig @@ -37,27 +40,51 @@ BuildRequires: pkgconfig(gnutls) BuildRequires: python BuildRequires: ca-certificates +BuildRequires: python-twisted +BuildRequires: dbus-python %description A Jabber/XMPP connection manager, that handles single and multi-user chats and voice calls. +%package tests +Summary: Tests package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: python-twisted +Requires: pyOpenSSL +Requires: dbus-python + +%description tests +The %{name}-tests package contains tests and +tests.xml for automated testing. + + %prep %setup -q -n %{name}-%{version} +# nemo-tests-dir-fix.patch +%patch0 -p1 # >> setup +%__cp $RPM_SOURCE_DIR/mktests.sh tests/ +%__cp $RPM_SOURCE_DIR/INSIGNIFICANT tests/ +%__chmod 0755 tests/mktests.sh +%__chmod 0644 tests/INSIGNIFICANT # << setup %build # >> build pre # << build pre -%reconfigure --disable-static +%reconfigure --disable-static \ + --enable-installed-tests + make %{?jobs:-j%jobs} # >> build post +tests/mktests.sh > tests/tests.xml # << build post %install @@ -67,6 +94,9 @@ %make_install # >> install post +install -m 0644 tests/tests.xml $RPM_BUILD_ROOT/opt/tests/telepathy-gabble/tests.xml +install -m 0644 tests/INSIGNIFICANT $RPM_BUILD_ROOT/opt/tests/telepathy-gabble/INSIGNIFICANT +install -m 0644 tests/README $RPM_BUILD_ROOT/opt/tests/telepathy-gabble/README # << install post @@ -91,3 +121,9 @@ %{_datadir}/telepathy/managers/*.manager %{_mandir}/man8/%{name}.8.gz # << files + +%files tests +%defattr(-,root,root,-) +/opt/tests/%{name}/* +# >> files tests +# << files tests other changes: -------------- ++++++ INSIGNIFICANT (new) --- INSIGNIFICANT +++ INSIGNIFICANT @@ -0,0 +1,2 @@ +jingle-share/test-send-file-send-before-accept.py - this often runs into a time out (https://bugs.freedesktop.org/show_bug.cgi?id=49595) +client-types.py - this fails from time to time (https://bugs.freedesktop.org/show_bug.cgi?id=37381) ++++++ mktests.sh (new) --- mktests.sh +++ mktests.sh @@ -0,0 +1,55 @@ +#!/bin/sh + +cat <<EOF +<?xml version="1.0" encoding="UTF-8"?> +<testdefinition version="1.0"> + <suite name="telepathy-gabble-tests"> + <description>Telepathy Gabble tests</description> + <set name="telepathy-gabble-C-tests"> +EOF + +for testcase in $(cat tests/gabble-C-tests.list) +do + testcase_name=$(echo $testcase|sed 's/\//_/') + attributes="name=\"$testcase_name\"" + insignificant=`grep "^$testcase" tests/INSIGNIFICANT || true` + if test -n "$insignificant" + then + continue + attributes="$attributes insignificant=\"true\"" + fi + cat <<EOF + <case $attributes> + <step>/opt/tests/telepathy-gabble/$testcase</step> + </case> +EOF +done + +cat <<EOF + </set> + <set name="telepathy-gabble-twisted-tests"> +EOF + +for testcase in $(cat tests/twisted/gabble-twisted-tests.list) +do + testcase_name=$(echo $testcase|sed 's/\//_/') + attributes="name=\"$testcase_name\"" + insignificant=`grep "^$testcase" tests/INSIGNIFICANT || true` + if test -n "$insignificant" + then + continue + attributes="$attributes insignificant=\"true\"" + fi + cat <<EOF + <case $attributes> + <step>/opt/tests/telepathy-gabble/twisted/run-test.sh $testcase</step> + </case> +EOF +done + +cat <<EOF + </set> + </suite> +</testdefinition> +EOF + ++++++ nemo-tests-dir-fix.patch (new) --- nemo-tests-dir-fix.patch +++ nemo-tests-dir-fix.patch @@ -0,0 +1,12 @@ +diff -Naur telepathy-gabble-0.17.1/configure.ac telepathy-gabble-0.17.1-tests/configure.ac +--- telepathy-gabble-0.17.1/configure.ac 2012-09-11 13:51:59.000000000 +0000 ++++ telepathy-gabble-0.17.1-tests/configure.ac 2013-04-08 07:26:00.009864418 +0000 +@@ -184,7 +184,7 @@ + fi + AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], [test "x$installed_tests" = xyes]) + +-gabbletestsdir=${libdir}/telepathy-gabble-tests ++gabbletestsdir=/opt/tests/telepathy-gabble + AC_SUBST(gabbletestsdir) + + AC_ARG_ENABLE([is-a-phone], ++++++ telepathy-gabble.yaml --- telepathy-gabble.yaml +++ telepathy-gabble.yaml @@ -7,6 +7,10 @@ URL: http://telepathy.freedesktop.org/wiki/ Sources: - http://telepathy.freedesktop.org/releases/telepathy-gabble/%{name}-%{version}.tar.gz + - INSIGNIFICANT + - mktests.sh +Patches: + - nemo-tests-dir-fix.patch Description: | A Jabber/XMPP connection manager, that handles single and multi-user chats and voice calls. @@ -30,8 +34,28 @@ PkgBR: - python - ca-certificates +# python-twisted and dbus-python are needed to be installed so the +# unit tests are created and installed + - python-twisted + - dbus-python Requires: - telepathy-filesystem - telepathy-mission-control Configure: reconfigure +ConfigOptions: + - --enable-installed-tests + +SubPackages: + - Name: tests + Summary: Tests package for %{name} + Group: Development/Libraries + Description: | + The %{name}-tests package contains tests and + tests.xml for automated testing. + Requires: + - python-twisted + - pyOpenSSL + - dbus-python + Files: + - /opt/tests/%{name}/* submit: home:kontio:Telepathy / python-twisted -> nemo:devel:mw / python-twisted changes files: -------------- ++++++ new changes file: --- python-twisted.changes +++ python-twisted.changes @@ -0,0 +1,2 @@ +* Tue Apr 2 2013 Reto Zingg <[email protected]> - 12.3.0 +- Initial packaging for Nemo based on Fedora spec new: ---- Twisted-12.3.0.tar.bz2 python-twisted.changes python-twisted.spec twisted-dropin-cache spec files: ----------- ++++++ new spec file: --- python-twisted.spec +++ python-twisted.spec @@ -0,0 +1,116 @@ +%{!?python:%define python python} +%{!?python_sitearch: %define python_sitearch %(%{python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Name: %{python}-twisted +Version: 12.3.0 +Release: 0 +Group: Development/Languages +Summary: Asynchronous networking framework written in Python +License: MIT +URL: http://twistedmatrix.com/trac/ +Source0: Twisted-12.3.0.tar.bz2 +Source1: twisted-dropin-cache +# Available here: +# https://apestaart.org/thomas/trac/browser/pkg/fedora.extras/python-twisted-core/twisted-dropin-cache?format=raw + +BuildRequires: %{python}-devel +BuildRequires: %{python}-zope-interface >= 3.0.1 +Requires: %{python} +Requires: %{python}-zope-interface + +%description +An extensible framework for Python programming, with special focus +on event-based network programming and multiprotocol integration. + +It is expected that one day the project will expanded to the point +that the framework will seamlessly integrate with mail, web, DNS, +netnews, IRC, RDBMSs, desktop environments, and your toaster. + +Twisted Core is used by most of the servers, clients and protocols that are +part of other Twisted projects. + +%package doc +Summary: Documentation for Twisted Core +Requires: python-twisted = %{version}-%{release} + +%description doc +Documentation for Twisted. + +%prep +%setup -q -n Twisted-%{version} + +# Turn off exec bits on docs to avoid spurious dependencies +find doc -type f | xargs chmod 644 + +# Fix line endings +sed -i -e 's,\r$,,' doc/core/howto/listings/udp/* + +%build +CFLAGS="$RPM_OPT_FLAGS" %{python} setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +%{python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT + +# cfsupport is support for MacOSX Core Foundations, so we can delete it +rm -rf $RPM_BUILD_ROOT%{python_sitearch}/twisted/internet/cfsupport + +# iocpreactor is a win32 reactor, so we can delete it +rm -rf $RPM_BUILD_ROOT%{python_sitearch}/twisted/internet/iocpreactor + +# Man pages +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ +cp -a doc/*/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/ +rm -rf doc/man + +# Some of the zsh completions are no longer appropriate +find $RPM_BUILD_ROOT%{python_sitearch}/twisted/python/zsh -size 0c -exec rm -f {} \; + +# script to regenerate dropin.cache +mkdir -p $RPM_BUILD_ROOT%{_libexecdir} +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir} + +# Create an empty dropin.cache to be %%ghost-ed +touch $RPM_BUILD_ROOT%{python_sitearch}/twisted/plugins/dropin.cache + +# C files don't need to be packaged +rm -f $RPM_BUILD_ROOT%{python_sitearch}/twisted/protocols/_c_urlarg.c +rm -f $RPM_BUILD_ROOT%{python_sitearch}/twisted/test/raiser.c +rm -f $RPM_BUILD_ROOT%{python_sitearch}/twisted/python/sendmsg.c +rm -f $RPM_BUILD_ROOT%{python_sitearch}/twisted/python/_initgroups.c +rm -f $RPM_BUILD_ROOT%{python_sitearch}/twisted/runner/portmap.c +rm -f $RPM_BUILD_ROOT%{python_sitearch}/twisted/python/_epoll.c + +# Fix permissions of shared objects +chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/twisted/test/raiser.so + +# See if there's any egg-info +if [ -f $RPM_BUILD_ROOT%{python_sitearch}/Twisted*.egg-info ]; then + echo $RPM_BUILD_ROOT%{python_sitearch}/Twisted*.egg-info | + sed -e "s|^$RPM_BUILD_ROOT||" +fi > egg-info + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%{_libexecdir}/twisted-dropin-cache || : + +%preun +if [ $1 -eq 0 ]; then + # Complete removal, not upgrade, so remove plugins cache file + %{__rm} -f %{python_sitearch}/twisted/plugins/dropin.cache || : +fi + +%files -f egg-info +%defattr(0644, root, root, 0755) +%doc LICENSE NEWS README +%attr(0755, root, root) %{_bindir}/* +%attr(0755, root, root) %{_libexecdir}/twisted-dropin-cache +%{_mandir}/man1/* +%ghost %{python_sitearch}/twisted/plugins/dropin.cache +%{python_sitearch}/twisted/* + +%files doc +%doc doc/* + other changes: -------------- ++++++ Twisted-12.3.0.tar.bz2 (new) ++++++ twisted-dropin-cache (new) --- twisted-dropin-cache +++ twisted-dropin-cache @@ -0,0 +1,46 @@ +#!/usr/bin/env python +# -*- Mode: Python -*- +# vi:si:et:sw=4:sts=4:ts=4 + +# this program regenerates the dropin.cache file for twisted, +# or for the modules specified on the command line + +# we copy and adapt getPlugins from there because getPlugins does log.err() +# on *any* exception, giving us a full traceback every time a plug-in has +# gone away + +import sys +from twisted.plugin import IPlugin, getCache +import twisted.plugins + +def getPlugins(interface, package=twisted.plugins): + allDropins = getCache(package) + for dropin in allDropins.itervalues(): + for plugin in dropin.plugins: + try: + adapted = interface(plugin, None) + except AttributeError: + # this is most likely due to a module in the cache that + # has now gone away, so ignore it + pass + except: + log.err() + else: + if adapted is not None: + yield adapted + +which = None +if len(sys.argv) > 1: + which = sys.argv[1:] + +if not which: + list(getPlugins(IPlugin)) +else: + from twisted.python import reflect + for w in which: + try: + module = reflect.namedAny(w) + except AttributeError: + sys.stderr.write("No module '%s' found.\n" % w) + continue + list(getPlugins(IPlugin, module)) submit: home:kontio:Telepathy / python-zope-interface -> nemo:devel:mw / python-zope-interface changes files: -------------- ++++++ new changes file: --- python-zope-interface.changes +++ python-zope-interface.changes @@ -0,0 +1,2 @@ +* Tue Apr 6 2013 Reto Zingg <[email protected]> - 4.0.5 +- Initial packaging for Nemo new: ---- python-zope-interface.changes python-zope-interface.spec zope.interface-4.0.5.zip spec files: ----------- ++++++ new spec file: --- python-zope-interface.spec +++ python-zope-interface.spec @@ -0,0 +1,41 @@ +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Name: python-zope-interface +Version: 4.0.5 +Release: 0 +Url: http://pypi.python.org/pypi/zope.interface +Summary: Interfaces for Python +License: ZPL-2.1 +Group: Development/Languages/Python +Source: zope.interface-%{version}.zip +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python-devel +BuildRequires: python-setuptools +BuildRequires: fdupes + + +%description +This package is intended to be independently reusable in any Python +project. It is maintained by the Zope Toolkit project. + +This package provides an implementation of object interfaces for Python. +Interfaces are a mechanism for labeling objects as conforming to a given +API or contract. So, this package can be considered as implementation of +the Design By Contract methodology support in Python. + +%prep +%setup -q -n zope.interface-%{version} + +%build +python setup.py build + +%install +python setup.py install --prefix=%{_prefix} --root=%{buildroot} +# Remove duplicate files +%fdupes -s %{buildroot} + +%files +%defattr(-,root,root,-) +%doc COPYRIGHT.txt CHANGES.rst LICENSE.txt README.rst +%{python_sitearch}/* + other changes: -------------- ++++++ zope.interface-4.0.5.zip (new) Binary files zope.interface-4.0.5.zip added submit: home:kontio:Telepathy / telepathy-mission-control -> nemo:devel:mw / telepathy-mission-control changes files: -------------- --- telepathy-mission-control.changes +++ telepathy-mission-control.changes @@ -0,0 +1,3 @@ +* Tue Apr 6 2013 Reto Zingg <[email protected]> - 5.14.0 +- add -tests package for automated testing + new: ---- mktests.sh nemo-tests-dir-fix.patch spec files: ----------- --- telepathy-mission-control.spec +++ telepathy-mission-control.spec @@ -15,9 +15,11 @@ License: LGPLv2 URL: http://mission-control.sourceforge.net/ Source0: http://telepathy.freedesktop.org/releases/telepathy-mission-control/%{name}-%{version}.tar.gz +Source1: mktests.sh Source100: telepathy-mission-control.yaml Patch0: 0001-Update-to-current-ConnMan-API.patch Patch1: 0001-Always-allow-accounts-with-always_dispatch-to-connec.patch +Patch2: nemo-tests-dir-fix.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(dbus-1) >= 0.95 @@ -32,6 +34,8 @@ BuildRequires: libxslt BuildRequires: python BuildRequires: fdupes +BuildRequires: python-twisted +BuildRequires: dbus-python %description Mission Control, or MC, is a Telepathy component providing a way for @@ -41,6 +45,18 @@ account definitions and credentials. +%package tests +Summary: Tests package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: python-twisted +Requires: dbus-python + +%description tests +The %{name}-tests package contains tests and +tests.xml for automated testing. + + %package devel Summary: Headers files for %{name} Group: Development/Libraries @@ -59,7 +75,11 @@ %patch0 -p1 # 0001-Always-allow-accounts-with-always_dispatch-to-connec.patch %patch1 -p1 +# nemo-tests-dir-fix.patch +%patch2 -p1 # >> setup +%__cp $RPM_SOURCE_DIR/mktests.sh tests/twisted/ +%__chmod 0755 tests/twisted/mktests.sh # << setup %build @@ -73,11 +93,13 @@ --disable-Werror \ --enable-upower \ --with-connectivity=connman \ - --disable-conn-setting + --disable-conn-setting \ + --enable-installed-tests make %{?jobs:-j%jobs} # >> build post +tests/twisted/mktests.sh > tests/tests.xml # << build post %install @@ -90,6 +112,8 @@ gzip ChangeLog %fdupes %{buildroot}/%{_datadir}/gtk-doc/ %fdupes %{buildroot}/%{_includedir} +install -m 0644 tests/tests.xml $RPM_BUILD_ROOT/opt/tests/telepathy-mission-control/tests.xml +install -m 0644 tests/README $RPM_BUILD_ROOT/opt/tests/telepathy-mission-control/README # << install post @@ -109,6 +133,12 @@ #%{_datadir}/glib-2.0/schemas/im.telepathy.MissionControl.FromEmpathy.gschema.xml # << files +%files tests +%defattr(-,root,root,-) +/opt/tests/telepathy-mission-control/* +# >> files tests +# << files tests + %files devel %defattr(-,root,root,-) # >> files devel other changes: -------------- ++++++ mktests.sh (new) --- mktests.sh +++ mktests.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +cat <<EOF +<?xml version="1.0" encoding="UTF-8"?> +<testdefinition version="1.0"> + <suite name="telepathy-mission-control-tests"> + <description>Telepathy Mission Control tests</description> + <set name="telepathy-mission-control-tests-set"> +EOF + +for suite in $(cat tests/twisted/mc-twisted-tests.list) +do + suite_name=$(echo $suite|sed 's/\//_/') + cat <<EOF + <case name="$suite_name"> + <step>/opt/tests/telepathy-mission-control/twisted/run-test.sh $suite</step> + </case> +EOF +done + +cat <<EOF + </set> + </suite> +</testdefinition> +EOF + ++++++ nemo-tests-dir-fix.patch (new) --- nemo-tests-dir-fix.patch +++ nemo-tests-dir-fix.patch @@ -0,0 +1,12 @@ +diff -Naur telepathy-mission-control-5.14.0/configure.ac telepathy-mission-control-5.14.0-test-dir-fix/configure.ac +--- telepathy-mission-control-5.14.0/configure.ac 2012-10-03 17:08:47.000000000 +0000 ++++ telepathy-mission-control-5.14.0-test-dir-fix/configure.ac 2013-04-03 09:50:20.434116144 +0000 +@@ -129,7 +129,7 @@ + fi + AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], [test "x$installed_tests" = xyes]) + +-mctestsdir=${libdir}/telepathy-mission-control-tests ++mctestsdir=/opt/tests/telepathy-mission-control + AC_SUBST(mctestsdir) + + AC_ARG_WITH([accounts_dir], [AS_HELP_STRING([--with-accounts-dir=<path>],[Directory in which accounts were previously stored])]) ++++++ telepathy-mission-control.yaml --- telepathy-mission-control.yaml +++ telepathy-mission-control.yaml @@ -14,14 +14,20 @@ Sources: - http://telepathy.freedesktop.org/releases/telepathy-mission-control/%{name}-%{version}.tar.gz + - mktests.sh Patches: - 0001-Update-to-current-ConnMan-API.patch - 0001-Always-allow-accounts-with-always_dispatch-to-connec.patch + - nemo-tests-dir-fix.patch PkgBR: - libxslt - python - fdupes +# python-twisted and dbus-python are needed so the unit tests +# gets build and installed + - python-twisted + - dbus-python PkgConfigBR: - dbus-1 >= 0.95 - dbus-glib-1 >= 0.82 @@ -40,7 +46,21 @@ - --enable-upower - --with-connectivity=connman - --disable-conn-setting + - --enable-installed-tests + SubPackages: + - Name: tests + Summary: Tests package for %{name} + Group: Development/Libraries + Description: | + The %{name}-tests package contains tests and + tests.xml for automated testing. + Requires: + - python-twisted + - dbus-python + Files: + - /opt/tests/telepathy-mission-control/* + - Name: devel Summary: Headers files for %{name} Group: Development/Libraries
