I have made the following changes intended for : nemo:devel:mw / libnice 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/279 Thank You, Reto Zingg [This message was auto-generated] --- Request # 279: Messages from BOSS: State: review at 2013-05-02T16:49:08 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:nemo-devel / libnice -> nemo:devel:mw / libnice changes files: -------------- --- libnice.changes +++ libnice.changes @@ -0,0 +1,4 @@ +* Tue Apr 30 2013 Reto Zingg <[email protected]> - 0.1.4 +- update to version 0.1.4 +- add tests package + old: ---- libnice-0.1.2.tar.gz new: ---- INSIGNIFICANT gtk-doc.m4 libnice-0.1.4.tar.gz mktests.sh nemo-tests-install.patch spec files: ----------- --- libnice.spec +++ libnice.spec @@ -9,13 +9,17 @@ # << macros Summary: GLib ICE implementation -Version: 0.1.2 +Version: 0.1.4 Release: 1 Group: System/Libraries License: LGPLv2 and MPLv1.1 URL: http://nice.freedesktop.org/wiki/ Source0: http://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz +Source1: mktests.sh +Source2: INSIGNIFICANT +Source3: gtk-doc.m4 Source100: libnice.yaml +Patch0: nemo-tests-install.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(glib-2.0) >= 2.13 @@ -54,15 +58,41 @@ %{summary}. +%package tests +Summary: Tests and tests.xml for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description tests +The %{name}-tests package contains tests and a tests.xml file %{name}. + + +%package examples +Summary: Examples for libnice +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description examples +%{summary}. + + %prep %setup -q -n %{name}-%{version} +# nemo-tests-install.patch +%patch0 -p1 # >> setup +%__cp $RPM_SOURCE_DIR/mktests.sh tests/ +%__chmod 0755 tests/mktests.sh +%__cp $RPM_SOURCE_DIR/INSIGNIFICANT tests/ +%__mkdir m4 +%__cp $RPM_SOURCE_DIR/gtk-doc.m4 m4/ # << setup %build # >> build pre +autoreconf -I m4 # << build pre %configure --disable-static @@ -71,6 +101,7 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?jobs:-j%jobs} +tests/mktests.sh > tests/tests.xml # << build post %install @@ -80,6 +111,7 @@ # >> install post %make_install +install -m 0644 tests/tests.xml $RPM_BUILD_ROOT/opt/tests/%{name}/tests.xml # << install post @@ -93,7 +125,7 @@ %doc NEWS README COPYING COPYING.LGPL COPYING.MPL %{_bindir}/stunbdc %{_bindir}/stund -%{_libdir}/gstreamer-0.10/libgstnice.so +%{_libdir}/gstreamer-0.10/libgstnice010.so %{_libdir}/*.so.* # << files @@ -110,3 +142,17 @@ # >> files docs %{_datadir}/gtk-doc/html/%{name}/ # << files docs + +%files tests +%defattr(-,root,root,-) +/opt/tests/%{name}/* +# >> files tests +# << files tests + +%files examples +%defattr(-,root,root,-) +# >> files examples +%{_bindir}/sdp-example +%{_bindir}/simple-example +%{_bindir}/threaded-example +# << files examples other changes: -------------- ++++++ INSIGNIFICANT (new) --- INSIGNIFICANT +++ INSIGNIFICANT @@ -0,0 +1 @@ +test-new-dribble - ERROR:test-new-dribble.c:459:standard_test: assertion failed: (global_lagent_state == NICE_COMPONENT_STATE_GATHERING && !lagent_candidate_gathering_done) ++++++ gtk-doc.m4 (new) --- gtk-doc.m4 +++ gtk-doc.m4 @@ -0,0 +1,71 @@ +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + dnl check for tools we added during development + AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + + if test x$enable_gtk_doc = xyes; then + ifelse([$1],[], + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + fi + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +]) ++++++ libnice-0.1.2.tar.gz -> libnice-0.1.4.tar.gz (16079 lines skipped) ++++++ libnice.yaml --- libnice.yaml +++ libnice.yaml @@ -1,12 +1,17 @@ Name: libnice Summary: GLib ICE implementation -Version: 0.1.2 +Version: 0.1.4 Release: 1 Group: System/Libraries License: LGPLv2 and MPLv1.1 URL: http://nice.freedesktop.org/wiki/ Sources: - http://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz + - mktests.sh + - INSIGNIFICANT + - gtk-doc.m4 +Patches: + - nemo-tests-install.patch Description: | libnice is an implementation of the IETF draft Interactive Connectivity Establishment standard (ICE). ICE is useful for applications that want to @@ -26,6 +31,8 @@ # Not set as seds needs to be done after configure. Builder: none Configure: configure +#ConfigOptions: +# - --enable-gtk-doc-html=no SubPackages: - Name: devel @@ -43,3 +50,17 @@ Description: | %{summary}. + - Name: tests + Summary: Tests and tests.xml for %{name} + Group: Development/Libraries + Description: | + The %{name}-tests package contains tests and a tests.xml file %{name}. + Files: + - /opt/tests/%{name}/* + + - Name: examples + Summary: Examples for libnice + Group: Development/Libraries + Description: | + %{summary}. + ++++++ mktests.sh (new) --- mktests.sh +++ mktests.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +cat <<EOF +<?xml version="1.0" encoding="UTF-8"?> +<testdefinition version="1.0"> + <suite name="libnice-tests"> + <description>Libnice tests</description> + <set name="libnice-unit-tests"> +EOF + +for testcase in $(cat tests/libnice-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/libnice/bin/$testcase</step> + </case> +EOF +done + +cat <<EOF + <case name="test-pseudotcp-random"> + <step>dd if=/dev/urandom of=/tmp/rand count=1024 ibs=1024</step> + <step>/opt/tests/libnice/bin/test-pseudotcp /tmp/rand /tmp/rand.copy</step> + <step>diff /tmp/rand /tmp/rand.copy</step> + <step>rm /tmp/rand /tmp/rand.copy</step> + </case> + </set> + </suite> +</testdefinition> +EOF ++++++ nemo-tests-install.patch (new) --- nemo-tests-install.patch +++ nemo-tests-install.patch @@ -0,0 +1,18 @@ +diff -Naur libnice-0.1.4/tests/Makefile.am libnice-0.1.4-install-nemo-tests/tests/Makefile.am +--- libnice-0.1.4/tests/Makefile.am 2012-09-12 18:33:35.000000000 +0000 ++++ libnice-0.1.4-install-nemo-tests/tests/Makefile.am 2013-05-02 12:52:37.000000000 +0000 +@@ -70,3 +70,14 @@ + all-local: + chmod a+x $(srcdir)/check-test-fullmode-with-stun.sh + chmod a+x $(srcdir)/test-pseudotcp-random.sh ++ ++nemotestsbindir = /opt/tests/libnice/bin ++nemotestsbin_PROGRAMS = $(check_PROGRAMS) ++nemotestsbin_SCRIPTS = $(dist_check_SCRIPTS) ++ ++libnice-tests.list: ++ $(AM_V_GEN)echo $(check_PROGRAMS) > $@ ++ ++nemotestsdatadir = /opt/tests/libnice/data ++nobase_nemotestsdata_DATA = libnice-tests.list ++
