April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit wxWidgets for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package wxWidgets for openSUSE:Factory checked in at 2014-04-23 17:34:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets (Old) and /work/SRC/openSUSE:Factory/.wxWidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wxWidgets" Changes: -------- wxWidgets-wxcontainer.changes: same change wxWidgets-wxcontainer24c.changes: same change --- /work/SRC/openSUSE:Factory/wxWidgets/wxWidgets.changes 2013-10-06 14:33:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets.new/wxWidgets.changes 2014-04-23 17:34:15.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 4 10:11:30 UTC 2014 - seiler(a)b1-systems.de + +- removed unneeded 32bit packages (*-compat-lib*) which has no libraries + +------------------------------------------------------------------- +Mon Feb 17 13:57:03 UTC 2014 - seiler(a)b1-systems.de + +- added baselibs.conf to add *-32bit packages + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxWidgets-ansi.spec ++++++ --- /var/tmp/diff_new_pack.YxeE5x/_old 2014-04-23 17:34:16.000000000 +0200 +++ /var/tmp/diff_new_pack.YxeE5x/_new 2014-04-23 17:34:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wxWidgets-ansi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -106,6 +106,7 @@ # This script is not used during build, but it makes possible to # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh +Source50: baselibs.conf Patch0: wxGTK-2.6.3.3-decl.patch Patch1: wxGTK-enable-wxrc.patch # PATCH-FEATURE-OPENSUSE wxWidgets-config-force-rpath.patch sbrabec(a)suse.cz -- Force rpath use for installed libraries. wxWidgets-wxcontainer.spec: same change wxWidgets-wxcontainer24c.spec: same change ++++++ wxWidgets.spec ++++++ --- /var/tmp/diff_new_pack.YxeE5x/_old 2014-04-23 17:34:16.000000000 +0200 +++ /var/tmp/diff_new_pack.YxeE5x/_new 2014-04-23 17:34:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wxWidgets # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -116,6 +116,7 @@ Patch4: wxWidgets-find-wx-provides-bash3.patch # PATCH-FIX-UPSTREAM wxWidgets-to-wxpython-2.8.12.1.patch sbrabec(a)suse.cz -- wxPython changes backport. Patch5: wxWidgets-to-wxpython-2.8.12.1.patch +Source50: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf ++++++ baselibs.conf ++++++ libwx_base-2_8-0-wxcontainer libwx_base_net-2_8-0-wxcontainer libwx_base_xml-2_8-0-wxcontainer libwx_baseu-2_8-0-stl libwx_baseu-2_8-0-wxcontainer libwx_baseu-2_8-0-wxcontainer24c libwx_baseu_net-2_8-0-stl libwx_baseu_net-2_8-0-wxcontainer libwx_baseu_net-2_8-0-wxcontainer24c libwx_baseu_xml-2_8-0-stl libwx_baseu_xml-2_8-0-wxcontainer libwx_baseu_xml-2_8-0-wxcontainer24c libwx_gtk2_adv-2_8-0-wxcontainer libwx_gtk2_aui-2_8-0-wxcontainer libwx_gtk2_core-2_8-0-wxcontainer libwx_gtk2_fl-2_8-0-wxcontainer libwx_gtk2_gizmos-2_8-0-wxcontainer libwx_gtk2_gizmos_xrc-2_8-0-wxcontainer libwx_gtk2_gl-2_8-0-wxcontainer libwx_gtk2_html-2_8-0-wxcontainer libwx_gtk2_media-2_8-0-wxcontainer libwx_gtk2_mmedia-2_8-0-wxcontainer libwx_gtk2_ogl-2_8-0-wxcontainer libwx_gtk2_plot-2_8-0-wxcontainer libwx_gtk2_qa-2_8-0-wxcontainer libwx_gtk2_richtext-2_8-0-wxcontainer libwx_gtk2_stc-2_8-0-wxcontainer libwx_gtk2_svg-2_8-0-wxcontainer libwx_gtk2_xrc-2_8-0-wxcontainer libwx_gtk2u_adv-2_8-0-stl libwx_gtk2u_adv-2_8-0-wxcontainer libwx_gtk2u_adv-2_8-0-wxcontainer24c libwx_gtk2u_aui-2_8-0-stl libwx_gtk2u_aui-2_8-0-wxcontainer libwx_gtk2u_aui-2_8-0-wxcontainer24c libwx_gtk2u_core-2_8-0-stl libwx_gtk2u_core-2_8-0-wxcontainer libwx_gtk2u_core-2_8-0-wxcontainer24c libwx_gtk2u_fl-2_8-0-wxcontainer libwx_gtk2u_fl-2_8-0-wxcontainer24c libwx_gtk2u_gizmos-2_8-0-stl libwx_gtk2u_gizmos-2_8-0-wxcontainer libwx_gtk2u_gizmos-2_8-0-wxcontainer24c libwx_gtk2u_gizmos_xrc-2_8-0-stl libwx_gtk2u_gizmos_xrc-2_8-0-wxcontainer libwx_gtk2u_gizmos_xrc-2_8-0-wxcontainer24c libwx_gtk2u_gl-2_8-0-stl libwx_gtk2u_gl-2_8-0-wxcontainer libwx_gtk2u_gl-2_8-0-wxcontainer24c libwx_gtk2u_html-2_8-0-stl libwx_gtk2u_html-2_8-0-wxcontainer libwx_gtk2u_html-2_8-0-wxcontainer24c libwx_gtk2u_media-2_8-0-stl libwx_gtk2u_media-2_8-0-wxcontainer libwx_gtk2u_media-2_8-0-wxcontainer24c libwx_gtk2u_mmedia-2_8-0-stl libwx_gtk2u_mmedia-2_8-0-wxcontainer libwx_gtk2u_mmedia-2_8-0-wxcontainer24c libwx_gtk2u_ogl-2_8-0-wxcontainer libwx_gtk2u_ogl-2_8-0-wxcontainer24c libwx_gtk2u_plot-2_8-0-stl libwx_gtk2u_plot-2_8-0-wxcontainer libwx_gtk2u_plot-2_8-0-wxcontainer24c libwx_gtk2u_qa-2_8-0-stl libwx_gtk2u_qa-2_8-0-wxcontainer libwx_gtk2u_qa-2_8-0-wxcontainer24c libwx_gtk2u_richtext-2_8-0-stl libwx_gtk2u_richtext-2_8-0-wxcontainer libwx_gtk2u_richtext-2_8-0-wxcontainer24c libwx_gtk2u_stc-2_8-0-stl libwx_gtk2u_stc-2_8-0-wxcontainer libwx_gtk2u_stc-2_8-0-wxcontainer24c libwx_gtk2u_svg-2_8-0-stl libwx_gtk2u_svg-2_8-0-wxcontainer libwx_gtk2u_svg-2_8-0-wxcontainer24c libwx_gtk2u_xrc-2_8-0-stl libwx_gtk2u_xrc-2_8-0-wxcontainer libwx_gtk2u_xrc-2_8-0-wxcontainer24c wxWidgets-ansi-plugin-sound_sdl-2_8-wxcontainer wxWidgets-plugin-sound_sdlu-2_8-stl wxWidgets-wxcontainer-plugin-sound_sdlu-2_8-wxcontainer wxWidgets-wxcontainer24c-plugin-sound_sdlu-2_8-wxcontainer24c -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-IPython for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package python3-IPython for openSUSE:Factory checked in at 2014-04-23 17:33:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-IPython (Old) and /work/SRC/openSUSE:Factory/.python3-IPython.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-IPython" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-IPython/python3-IPython.changes 2014-03-09 18:43:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-IPython.new/python3-IPython.changes 2014-04-23 17:33:33.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Apr 3 00:25:38 UTC 2014 - arun(a)gmx.de + +- updated to 2.0.0 + + The principal milestones of 2.0 are: + + * interactive widgets for the notebook + * directory navigation in the notebook dashboard + * persistent URLs for notebooks + * a new modal user interface in the notebook + * a security model for notebooks + + more details at http://ipython.org/ipython-doc/2/whatsnew/version2.0.html + + * changes in spec file: + - manual remove binaries that don't end in *3 + - added dependencies matplotlib, numpydoc, updated version for tornado + - logger, color and irunner are not provided anymore, remove from file list + - Copying is now in rst format + - name and location of desktop files changed + - removed if case for >12.2 version, since IPython only builds for >12.2 + +------------------------------------------------------------------- Old: ---- ipython-1.2.1.tar.gz New: ---- ipython-2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-IPython.spec ++++++ --- /var/tmp/diff_new_pack.SV7jGp/_old 2014-04-23 17:33:34.000000000 +0200 +++ /var/tmp/diff_new_pack.SV7jGp/_new 2014-04-23 17:33:34.000000000 +0200 @@ -18,7 +18,7 @@ %define modname IPython Name: python3-%{modname} -Version: 1.2.1 +Version: 2.0.0 Release: 0 Source0: https://pypi.python.org/packages/source/i/ipython/ipython-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,7 +34,9 @@ BuildRequires: python3-curses BuildRequires: python3-devel BuildRequires: python3-distribute +BuildRequires: python3-matplotlib BuildRequires: python3-nose >= 0.10.1 +BuildRequires: python3-numpydoc BuildRequires: python3-opengl BuildRequires: python3-pymongo BuildRequires: python3-pyzmq-devel >= 2.1.11 @@ -58,8 +60,8 @@ Requires: python3-Pygments Requires: python3-qt4 #ipython notebook -BuildRequires: python3-tornado >= 2.0 -Requires: python3-tornado >= 2.0 +BuildRequires: python3-tornado >= 3.1 +Requires: python3-tornado >= 3.1 #documentation BuildRequires: graphviz BuildRequires: graphviz-gnome @@ -115,7 +117,7 @@ # move automatically installed documentation to the right directory install -d -m 755 %{buildroot}%{_docdir}/ -mv -f %{buildroot}/usr/share/doc/ipython/ %{buildroot}%{_docdir}/%{name} +#mv -f %{buildroot}/usr/share/doc/IPython/ %{buildroot}%{_docdir}/%{name} # does not seem to work with python 3 #make docs @@ -134,9 +136,16 @@ rm -f %{buildroot}/%{python3_sitelib}/IPython/.git_commit_info.ini rm -f %{buildroot}/%{_docdir}/%{name}/manual/.buildinfo +# remove all executables that don't follow the bin/*3 convention for python3 +rm %{buildroot}/%{_bindir}/ipcluster +rm %{buildroot}/%{_bindir}/ipcontroller +rm %{buildroot}/%{_bindir}/ipengine +rm %{buildroot}/%{_bindir}/iptest +rm %{buildroot}/%{_bindir}/ipython + # Fix .desktop files for python 3 -mv examples/core/ipython-qtconsole.desktop ./ipython3-qtconsole.desktop -mv examples/core/ipython.desktop ./ipython3.desktop +mv examples/IPython\ Kernel/ipython.desktop ./ipython3.desktop +mv examples/IPython\ Kernel/ipython-qtconsole.desktop ./ipython3-qtconsole.desktop sed -i 's/Python/Python 3/g' *.desktop sed -i 's/ipython/ipython3/g' *.desktop @@ -163,36 +172,26 @@ %files %defattr(-,root,root) -%doc COPYING.txt README.rst +%doc COPYING.rst README.rst %{_bindir}/ipcluster3 %{_bindir}/ipcontroller3 %{_bindir}/ipengine3 -%{_bindir}/iplogger3 %{_bindir}/iptest3 %{_bindir}/ipython3 -%{_bindir}/irunner3 -%{_bindir}/pycolor3 %{_mandir}/man1/ipcluster3.1.gz %{_mandir}/man1/ipcontroller3.1.gz %{_mandir}/man1/ipengine3.1.gz -%{_mandir}/man1/iplogger3.1.gz %{_mandir}/man1/ipython3.1.gz -%{_mandir}/man1/irunner3.1.gz -%{_mandir}/man1/pycolor3.1.gz %{_datadir}/applications/ipython3-qtconsole.desktop -#%{_datadir}/applications/ipython3-sh.desktop %{_datadir}/applications/ipython3.desktop %{_datadir}/icons/hicolor/ %{python3_sitelib}/%{modname} %{python3_sitelib}/ipython-%{version}-py*.egg-info -%if 0%{?suse_version} > 1220 -%exclude %{_docdir}/%{name}/examples/ -%endif %files doc %defattr(-,root,root) %doc %{_docdir}/%{name} -%exclude %{_docdir}/%{name}/COPYING.txt +%exclude %{_docdir}/%{name}/COPYING.rst %exclude %{_docdir}/%{name}/README.rst %changelog ++++++ ipython-1.2.1.tar.gz -> ipython-2.0.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/python3-IPython/ipython-1.2.1.tar.gz /work/SRC/openSUSE:Factory/.python3-IPython.new/ipython-2.0.0.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phonon-backend-gstreamer for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package phonon-backend-gstreamer for openSUSE:Factory checked in at 2014-04-23 17:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon-backend-gstreamer (Old) and /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phonon-backend-gstreamer" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon-backend-gstreamer/phonon-backend-gstreamer.changes 2014-04-04 16:41:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon-backend-gstreamer.new/phonon-backend-gstreamer.changes 2014-04-23 17:33:12.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 18 00:06:59 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update tarball to latest snapshot + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon-backend-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.0SyKuG/_old 2014-04-23 17:33:12.000000000 +0200 +++ /var/tmp/diff_new_pack.0SyKuG/_new 2014-04-23 17:33:12.000000000 +0200 @@ -20,7 +20,7 @@ %define _phonon_version 4.7.1 Name: phonon-backend-gstreamer -Version: 4.7.2~git20140403 +Version: 4.7.2~git20140418 Release: 0 Summary: Phonon Multimedia Platform Abstraction License: LGPL-2.1 or LGPL-3.0 ++++++ phonon-backend-gstreamer-4.7.2git.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.cpp new/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.cpp --- old/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.cpp 2014-04-02 17:35:01.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.cpp 2014-04-08 20:10:01.000000000 +0200 @@ -18,6 +18,7 @@ #include "videowidget.h" #include <QtCore/QEvent> +#include <QtCore/QThread> #include <QtGui/QResizeEvent> #include <QtGui/QPalette> #include <QtGui/QImage> @@ -89,6 +90,18 @@ render->setOverlay(); } +void Gstreamer::VideoWidget::syncX() +{ + Q_ASSERT(QThread::currentThread() == QApplication::instance()->thread()); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#warning syncx +// QApplication::syncX(); +#else + QApplication::syncX(); +#endif +} + void VideoWidget::finalizeLink() { connect(root()->pipeline(), SIGNAL(mouseOverActive(bool)), this, SLOT(mouseOverActive(bool))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.h new/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.h --- old/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.h 2014-04-02 17:35:01.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.h 2014-04-08 20:10:01.000000000 +0200 @@ -87,6 +87,7 @@ public slots: void setMovieSize(const QSize &size); void mouseOverActive(bool active); + void syncX(); protected: virtual void keyPressEvent(QKeyEvent *event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.7.2git/gstreamer/x11renderer.cpp new/phonon-backend-gstreamer-4.7.2git/gstreamer/x11renderer.cpp --- old/phonon-backend-gstreamer-4.7.2git/gstreamer/x11renderer.cpp 2014-04-02 17:35:01.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.2git/gstreamer/x11renderer.cpp 2014-04-08 20:10:01.000000000 +0200 @@ -176,14 +176,7 @@ #endif ) { WId windowId = m_renderWidget->winId(); - // Even if we have created a winId at this point, other X applications - // need to be aware of it. -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#warning syncx -// QApplication::syncX(); -#else - QApplication::syncX(); -#endif // QT_VERSION + #if GST_VERSION >= GST_VERSION_CHECK (1,0,0,0) gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(m_videoSink), windowId); #elif GST_VERSION >= GST_VERSION_CHECK(0,10,31,0) @@ -198,12 +191,11 @@ void X11Renderer::windowExposed() { -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#warning syncx -// QApplication::syncX(); -#else - QApplication::syncX(); -#endif //QT_VERSION + // This can be invoked within a callchain in an arbitrary thread, so make + // sure we call syncX() from the main thread + QMetaObject::invokeMethod(m_videoWidget, "syncX", + Qt::QueuedConnection); + if (m_videoSink && #if GST_VERSION < GST_VERSION_CHECK (1,0,0,0) GST_IS_X_OVERLAY(m_videoSink) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Try-Tiny for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package perl-Try-Tiny for openSUSE:Factory checked in at 2014-04-23 17:32:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Try-Tiny (Old) and /work/SRC/openSUSE:Factory/.perl-Try-Tiny.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Try-Tiny" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Try-Tiny/perl-Try-Tiny.changes 2014-02-12 07:07:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Try-Tiny.new/perl-Try-Tiny.changes 2014-04-23 17:32:49.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Apr 21 20:24:52 UTC 2014 - mardnh(a)gmx.de + +- updated to 0.21 + - 0.21 2014-04-15 + - also skip the test if Capture::Tiny is too old (Martin Popel, #17) + + - 0.20 2014-03-21 + - documentation updates (Flimm, #15) + +------------------------------------------------------------------- Old: ---- Try-Tiny-0.19.tar.gz New: ---- Try-Tiny-0.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Try-Tiny.spec ++++++ --- /var/tmp/diff_new_pack.nRcSfJ/_old 2014-04-23 17:32:50.000000000 +0200 +++ /var/tmp/diff_new_pack.nRcSfJ/_new 2014-04-23 17:32:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Try-Tiny -Version: 0.19 +Version: 0.21 Release: 0 %define cpan_name Try-Tiny Summary: Minimal try/catch with proper preservation of $@ ++++++ Try-Tiny-0.19.tar.gz -> Try-Tiny-0.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/Changes new/Try-Tiny-0.21/Changes --- old/Try-Tiny-0.19/Changes 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/Changes 2014-04-15 15:46:31.000000000 +0200 @@ -1,5 +1,11 @@ Revision history for Try-Tiny +0.21 2014-04-15 + - also skip the test if Capture::Tiny is too old (Martin Popel, #17) + +0.20 2014-03-21 + - documentation updates (Flimm, #15) + 0.19 2014-01-22 - fix an obscure issue with loading modules during global destruction (ilmari, #11) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/MANIFEST new/Try-Tiny-0.21/MANIFEST --- old/Try-Tiny-0.19/MANIFEST 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/MANIFEST 2014-04-15 15:46:31.000000000 +0200 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.012. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.014. Changes LICENSE MANIFEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/META.json new/Try-Tiny-0.21/META.json --- old/Try-Tiny-0.19/META.json 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/META.json 2014-04-15 15:46:31.000000000 +0200 @@ -5,7 +5,7 @@ "Jesse Luehrs <doy(a)tozt.net>" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 5.012, CPAN::Meta::Converter version 2.120921", + "generated_by" : "Dist::Zilla version 5.014, CPAN::Meta::Converter version 2.140640", "license" : [ "mit" ], @@ -23,6 +23,8 @@ "develop" : { "requires" : { "Pod::Coverage::TrustPod" : "0", + "Test::More" : "0", + "Test::NoTabs" : "0", "Test::Pod" : "1.41", "Test::Pod::Coverage" : "1.08" } @@ -45,7 +47,7 @@ "File::Spec" : "0", "IO::Handle" : "0", "IPC::Open3" : "0", - "Test::More" : "0.88", + "Test::More" : "0", "if" : "0" } } @@ -53,7 +55,7 @@ "provides" : { "Try::Tiny" : { "file" : "lib/Try/Tiny.pm", - "version" : "0.19" + "version" : "0.21" } }, "release_status" : "stable", @@ -68,91 +70,101 @@ "web" : "https://github.com/doy/try-tiny" } }, - "version" : "0.19", + "version" : "0.21", "x_Dist_Zilla" : { "perl" : { - "version" : "5.018001" + "version" : "5.018002" }, "plugins" : [ { "class" : "Dist::Zilla::Plugin::GatherDir", "name" : "@DOY/GatherDir", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::PruneCruft", "name" : "@DOY/PruneCruft", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::ManifestSkip", "name" : "@DOY/ManifestSkip", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::MetaYAML", "name" : "@DOY/MetaYAML", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "@DOY/License", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::Readme", "name" : "@DOY/Readme", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::RunExtraTests", + "config" : { + "Dist::Zilla::Role::TestRunner" : { + "default_jobs" : 1 + } + }, "name" : "@DOY/RunExtraTests", - "version" : "0.011" + "version" : "0.018" }, { "class" : "Dist::Zilla::Plugin::ExecDir", "name" : "@DOY/ExecDir", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::ShareDir", "name" : "@DOY/ShareDir", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::MakeMaker", + "config" : { + "Dist::Zilla::Role::TestRunner" : { + "default_jobs" : 1 + } + }, "name" : "@DOY/MakeMaker", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "@DOY/Manifest", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::TestRelease", "name" : "@DOY/TestRelease", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::ConfirmRelease", "name" : "@DOY/ConfirmRelease", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "@DOY/MetaConfig", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "@DOY/MetaJSON", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::NextRelease", "name" : "@DOY/NextRelease", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::CheckChangesHasContent", @@ -162,7 +174,7 @@ { "class" : "Dist::Zilla::Plugin::PkgVersion", "name" : "@DOY/PkgVersion", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::Authority", @@ -172,17 +184,27 @@ { "class" : "Dist::Zilla::Plugin::PodCoverageTests", "name" : "@DOY/PodCoverageTests", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "@DOY/PodSyntaxTests", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::NoTabsTests", + "config" : { + "Dist::Zilla::Plugin::Test::NoTabs" : { + "module_finder" : [ + ":InstallModules" + ], + "script_finder" : [ + ":ExecFiles" + ] + } + }, "name" : "@DOY/NoTabsTests", - "version" : "0.01" + "version" : "0.06" }, { "class" : "Dist::Zilla::Plugin::EOLTests", @@ -193,6 +215,7 @@ "class" : "Dist::Zilla::Plugin::Test::Compile", "config" : { "Dist::Zilla::Plugin::Test::Compile" : { + "filename" : "t/00-compile.t", "module_finder" : [ ":InstallModules" ], @@ -202,7 +225,7 @@ } }, "name" : "@DOY/Test::Compile", - "version" : "2.021" + "version" : "2.039" }, { "class" : "Dist::Zilla::Plugin::Metadata", @@ -212,27 +235,27 @@ { "class" : "Dist::Zilla::Plugin::MetaResources", "name" : "@DOY/MetaResources", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::Git::Check", "name" : "@DOY/Git::Check", - "version" : "2.014" + "version" : "2.020" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", "name" : "@DOY/Git::Commit", - "version" : "2.014" + "version" : "2.020" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", "name" : "@DOY/Git::Tag", - "version" : "2.014" + "version" : "2.020" }, { "class" : "Dist::Zilla::Plugin::Git::NextVersion", "name" : "@DOY/Git::NextVersion", - "version" : "2.014" + "version" : "2.020" }, { "class" : "Dist::Zilla::Plugin::ContributorsFromGit", @@ -241,28 +264,129 @@ }, { "class" : "Dist::Zilla::Plugin::MetaProvides::Package", + "config" : { + "Dist::Zilla::Plugin::MetaProvides::Package" : { + "finder_objects" : [ + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : "@DOY/MetaProvides::Package/AUTOVIV/:InstallModulesPM", + "version" : "5.014" + } + ] + }, + "Dist::Zilla::Role::MetaProvider::Provider" : { + "inherit_missing" : "1", + "inherit_version" : "1", + "meta_noindex" : "1" + } + }, "name" : "@DOY/MetaProvides::Package", - "version" : "1.14000003" + "version" : "2.000001" }, { "class" : "Dist::Zilla::Plugin::PodWeaver", + "config" : { + "Dist::Zilla::Plugin::PodWeaver" : { + "finder" : [ + ":InstallModules", + ":ExecFiles" + ], + "plugins" : [ + { + "class" : "Pod::Weaver::Plugin::EnsurePod5", + "name" : "@CorePrep/EnsurePod5", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Plugin::H1Nester", + "name" : "@CorePrep/H1Nester", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Plugin::SingleEncoding", + "name" : "@Default/SingleEncoding", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Name", + "name" : "@Default/Name", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Version", + "name" : "@Default/Version", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Region", + "name" : "@Default/prelude", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Generic", + "name" : "SYNOPSIS", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Generic", + "name" : "DESCRIPTION", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Generic", + "name" : "OVERVIEW", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Collect", + "name" : "ATTRIBUTES", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Collect", + "name" : "METHODS", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Collect", + "name" : "FUNCTIONS", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Leftovers", + "name" : "@Default/Leftovers", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Region", + "name" : "@Default/postlude", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Authors", + "name" : "@Default/Authors", + "version" : "4.006" + }, + { + "class" : "Pod::Weaver::Section::Legal", + "name" : "@Default/Legal", + "version" : "4.006" + } + ] + } + }, "name" : "@DOY/PodWeaver", - "version" : "3.101642" + "version" : "4.005" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "@DOY/UploadToCPAN", - "version" : "5.012" - }, - { - "class" : "Dist::Zilla::Plugin::ContributorsFromGit", - "name" : "ContributorsFromGit", - "version" : "0.006" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::AutoPrereqs", "name" : "AutoPrereqs", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -273,7 +397,7 @@ } }, "name" : "Prereqs", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -284,47 +408,52 @@ } }, "name" : "TestRecommends", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":AllFiles", - "version" : "5.012" + "version" : "5.014" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":NoFiles", - "version" : "5.012" + "version" : "5.014" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : "@DOY/MetaProvides::Package/AUTOVIV/:InstallModulesPM", + "version" : "5.014" } ], "zilla" : { @@ -332,14 +461,15 @@ "config" : { "is_trial" : "0" }, - "version" : "5.012" + "version" : "5.014" } }, "x_authority" : "cpan:NUFFIN", "x_contributors" : [ "Alex <alex(a)koban.(none)>", "Andrew Yates <ayates(a)haddock.local>", - "Dagfinn Ilmari Manns\u00e5ker <ilmari(a)ilmari.org>", + "Dagfinn Ilmari Mannsåker <ilmari(a)ilmari.org>", + "David Lowe <davidl(a)lokku.com>", "Glenn Fowler <cebjyre(a)cpan.org>", "Graham Knop <haarg(a)haarg.org>", "Hans Dieter Pearcey <hdp(a)weftsoar.net>", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/META.yml new/Try-Tiny-0.21/META.yml --- old/Try-Tiny-0.19/META.yml 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/META.yml 2014-04-15 15:46:31.000000000 +0200 @@ -4,190 +4,280 @@ - 'Yuval Kogman <nothingmuch(a)woobling.org>' - 'Jesse Luehrs <doy(a)tozt.net>' build_requires: - File::Spec: 0 - IO::Handle: 0 - IPC::Open3: 0 - Test::More: 0.88 - if: 0 + File::Spec: '0' + IO::Handle: '0' + IPC::Open3: '0' + Test::More: '0' + if: '0' configure_requires: - ExtUtils::MakeMaker: 6.30 + ExtUtils::MakeMaker: '6.30' dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.012, CPAN::Meta::Converter version 2.120921' +generated_by: 'Dist::Zilla version 5.014, CPAN::Meta::Converter version 2.140640' license: mit meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Try-Tiny provides: Try::Tiny: file: lib/Try/Tiny.pm - version: 0.19 + version: '0.21' requires: - Carp: 0 - Exporter: 5.57 - constant: 0 - perl: 5.006 - strict: 0 - warnings: 0 + Carp: '0' + Exporter: '5.57' + constant: '0' + perl: '5.006' + strict: '0' + warnings: '0' resources: bugtracker: https://github.com/doy/try-tiny/issues homepage: http://metacpan.org/release/Try-Tiny repository: git://github.com/doy/try-tiny.git -version: 0.19 +version: '0.21' x_Dist_Zilla: perl: - version: 5.018001 + version: '5.018002' plugins: - class: Dist::Zilla::Plugin::GatherDir name: '@DOY/GatherDir' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::PruneCruft name: '@DOY/PruneCruft' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::ManifestSkip name: '@DOY/ManifestSkip' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::MetaYAML name: '@DOY/MetaYAML' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::License name: '@DOY/License' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::Readme name: '@DOY/Readme' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::RunExtraTests + config: + Dist::Zilla::Role::TestRunner: + default_jobs: 1 name: '@DOY/RunExtraTests' - version: 0.011 + version: '0.018' - class: Dist::Zilla::Plugin::ExecDir name: '@DOY/ExecDir' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::ShareDir name: '@DOY/ShareDir' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::MakeMaker + config: + Dist::Zilla::Role::TestRunner: + default_jobs: 1 name: '@DOY/MakeMaker' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::Manifest name: '@DOY/Manifest' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::TestRelease name: '@DOY/TestRelease' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::ConfirmRelease name: '@DOY/ConfirmRelease' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::MetaConfig name: '@DOY/MetaConfig' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::MetaJSON name: '@DOY/MetaJSON' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::NextRelease name: '@DOY/NextRelease' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::CheckChangesHasContent name: '@DOY/CheckChangesHasContent' - version: 0.006 + version: '0.006' - class: Dist::Zilla::Plugin::PkgVersion name: '@DOY/PkgVersion' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::Authority name: '@DOY/Authority' - version: 1.006 + version: '1.006' - class: Dist::Zilla::Plugin::PodCoverageTests name: '@DOY/PodCoverageTests' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::PodSyntaxTests name: '@DOY/PodSyntaxTests' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::NoTabsTests + config: + Dist::Zilla::Plugin::Test::NoTabs: + module_finder: + - ':InstallModules' + script_finder: + - ':ExecFiles' name: '@DOY/NoTabsTests' - version: 0.01 + version: '0.06' - class: Dist::Zilla::Plugin::EOLTests name: '@DOY/EOLTests' - version: 0.02 + version: '0.02' - class: Dist::Zilla::Plugin::Test::Compile config: Dist::Zilla::Plugin::Test::Compile: + filename: t/00-compile.t module_finder: - ':InstallModules' script_finder: - ':ExecFiles' name: '@DOY/Test::Compile' - version: 2.021 + version: '2.039' - class: Dist::Zilla::Plugin::Metadata name: '@DOY/Metadata' - version: 3.03 + version: '3.03' - class: Dist::Zilla::Plugin::MetaResources name: '@DOY/MetaResources' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::Git::Check name: '@DOY/Git::Check' - version: 2.014 + version: '2.020' - class: Dist::Zilla::Plugin::Git::Commit name: '@DOY/Git::Commit' - version: 2.014 + version: '2.020' - class: Dist::Zilla::Plugin::Git::Tag name: '@DOY/Git::Tag' - version: 2.014 + version: '2.020' - class: Dist::Zilla::Plugin::Git::NextVersion name: '@DOY/Git::NextVersion' - version: 2.014 + version: '2.020' - class: Dist::Zilla::Plugin::ContributorsFromGit name: '@DOY/ContributorsFromGit' - version: 0.006 + version: '0.006' - class: Dist::Zilla::Plugin::MetaProvides::Package + config: + Dist::Zilla::Plugin::MetaProvides::Package: + finder_objects: + - + class: Dist::Zilla::Plugin::FinderCode + name: '@DOY/MetaProvides::Package/AUTOVIV/:InstallModulesPM' + version: '5.014' + Dist::Zilla::Role::MetaProvider::Provider: + inherit_missing: '1' + inherit_version: '1' + meta_noindex: '1' name: '@DOY/MetaProvides::Package' - version: 1.14000003 + version: '2.000001' - class: Dist::Zilla::Plugin::PodWeaver + config: + Dist::Zilla::Plugin::PodWeaver: + finder: + - ':InstallModules' + - ':ExecFiles' + plugins: + - + class: Pod::Weaver::Plugin::EnsurePod5 + name: '@CorePrep/EnsurePod5' + version: '4.006' + - + class: Pod::Weaver::Plugin::H1Nester + name: '@CorePrep/H1Nester' + version: '4.006' + - + class: Pod::Weaver::Plugin::SingleEncoding + name: '@Default/SingleEncoding' + version: '4.006' + - + class: Pod::Weaver::Section::Name + name: '@Default/Name' + version: '4.006' + - + class: Pod::Weaver::Section::Version + name: '@Default/Version' + version: '4.006' + - + class: Pod::Weaver::Section::Region + name: '@Default/prelude' + version: '4.006' + - + class: Pod::Weaver::Section::Generic + name: SYNOPSIS + version: '4.006' + - + class: Pod::Weaver::Section::Generic + name: DESCRIPTION + version: '4.006' + - + class: Pod::Weaver::Section::Generic + name: OVERVIEW + version: '4.006' + - + class: Pod::Weaver::Section::Collect + name: ATTRIBUTES + version: '4.006' + - + class: Pod::Weaver::Section::Collect + name: METHODS + version: '4.006' + - + class: Pod::Weaver::Section::Collect + name: FUNCTIONS + version: '4.006' + - + class: Pod::Weaver::Section::Leftovers + name: '@Default/Leftovers' + version: '4.006' + - + class: Pod::Weaver::Section::Region + name: '@Default/postlude' + version: '4.006' + - + class: Pod::Weaver::Section::Authors + name: '@Default/Authors' + version: '4.006' + - + class: Pod::Weaver::Section::Legal + name: '@Default/Legal' + version: '4.006' name: '@DOY/PodWeaver' - version: 3.101642 + version: '4.005' - class: Dist::Zilla::Plugin::UploadToCPAN name: '@DOY/UploadToCPAN' - version: 5.012 - - - class: Dist::Zilla::Plugin::ContributorsFromGit - name: ContributorsFromGit - version: 0.006 + version: '5.014' - class: Dist::Zilla::Plugin::AutoPrereqs name: AutoPrereqs - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::Prereqs config: @@ -195,7 +285,7 @@ phase: runtime type: requires name: Prereqs - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::Prereqs config: @@ -203,49 +293,54 @@ phase: test type: recommends name: TestRecommends - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::FinderCode name: ':InstallModules' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::FinderCode name: ':IncModules' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::FinderCode name: ':TestFiles' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::FinderCode name: ':ExecFiles' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::FinderCode name: ':ShareFiles' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::FinderCode name: ':MainModule' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::FinderCode name: ':AllFiles' - version: 5.012 + version: '5.014' - class: Dist::Zilla::Plugin::FinderCode name: ':NoFiles' - version: 5.012 + version: '5.014' + - + class: Dist::Zilla::Plugin::FinderCode + name: '@DOY/MetaProvides::Package/AUTOVIV/:InstallModulesPM' + version: '5.014' zilla: class: Dist::Zilla::Dist::Builder config: - is_trial: 0 - version: 5.012 + is_trial: '0' + version: '5.014' x_authority: cpan:NUFFIN x_contributors: - 'Alex <alex(a)koban.(none)>' - 'Andrew Yates <ayates(a)haddock.local>' - 'Dagfinn Ilmari Mannsåker <ilmari(a)ilmari.org>' + - 'David Lowe <davidl(a)lokku.com>' - 'Glenn Fowler <cebjyre(a)cpan.org>' - 'Graham Knop <haarg(a)haarg.org>' - 'Hans Dieter Pearcey <hdp(a)weftsoar.net>' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/Makefile.PL new/Try-Tiny-0.21/Makefile.PL --- old/Try-Tiny-0.19/Makefile.PL 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/Makefile.PL 2014-04-15 15:46:31.000000000 +0200 @@ -1,5 +1,5 @@ -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.012. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.014. use strict; use warnings; @@ -31,10 +31,10 @@ "File::Spec" => 0, "IO::Handle" => 0, "IPC::Open3" => 0, - "Test::More" => "0.88", + "Test::More" => 0, "if" => 0 }, - "VERSION" => "0.19", + "VERSION" => "0.21", "test" => { "TESTS" => "t/*.t" } @@ -47,7 +47,7 @@ "File::Spec" => 0, "IO::Handle" => 0, "IPC::Open3" => 0, - "Test::More" => "0.88", + "Test::More" => 0, "constant" => 0, "if" => 0, "strict" => 0, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/README new/Try-Tiny-0.21/README --- old/Try-Tiny-0.19/README 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/README 2014-04-15 15:46:31.000000000 +0200 @@ -1,7 +1,7 @@ This archive contains the distribution Try-Tiny, -version 0.19: +version 0.21: minimal try/catch with proper preservation of $@ @@ -12,5 +12,5 @@ The MIT (X11) License -This README file was generated by Dist::Zilla::Plugin::Readme v5.012. +This README file was generated by Dist::Zilla::Plugin::Readme v5.014. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/dist.ini new/Try-Tiny-0.21/dist.ini --- old/Try-Tiny-0.19/dist.ini 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/dist.ini 2014-04-15 15:46:31.000000000 +0200 @@ -9,14 +9,10 @@ dist = Try-Tiny repository = github authority = cpan:NUFFIN -bugtracker_web = https://github.com/doy/try-tiny/issues -bugtracker_mailto = done_testing = 0 Git::Tag_tag_format = %N-%v Git::NextVersion_version_regexp = ^Try-Tiny-(.+)$ -[ContributorsFromGit] - [AutoPrereqs] ; tests optionally require 5.010 skip = ^perl$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/lib/Try/Tiny.pm new/Try-Tiny-0.21/lib/Try/Tiny.pm --- old/Try-Tiny-0.19/lib/Try/Tiny.pm 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/lib/Try/Tiny.pm 2014-04-15 15:46:31.000000000 +0200 @@ -2,7 +2,7 @@ BEGIN { $Try::Tiny::AUTHORITY = 'cpan:NUFFIN'; } -$Try::Tiny::VERSION = '0.19'; +$Try::Tiny::VERSION = '0.21'; use 5.006; # ABSTRACT: minimal try/catch with proper preservation of $@ @@ -174,13 +174,15 @@ =pod +=encoding UTF-8 + =head1 NAME Try::Tiny - minimal try/catch with proper preservation of $@ =head1 VERSION -version 0.19 +version 0.21 =head1 SYNOPSIS @@ -244,6 +246,13 @@ which cannot be handled using local. You can add as many C<finally> blocks to a given C<try> block as you like. +Note that adding a C<finally> block without a preceding C<catch> block +suppresses any errors. This behaviour is consistent with using a standalone +C<eval>, but it is not consistent with C<try>/C<finally> patterns found in +other programming languages, such as Java, Python, Javascript or C#. If you +learnt the C<try>/C<finally> pattern from one of these languages, watch out for +this. + =head1 EXPORTS All functions are exported by default using L<Exporter>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/t/00-compile.t new/Try-Tiny-0.21/t/00-compile.t --- old/Try-Tiny-0.19/t/00-compile.t 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/t/00-compile.t 2014-04-15 15:46:31.000000000 +0200 @@ -1,9 +1,10 @@ +use 5.006; use strict; use warnings; -# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.021 +# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.039 -use Test::More 0.88; +use Test::More tests => 1 + ($ENV{AUTHOR_TESTING} ? 1 : 0); @@ -11,28 +12,31 @@ 'Try/Tiny.pm' ); -my @scripts = ( -); # no fake home requested +my $inc_switch = -d 'blib' ? '-Mblib' : '-Ilib'; + +use File::Spec; use IPC::Open3; use IO::Handle; -use File::Spec; + +open my $stdin, '<', File::Spec->devnull or die "can't open devnull: $!"; my @warnings; for my $lib (@module_files) { - open my $stdout, '>', File::Spec->devnull or die $!; - open my $stdin, '<', File::Spec->devnull or die $!; + # see L<perlfaq8/How can I capture STDERR from an external command?> my $stderr = IO::Handle->new; - my $pid = open3($stdin, $stdout, $stderr, qq{$^X -Mblib -e"require q[$lib]"}); + my $pid = open3($stdin, '>&STDERR', $stderr, $^X, $inc_switch, '-e', "require q[$lib]"); + binmode $stderr, ':crlf' if $^O eq 'MSWin32'; + my @_warnings = <$stderr>; waitpid($pid, 0); - is($? >> 8, 0, "$lib loaded ok"); + is($?, 0, "$lib loaded ok"); - if (my @_warnings = <$stderr>) + if (@_warnings) { warn @_warnings; push @warnings, @_warnings; @@ -44,5 +48,3 @@ is(scalar(@warnings), 0, 'no warnings found') if $ENV{AUTHOR_TESTING}; - -done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/t/global_destruction_load.t new/Try-Tiny-0.21/t/global_destruction_load.t --- old/Try-Tiny-0.19/t/global_destruction_load.t 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/t/global_destruction_load.t 2014-04-15 15:46:31.000000000 +0200 @@ -3,8 +3,8 @@ use Test::More; BEGIN { - plan skip_all => 'Capture::Tiny required' - unless eval { require Capture::Tiny; 1 }; + plan skip_all => 'Capture::Tiny 0.12 required' + unless eval { require Capture::Tiny; Capture::Tiny->VERSION(0.12); 1 }; plan tests => 3; Capture::Tiny->import(qw(capture_stderr)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/xt/release/no-tabs.t new/Try-Tiny-0.21/xt/release/no-tabs.t --- old/Try-Tiny-0.19/xt/release/no-tabs.t 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/xt/release/no-tabs.t 2014-04-15 15:46:31.000000000 +0200 @@ -1,8 +1,14 @@ use strict; use warnings; -use Test::More; -eval 'use Test::NoTabs'; -plan skip_all => 'Test::NoTabs required' if $@; +# this test was generated with Dist::Zilla::Plugin::NoTabsTests 0.06 -all_perl_files_ok(); +use Test::More 0.88; +use Test::NoTabs; + +my @files = ( + 'lib/Try/Tiny.pm' +); + +notabs_ok($_) foreach @files; +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/xt/release/pod-coverage.t new/Try-Tiny-0.21/xt/release/pod-coverage.t --- old/Try-Tiny-0.19/xt/release/pod-coverage.t 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/xt/release/pod-coverage.t 2014-04-15 15:46:31.000000000 +0200 @@ -1,14 +1,7 @@ #!perl # This file was automatically generated by Dist::Zilla::Plugin::PodCoverageTests. -use Test::More; - -eval "use Test::Pod::Coverage 1.08"; -plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage" - if $@; - -eval "use Pod::Coverage::TrustPod"; -plan skip_all => "Pod::Coverage::TrustPod required for testing POD coverage" - if $@; +use Test::Pod::Coverage 1.08; +use Pod::Coverage::TrustPod; all_pod_coverage_ok({ coverage_class => 'Pod::Coverage::TrustPod' }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Try-Tiny-0.19/xt/release/pod-syntax.t new/Try-Tiny-0.21/xt/release/pod-syntax.t --- old/Try-Tiny-0.19/xt/release/pod-syntax.t 2014-01-23 02:52:39.000000000 +0100 +++ new/Try-Tiny-0.21/xt/release/pod-syntax.t 2014-04-15 15:46:31.000000000 +0200 @@ -1,8 +1,6 @@ #!perl # This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. use Test::More; - -eval "use Test::Pod 1.41"; -plan skip_all => "Test::Pod 1.41 required for testing POD" if $@; +use Test::Pod 1.41; all_pod_files_ok(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-MIME-Types for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package perl-MIME-Types for openSUSE:Factory checked in at 2014-04-23 17:32:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-MIME-Types (Old) and /work/SRC/openSUSE:Factory/.perl-MIME-Types.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-MIME-Types" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-MIME-Types/perl-MIME-Types.changes 2012-02-14 13:09:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-MIME-Types.new/perl-MIME-Types.changes 2014-04-23 17:32:43.000000000 +0200 @@ -1,0 +2,65 @@ +Mon Apr 21 14:41:59 UTC 2014 - mardnh(a)gmx.de + +- update to version 2.04 + + - version 2.04: Thu Sep 12 15:46:28 CEST 2013 + Fixes: + - one more localize $_ in ::Types::_read_db() + rt.cpan.org#87856 [Gerda Shank] + + - version 2.03: Wed Sep 4 17:12:27 CEST 2013 + Improvements: + - typo in docs, rt.cpan.org#88394 [Gregor Herrmann, Debian] + - require perl 5.8.8, because <:encoding [cpantesters] + - updated IANA + - a bit more DESCRIPTION + + - version 2.02: Sun Aug 18 12:49:23 CEST 2013 + Fixes: + - localize DB and $_ in ::Types::_read_db() + rt.cpan.org#87856 [Gerda Shank] + + - version 2.01: Sat Aug 3 01:07:27 CEST 2013 + Improvements: + - add dummy ::Types::create_type_index() because + Catalyst-Plugin-Static-Simple calls it :( + + - version 2.00: Fri Aug 2 17:44:53 CEST 2013 + Changes: + - the mime information is now collected from various sources, amongst + them IANA. Therefore, some types may use different x-'s + #types up from 995 to 2096 + - a separate table is built for the extension-to-type mapping. + #exts up from 734 to 1425 + - the memory foot-print and start-up speed should have improved + considerably. + + Improvements: + - added bin/collect_types + - 3 typos. rt.cpan.org#86847 [D Steinbrunner] + - add ::Type::isVendor(), ::isExperimental(), ::isPersonal on request + by rt.cpan.org#87062 [Lars Dɪᴇᴄᴋᴏᴡ 迪拉斯] + - cleaned-up Exporter syntax of (very) old interface. + - added ::Types::listTypes() + + - version 1.38: Fri Jan 11 09:58:08 CET 2013 + - add application/vnd.ms-excel.template.macroEnabled.12 and five + related from http://filext.com/faq/office_mime_types.php + rt.cpan.org#82616 [M Jemmeson] + + - version 1.37: Fri Dec 21 11:33:53 CET 2012: + - all mime.types files agree that perl scripts should use + application/x-perl. Hence removed text/x-perl + rt.cpan.org#82100 [Kent Fredric] + + - version 1.36: Wed Oct 31 20:34:42 CET 2012 + - xlsx and friends had encoding 'binary' (since version 1.30), + but should have been 'base64' + rt.cpan.org#80529 [Douglas Wilson] + + - version 1.35: Tue Jun 19 20:37:21 CEST 2012 + - added video/webm and audio/webm, although not (yet) IANA registered. + [Kurian Jose Aerthail] + + +------------------------------------------------------------------- Old: ---- MIME-Types-1.34.tar.gz New: ---- MIME-Types-2.04.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-MIME-Types.spec ++++++ --- /var/tmp/diff_new_pack.NtOjII/_old 2014-04-23 17:32:43.000000000 +0200 +++ /var/tmp/diff_new_pack.NtOjII/_new 2014-04-23 17:32:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-MIME-Types # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,13 +17,14 @@ Name: perl-MIME-Types -Version: 1.34 +Version: 2.04 Release: 0 +%define cpan_name MIME-Types Summary: MIME-Type Determination License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl -Url: http://cpan.org/modules/by-module/MIME/ -Source: MIME-Types-%{version}.tar.gz +Url: http://www.cpan.org/modules/by-module/MIME/ +Source: http://www.cpan.org/modules/by-module/MIME/%{cpan_name}-%{version}.tar.gz BuildRequires: perl BuildRequires: perl-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ MIME-Types-1.34.tar.gz -> MIME-Types-2.04.tar.gz ++++++ ++++ 6007 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 perl-Devel-Declare for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package perl-Devel-Declare for openSUSE:Factory checked in at 2014-04-23 17:32:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Devel-Declare (Old) and /work/SRC/openSUSE:Factory/.perl-Devel-Declare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Devel-Declare" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Devel-Declare/perl-Devel-Declare.changes 2014-03-09 18:37:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Devel-Declare.new/perl-Devel-Declare.changes 2014-04-23 17:32:38.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 21 20:03:12 UTC 2014 - mardnh(a)gmx.de + +- updated to 0.006016 + - fixed syntax error in a test + +------------------------------------------------------------------- Old: ---- Devel-Declare-0.006015.tar.gz New: ---- Devel-Declare-0.006016.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Devel-Declare.spec ++++++ --- /var/tmp/diff_new_pack.dJ7atD/_old 2014-04-23 17:32:39.000000000 +0200 +++ /var/tmp/diff_new_pack.dJ7atD/_new 2014-04-23 17:32:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Devel-Declare -Version: 0.006015 +Version: 0.006016 Release: 0 %define cpan_name Devel-Declare Summary: Adding keywords to perl, in perl ++++++ Devel-Declare-0.006015.tar.gz -> Devel-Declare-0.006016.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/Changes new/Devel-Declare-0.006016/Changes --- old/Devel-Declare-0.006015/Changes 2014-02-03 03:53:29.000000000 +0100 +++ new/Devel-Declare-0.006016/Changes 2014-04-01 05:00:48.000000000 +0200 @@ -1,5 +1,8 @@ Revision history for Devel-Declare +0.006016 - 2014-03-31 + - fixed syntax error in a test + 0.006015 - 2014-02-02 - fix use of wrong sprintf formatting codes (Zefram, RT#91983) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/META.json new/Devel-Declare-0.006016/META.json --- old/Devel-Declare-0.006015/META.json 2014-02-03 03:54:04.000000000 +0100 +++ new/Devel-Declare-0.006016/META.json 2014-04-01 05:01:12.000000000 +0200 @@ -4,7 +4,7 @@ "Matt S Trout - <mst(a)shadowcat.co.uk> - original author" ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.88, CPAN::Meta::Converter version 2.133380", + "generated_by" : "ExtUtils::MakeMaker version 6.94, CPAN::Meta::Converter version 2.140640", "license" : [ "perl_5" ], @@ -55,5 +55,5 @@ "web" : "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/Devel-Declare.git" } }, - "version" : "0.006015" + "version" : "0.006016" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/META.yml new/Devel-Declare-0.006016/META.yml --- old/Devel-Declare-0.006015/META.yml 2014-02-03 03:54:04.000000000 +0100 +++ new/Devel-Declare-0.006016/META.yml 2014-04-01 05:01:12.000000000 +0200 @@ -3,30 +3,30 @@ author: - 'Matt S Trout - <mst(a)shadowcat.co.uk> - original author' build_requires: - B::Hooks::OP::Check: 0.19 - Test::More: 0.88 - Test::Requires: 0 + B::Hooks::OP::Check: '0.19' + Test::More: '0.88' + Test::Requires: '0' configure_requires: - B::Hooks::OP::Check: 0.19 - ExtUtils::Depends: 0.302 + B::Hooks::OP::Check: '0.19' + ExtUtils::Depends: '0.302' dynamic_config: 0 -generated_by: 'ExtUtils::MakeMaker version 6.88, CPAN::Meta::Converter version 2.133380' +generated_by: 'ExtUtils::MakeMaker version 6.94, CPAN::Meta::Converter version 2.140640' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Devel-Declare no_index: directory: - t - inc requires: - B::Hooks::EndOfScope: 0.05 - B::Hooks::OP::Check: 0.19 - Scalar::Util: 1.11 - Sub::Name: 0 - perl: 5.008001 + B::Hooks::EndOfScope: '0.05' + B::Hooks::OP::Check: '0.19' + Scalar::Util: '1.11' + Sub::Name: '0' + perl: '5.008001' resources: bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=Devel-Declare repository: git://git.shadowcat.co.uk/p5sagit/Devel-Declare.git -version: 0.006015 +version: '0.006016' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/lib/Devel/Declare/Context/Simple.pm new/Devel-Declare-0.006016/lib/Devel/Declare/Context/Simple.pm --- old/Devel-Declare-0.006015/lib/Devel/Declare/Context/Simple.pm 2014-02-03 03:52:23.000000000 +0100 +++ new/Devel-Declare-0.006016/lib/Devel/Declare/Context/Simple.pm 2014-04-01 04:57:25.000000000 +0200 @@ -6,7 +6,7 @@ use B::Hooks::EndOfScope; use Carp qw/confess/; -our $VERSION = '0.006015'; +our $VERSION = '0.006016'; sub new { my $class = shift; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/lib/Devel/Declare/MethodInstaller/Simple.pm new/Devel-Declare-0.006016/lib/Devel/Declare/MethodInstaller/Simple.pm --- old/Devel-Declare-0.006015/lib/Devel/Declare/MethodInstaller/Simple.pm 2014-02-03 03:52:23.000000000 +0100 +++ new/Devel-Declare-0.006016/lib/Devel/Declare/MethodInstaller/Simple.pm 2014-04-01 04:57:25.000000000 +0200 @@ -7,7 +7,7 @@ use strict; use warnings; -our $VERSION = '0.006015'; +our $VERSION = '0.006016'; sub install_methodhandler { my $class = shift; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/lib/Devel/Declare.pm new/Devel-Declare-0.006016/lib/Devel/Declare.pm --- old/Devel-Declare-0.006015/lib/Devel/Declare.pm 2014-02-03 03:52:23.000000000 +0100 +++ new/Devel-Declare-0.006016/lib/Devel/Declare.pm 2014-04-01 04:57:25.000000000 +0200 @@ -5,7 +5,7 @@ use warnings; use 5.008001; -our $VERSION = '0.006015'; +our $VERSION = '0.006016'; use constant DECLARE_NAME => 1; use constant DECLARE_PROTO => 2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/build_sub_installer.t new/Devel-Declare-0.006016/t/build_sub_installer.t --- old/Devel-Declare-0.006015/t/build_sub_installer.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/build_sub_installer.t 2014-03-31 18:40:26.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More 'no_plan'; +use Test::More; use Devel::Declare (); @@ -18,3 +18,5 @@ } is($args, 'woot', 'sub installer worked'); + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/combi.t new/Devel-Declare-0.006016/t/combi.t --- old/Devel-Declare-0.006015/t/combi.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/combi.t 2014-03-31 18:40:32.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More 'no_plan'; +use Test::More; sub method :lvalue {my $sv;} @@ -29,3 +29,5 @@ }; ok(1, "Survived compilation"); + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/ctx-simple.t new/Devel-Declare-0.006016/t/ctx-simple.t --- old/Devel-Declare-0.006015/t/ctx-simple.t 2014-02-03 03:39:25.000000000 +0100 +++ new/Devel-Declare-0.006016/t/ctx-simple.t 2014-03-31 18:43:57.000000000 +0200 @@ -1,3 +1,5 @@ +use strict; +use warnings; use Devel::Declare (); { @@ -131,7 +133,7 @@ } -use Test::More 'no_plan'; +use Test::More; my $o = DeclareTest->new(attr => "value"); @@ -171,3 +173,4 @@ is_deeply([ map { $_->() } @test_list ], [ 1, 2, 3, 4], 'binding ok'); +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/eval.t new/Devel-Declare-0.006016/t/eval.t --- old/Devel-Declare-0.006015/t/eval.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/eval.t 2014-03-31 18:40:46.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More 'no_plan'; +use Test::More; sub method { my ($usepack, $name, $inpack, $sub) = @_; @@ -22,4 +22,4 @@ is( __PACKAGE__->bar, 42 ); - +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/fail.t new/Devel-Declare-0.006016/t/fail.t --- old/Devel-Declare-0.006015/t/fail.t 2014-02-03 03:39:25.000000000 +0100 +++ new/Devel-Declare-0.006016/t/fail.t 2014-03-31 18:40:52.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More 'no_plan'; +use Test::More; use Devel::Declare::MethodInstaller::Simple; BEGIN { @@ -29,3 +29,5 @@ eval 'method møø() { return "foo" }'; like($@, qr/Illegal\sdeclaration\sof\ssubroutine\smain\:\:m/, 'with unicode'); }; + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/lines.t new/Devel-Declare-0.006016/t/lines.t --- old/Devel-Declare-0.006015/t/lines.t 2014-02-03 03:39:25.000000000 +0100 +++ new/Devel-Declare-0.006016/t/lines.t 2014-03-31 18:38:55.000000000 +0200 @@ -2,7 +2,7 @@ use warnings; use Test::More; -use Test::Requires 'B:Compiling'; +use Test::Requires 'B::Compiling'; plan tests => 5; my @lines; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/methinstaller-simple.t new/Devel-Declare-0.006016/t/methinstaller-simple.t --- old/Devel-Declare-0.006015/t/methinstaller-simple.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/methinstaller-simple.t 2014-03-31 18:43:23.000000000 +0200 @@ -1,7 +1,6 @@ -#!/usr/bin/perl -w - use strict; -use Test::More 'no_plan'; +use warnings; +use Test::More; my $Have_Devel_BeginLift; BEGIN { @@ -124,3 +123,4 @@ is_deeply([ map { $_->() } @test_list ], [ 1, 2, 3, 4], 'binding ok'); +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/method-no-semi.t new/Devel-Declare-0.006016/t/method-no-semi.t --- old/Devel-Declare-0.006015/t/method-no-semi.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/method-no-semi.t 2014-03-31 18:44:46.000000000 +0200 @@ -1,3 +1,5 @@ +use strict; +use warnings; use Devel::Declare (); { @@ -154,7 +156,7 @@ } -use Test::More 'no_plan'; +use Test::More; my $o = DeclareTest->new(attr => "value"); @@ -177,3 +179,5 @@ is($o->$test_method2('this'), 'DeclareTest2, this', 'anon method with proto ok'); is_deeply([ map { $_->() } @test_list ], [ 1, 2, 3, 4], 'binding ok'); + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/method.t new/Devel-Declare-0.006016/t/method.t --- old/Devel-Declare-0.006015/t/method.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/method.t 2014-03-31 18:45:00.000000000 +0200 @@ -1,3 +1,5 @@ +use strict; +use warnings; use Devel::Declare (); { @@ -138,7 +140,7 @@ } -use Test::More 'no_plan'; +use Test::More; my $o = DeclareTest->new(attr => "value"); @@ -161,3 +163,5 @@ is($o->$test_method2('this'), 'DeclareTest2, this', 'anon method with proto ok'); is_deeply([ map { $_->() } @test_list ], [ 1, 2, 3, 4], 'binding ok'); + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/new.t new/Devel-Declare-0.006016/t/new.t --- old/Devel-Declare-0.006015/t/new.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/new.t 2014-03-31 18:45:11.000000000 +0200 @@ -1,5 +1,7 @@ +use strict; +use warnings; use Devel::Declare (); -use Test::More qw(no_plan); +use Test::More; { package FoomHandlers; @@ -101,3 +103,5 @@ ::is(foom KABOOM (zoom), "happy foom: KABOOM; zoom", "foom KABOOM (zoom)"); } + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/pack.t new/Devel-Declare-0.006016/t/pack.t --- old/Devel-Declare-0.006015/t/pack.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/pack.t 2014-03-31 18:41:24.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More 'no_plan'; +use Test::More; sub class { $_[0]->(); } @@ -20,3 +20,5 @@ is($packname, 'Foo::Bar', 'Package saved ok'); is(__PACKAGE__, 'main', 'Package scoped correctly'); + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/padstuff.t new/Devel-Declare-0.006016/t/padstuff.t --- old/Devel-Declare-0.006015/t/padstuff.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/padstuff.t 2014-03-31 18:41:30.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More 'no_plan'; +use Test::More; sub action (&) { return shift; } @@ -20,3 +20,5 @@ $a->("SELF", "CONTEXT"); is($args, "SELF, CONTEXT", "args passed ok"); + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/proto.t new/Devel-Declare-0.006016/t/proto.t --- old/Devel-Declare-0.006015/t/proto.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/proto.t 2014-03-31 18:41:35.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More 'no_plan'; +use Test::More; sub fun :lvalue { return my $sv; } @@ -24,3 +24,5 @@ is($foo->(), '$a, $b: woot', 'proto declarator ok'); is(X(), 'what?', 'X sub restored ok'); + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/simple.t new/Devel-Declare-0.006016/t/simple.t --- old/Devel-Declare-0.006015/t/simple.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/simple.t 2014-03-31 18:41:41.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More 'no_plan'; +use Test::More; sub method { my ($usepack, $name, $inpack, $sub) = @_; @@ -34,3 +34,4 @@ is($args1, 'main, 1, 2', 'Method bar args ok'); is($args2, 'main, 3, 4', 'Method baz args ok'); +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/statement.t new/Devel-Declare-0.006016/t/statement.t --- old/Devel-Declare-0.006015/t/statement.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/statement.t 2014-03-31 18:45:30.000000000 +0200 @@ -1,5 +1,7 @@ +use strict; +use warnings; use Devel::Declare (); -use Test::More qw(no_plan); +use Test::More; { package FoomHandlers; @@ -110,3 +112,5 @@ ::ok(1, 'Compiled as statement ok'); } + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-Declare-0.006015/t/sugar.t new/Devel-Declare-0.006016/t/sugar.t --- old/Devel-Declare-0.006015/t/sugar.t 2013-05-05 08:13:28.000000000 +0200 +++ new/Devel-Declare-0.006016/t/sugar.t 2014-03-31 18:45:38.000000000 +0200 @@ -1,3 +1,5 @@ +use strict; +use warnings; use Devel::Declare; BEGIN { @@ -64,7 +66,7 @@ } -use Test::More 'no_plan'; +use Test::More; my $o = DeclareTest->new(attr => "value"); @@ -87,3 +89,5 @@ is($o->$test_method2('this'), 'DeclareTest2, this', 'anon method with proto ok'); #warn map { $_->() } @test_list; + +done_testing; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit milou for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package milou for openSUSE:Factory checked in at 2014-04-23 17:32:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/milou (Old) and /work/SRC/openSUSE:Factory/.milou.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "milou" Changes: -------- --- /work/SRC/openSUSE:Factory/milou/milou.changes 2014-04-03 17:10:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.milou.new/milou.changes 2014-04-23 17:32:30.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 17 17:05:06 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to v0.1 + * No upstream changelog +- Droped %kde4_akonadi_requires, not required anymore + +------------------------------------------------------------------- Old: ---- milou-0.0.1~eb14c9e.tar.xz New: ---- milou-0.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ milou.spec ++++++ --- /var/tmp/diff_new_pack.zlZctp/_old 2014-04-23 17:32:31.000000000 +0200 +++ /var/tmp/diff_new_pack.zlZctp/_new 2014-04-23 17:32:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: milou -Version: 0.0.1~eb14c9e +Version: 0.1 Release: 0 Summary: A dedicated search application built on top of Baloo License: GPL-2.0+ and LGPL-2.1+ @@ -31,7 +31,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires -%kde4_akonadi_requires %description A dedicated search application built on top of Baloo @@ -47,12 +46,18 @@ %kde4_makeinstall -C build %fdupes -s %buildroot %kde_post_install + # milou doesn't provide any development files, so remove the devel symlink + rm -rf %buildroot%{_kde4_libdir}/libmilou.so + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc COPYING* %{_kde4_appsdir}/plasma/plasmoids/ -%{_kde4_libdir}/libmilou.so +%{_kde4_libdir}/libmilou.so.* %{_kde4_modulesdir}/imports/ %{_kde4_modulesdir}/milou*.so %{_kde4_servicesdir}/*milou*.desktop ++++++ milou-0.0.1~eb14c9e.tar.xz -> milou-0.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/CMakeLists.txt new/milou-0.1/CMakeLists.txt --- old/milou-0.0.1~eb14c9e/CMakeLists.txt 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/CMakeLists.txt 2014-04-17 11:31:07.000000000 +0200 @@ -2,6 +2,7 @@ find_package(KDE4 REQUIRED) find_package(Baloo REQUIRED) +find_package(KFileMetaData REQUIRED) find_package(KdepimLibs) set_package_properties(KdepimLibs PROPERTIES DESCRIPTION "KDE PIM Libraries" @@ -17,6 +18,7 @@ ${QT_INCLUDES} ${KDE4_INCLUDES} ${BALOO_INCLUDE_DIR} + ${KFILEMETADATA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/lib ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/Messages.sh new/milou-0.1/Messages.sh --- old/milou-0.0.1~eb14c9e/Messages.sh 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/Messages.sh 2014-04-17 11:31:07.000000000 +0200 @@ -1,2 +1,2 @@ #! /usr/bin/env bash -$XGETTEXT `find . -name "*.cpp" -o -name "*.qml" | grep -v "/test/"` -o $podir/milou.pot +$XGETTEXT `find . -name "*.cpp" -o -name "*.qml" | grep -v "/test/"` -o $podir/plasma_applet_milou_applet.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/CMakeLists.txt new/milou-0.1/lib/CMakeLists.txt --- old/milou-0.0.1~eb14c9e/lib/CMakeLists.txt 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/CMakeLists.txt 2014-04-17 11:31:07.000000000 +0200 @@ -17,6 +17,8 @@ kde4_add_library(milou SHARED ${lib_SRCS}) +set_target_properties(milou PROPERTIES VERSION 0.1 SOVERSION 0.1) + target_link_libraries (milou ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/abstractsource.cpp new/milou-0.1/lib/abstractsource.cpp --- old/milou-0.0.1~eb14c9e/lib/abstractsource.cpp 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/abstractsource.cpp 2014-04-17 11:31:07.000000000 +0200 @@ -23,7 +23,7 @@ #include "abstractsource.h" #include <KGlobal> -static const KCatalogLoader loader("milou"); +static const KCatalogLoader loader("plasma_applet_milou_applet"); using namespace Milou; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/miloupreviewplugin.desktop new/milou-0.1/lib/miloupreviewplugin.desktop --- old/milou-0.0.1~eb14c9e/lib/miloupreviewplugin.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/miloupreviewplugin.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -11,7 +11,9 @@ Comment[fr]=Module externe d'aperçu Milou Comment[hu]=Milou előnézet bővítmény Comment[ko]=Milou 미리 보기 플러그인 +Comment[nds]=Milou-Vöransichtmoduul Comment[nl]=Milou voorbeeld-plug-in +Comment[pl]=Wtyczka podglądu Milou Comment[pt]='Plugin' de Antevisão do Milou Comment[pt_BR]=Plugin de previsão do Milou Comment[sk]=Plugin náhľadu Milou @@ -19,3 +21,4 @@ Comment[uk]=Додаток попереднього перегляду Milou Comment[x-test]=xxMilou Preview Pluginxx Comment[zh_CN]=Milou 预览插件 +Comment[zh_TW]=Milou 預覽外掛程式 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/previews/milouapplicationpreview.desktop new/milou-0.1/lib/previews/milouapplicationpreview.desktop --- old/milou-0.0.1~eb14c9e/lib/previews/milouapplicationpreview.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/previews/milouapplicationpreview.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -5,12 +5,15 @@ Name=Milou Application Preview Plugin Name[da]=Forhåndsvisning-plugin til programmet Milou Name[de]=Milou-Vorschaumodul für Anwendungen +Name[el]=Πρόσθετο προεπισκόπησης εφαρμογής Milou Name[es]=Complemento de vista previa de aplicaciones de Milou Name[fi]=Miloun sovellusten esikatseluliitännäinen Name[fr]=Module externe d'aperçu d'application pour Milou Name[hu]=Milou alkalmazás előnézet bővítmény Name[ko]=Milou 프로그램 미리 보기 플러그인 +Name[nds]=Milou-Programmvöransichtmoduul Name[nl]=Milou voorbeeld-plug-in voor toepassing +Name[pl]=Wtyczka podglądu programu Milou Name[pt]='Plugin' de Antevisão de Aplicações do Milou Name[pt_BR]=Plugin de previsão de aplicativos do Milou Name[sk]=Plugin náhľadu aplikácie Milou @@ -18,3 +21,4 @@ Name[uk]=Додаток попереднього перегляду програм Milou Name[x-test]=xxMilou Application Preview Pluginxx Name[zh_CN]=Milou 程序预览插件 +Name[zh_TW]=Milou 應用程式預覽外掛程式 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/previews/milouaudiopreview.desktop new/milou-0.1/lib/previews/milouaudiopreview.desktop --- old/milou-0.0.1~eb14c9e/lib/previews/milouaudiopreview.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/previews/milouaudiopreview.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -12,7 +12,9 @@ Name[fr]=Module externe d'aperçu audio Milou Name[hu]=Milou hang előnézet bővítmény Name[ko]=Milou 오디오 미리 보기 플러그인 +Name[nds]=Milou-Audiovöransichtmoduul Name[nl]=Milou audio-voorbeeld-plug-in +Name[pl]=Wtyczka podglądu dźwięku Milou Name[pt]='Plugin' de Antevisão de Áudio do Milou Name[pt_BR]=Plugin de previsão de áudio do Milou Name[sk]=Plugin náhľadu zvuku Milou @@ -20,6 +22,7 @@ Name[uk]=Додаток попереднього прослуховування Milou Name[x-test]=xxMilou Audio Preview Pluginxx Name[zh_CN]=Milou 音频预览插件 +Name[zh_TW]=Milou 音效預覽外掛程式 Comment=Preview generated for audio files Comment[bs]=Prikaz generiran za audio datoteke Comment[da]=Forhåndslytning genereret for lydfiler @@ -30,7 +33,9 @@ Comment[fr]=Aperçu généré pour les fichiers audio Comment[hu]=Hangfájlokhoz előállított előnézet Comment[ko]=오디오 파일에서 생성된 미리 보기 +Comment[nds]=För Audiodateien opstellt Vöransicht Comment[nl]=Gegenereerd voorbeeld voor muziekbestanden +Comment[pl]=Podgląd utworzony dla plików dźwiękowych Comment[pt]=Antevisão gerada para os ficheiros de áudio Comment[pt_BR]=Previsão gerada para os arquivos de áudio Comment[sk]=Náhľad generovaný pre audio súbory @@ -38,3 +43,4 @@ Comment[uk]=Створено дані попереднього прослуховування для звукових файлів Comment[x-test]=xxPreview generated for audio filesxx Comment[zh_CN]=音频文件预览 +Comment[zh_TW]=音效檔預覽 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/previews/miloubookmarkpreview.desktop new/milou-0.1/lib/previews/miloubookmarkpreview.desktop --- old/milou-0.0.1~eb14c9e/lib/previews/miloubookmarkpreview.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/previews/miloubookmarkpreview.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -12,7 +12,9 @@ Name[fr]=Module externe d'aperçu des signets pour Milou Name[hu]=Milou könyvjelző előnézet bővítmény Name[ko]=Milou 책갈피 미리 보기 +Name[nds]=Milou-Leestekenvöransichtmoduul Name[nl]=Milou voorbeeld-plug-in voor bladwijzer +Name[pl]=Wtyczka podglądu zakładek Milou Name[pt]='Plugin' de Antevisão de Favoritos do Milou Name[pt_BR]=Plugin de previsão de favoritos do Milou Name[sk]=Plugin náhľadu záložky Milou @@ -20,6 +22,7 @@ Name[uk]=Додаток попереднього перегляду закладок Milou Name[x-test]=xxMilou Bookmark Preview Pluginxx Name[zh_CN]=Milou 书签预览插件 +Name[zh_TW]=Milou 書籤預覽外掛程式 Comment=Preview generated for bookmarks Comment[bs]=Prikaz generiran za oznake Comment[da]=Forhåndsvisning genereret for bogmærker @@ -30,7 +33,9 @@ Comment[fr]=Aperçu généré pour les signets Comment[hu]=Könyvjelzőkhöz előállított előnézet Comment[ko]=책갈피에서 생성된 미리 보기 +Comment[nds]=För Leestekens opstellt Vöransicht Comment[nl]=Gegenereerd voorbeeld voor bladwijzers +Comment[pl]=Podgląd utworzony dla zakładek Comment[pt]=Antevisão gerada para os favoritos Comment[pt_BR]=Previsão gerada para os favoritos Comment[sk]=Náhľad vygenerovaný pre záložky @@ -38,3 +43,4 @@ Comment[uk]=Створено дані попереднього перегляду для закладок Comment[x-test]=xxPreview generated for bookmarksxx Comment[zh_CN]=书签预览 +Comment[zh_TW]=書籤預覽 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/previews/milouemailpreview.desktop new/milou-0.1/lib/previews/milouemailpreview.desktop --- old/milou-0.0.1~eb14c9e/lib/previews/milouemailpreview.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/previews/milouemailpreview.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -12,7 +12,9 @@ Name[fr]=Module externe d'aperçu de courriel pour Milou Name[hu]=Milou e-mail előnézet bővítmény Name[ko]=Milou 이메일 미리 보기 플러그인 +Name[nds]=Milou-Nettpostvöransichtmoduul Name[nl]=Milou voorbeeld-plug-in voor e-mail +Name[pl]=Wtyczka podglądu poczty Milou Name[pt]='Plugin' de Antevisão de E-Mail do Milou Name[pt_BR]=Plugin de previsão de e-mail do Milou Name[sk]=Plugin náhľadu e-mailu Milou @@ -20,6 +22,7 @@ Name[uk]=Додаток попереднього перегляду електронної пошти Milou Name[x-test]=xxMilou Email Preview Pluginxx Name[zh_CN]=Milou 电子邮件预览插件 +Name[zh_TW]=Milou 電子郵件預覽外掛程式 Comment=Preview generated for emails Comment[bs]=Prikaz generiran za e-postu Comment[da]=Forhåndsvisning genereret for e-mails @@ -30,7 +33,9 @@ Comment[fr]=Aperçu généré pour les courriels Comment[hu]=E-mailekhez előállított előnézet Comment[ko]=이메일에서 생성된 미리 보기 +Comment[nds]=För Nettbreven opstellt Vöransicht Comment[nl]=Gegenereerd voorbeeld voor e-mails +Comment[pl]=Podgląd utworzony dla poczty Comment[pt]=Antevisão gerada para as mensagens de e-mail Comment[pt_BR]=Previsão gerada para os e-mails Comment[sk]=Náhľad vygenerovaný pre e-maily @@ -38,3 +43,4 @@ Comment[uk]=Створено дані попереднього перегляду для повідомлень електронної пошти Comment[x-test]=xxPreview generated for emailsxx Comment[zh_CN]=电子邮件预览 +Comment[zh_TW]=電子郵件預覽 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/previews/miloufilepreview.desktop new/milou-0.1/lib/previews/miloufilepreview.desktop --- old/milou-0.0.1~eb14c9e/lib/previews/miloufilepreview.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/previews/miloufilepreview.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -5,12 +5,15 @@ Name=Milou File Preview Plugin Name[da]=Forhåndsvisning-plugin til filer til Milou Name[de]=Milou-Vorschaumodul für Dateien +Name[el]=Πρόσθετο προεπισκόπησης αρχείων Milou Name[es]=Complemento de vista previa de archivos de Milou Name[fi]=Miloun tiedostojen esikatseluliitännäinen Name[fr]=Module externe d'aperçu de fichier pour Milou Name[hu]=Milou fájl előnézet bővítmény Name[ko]=Milou 파일 미리 보기 플러그인 +Name[nds]=Milou-Dateivöransichtmoduul Name[nl]=Voorbeeld-plug-in van Milou-bestand +Name[pl]=Wtyczka podglądu plików Milou Name[pt]='Plugin' de Antevisão de Ficheiros do Milou Name[pt_BR]=Plugin de previsão de arquivos do Milou Name[sk]=Plugin náhľadu súboru Milou @@ -18,3 +21,4 @@ Name[uk]=Додаток попереднього перегляду файлів Milou Name[x-test]=xxMilou File Preview Pluginxx Name[zh_CN]=Milou 文件预览插件 +Name[zh_TW]=Milou 檔案預覽外掛程式 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/previews/milouimagepreview.desktop new/milou-0.1/lib/previews/milouimagepreview.desktop --- old/milou-0.0.1~eb14c9e/lib/previews/milouimagepreview.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/previews/milouimagepreview.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -12,7 +12,9 @@ Name[fr]=Module externe d'aperçu d'images pour Milou Name[hu]=Milou kép előnézet bővítmény Name[ko]=Milou 그림 미리 보기 플러그인 +Name[nds]=Milou-Bildvöransichtmoduul Name[nl]=Milou voorbeeld-plug-in voor afbeeldingen +Name[pl]=Wtyczka podglądu obrazów Milou Name[pt]='Plugin' de Antevisão de Imagens do Milou Name[pt_BR]=Plugin de previsão de imagem do Milou Name[sk]=Plugin náhľadu obrázku Milou @@ -20,6 +22,7 @@ Name[uk]=Додаток попереднього перегляду зображень Milou Name[x-test]=xxMilou Image Preview Pluginxx Name[zh_CN]=Milou 图片预览插件 +Name[zh_TW]=Milou 影像預覽外掛程式 Comment=Preview generated for image files Comment[bs]=Prikaz generiran za sliku datoteke Comment[da]=Forhåndsvisning genereret for billedfiler @@ -30,7 +33,9 @@ Comment[fr]=Aperçu généré pour les fichiers image Comment[hu]=Képfájlokhoz előállított előnézet Comment[ko]=그림 파일에서 생성된 미리 보기 +Comment[nds]=För Bilddateien opstellt Vöransicht Comment[nl]=Gegenereerd voorbeeld voor afbeeldingsbestanden +Comment[pl]=Podgląd utworzony dla plików obrazów Comment[pt]=Antevisão gerada para os ficheiros de imagem Comment[pt_BR]=Previsão gerada para os arquivos de imagem Comment[sk]=Náhľad vygenerovaný pre súbory obrázkov @@ -38,3 +43,4 @@ Comment[uk]=Створено дані попереднього перегляду для файлів зображень Comment[x-test]=xxPreview generated for image filesxx Comment[zh_CN]=图片文件预览 +Comment[zh_TW]=影像檔預覽 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/previews/milouokularpreview.desktop new/milou-0.1/lib/previews/milouokularpreview.desktop --- old/milou-0.0.1~eb14c9e/lib/previews/milouokularpreview.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/previews/milouokularpreview.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -12,7 +12,9 @@ Name[fr]=Module externe d'aperçu Okular pour Milou Name[hu]=Milou Okular előnézet bővítmény Name[ko]=Milou Okular 미리 보기 플러그인 +Name[nds]=Milou-Okularvöransichtmoduul Name[nl]=Milou voorbeeld-plug-in voor Okular +Name[pl]=Wtyczka podglądu Okular Milou Name[pt]='Plugin' de Antevisão do Okular do Milou Name[pt_BR]=Plugin de previsão do Okular do Milou Name[sk]=Plugin náhľadu Okular Milou @@ -20,17 +22,20 @@ Name[uk]=Додаток попереднього перегляду файлів Okular Milou Name[x-test]=xxMilou Okular Preview Pluginxx Name[zh_CN]=Milou Okular 预览插件 +Name[zh_TW]=Milou Okular 預覽外掛程式 Comment=Preview generated for documents via Okular Comment[bs]=Prikaz generiran za dokumente putem Okular Comment[da]=Forhåndsvisning genereret for dokumenter via Okular Comment[de]=Vorschau für Dokumente mit Okular generieren Comment[el]=Παραγόμενη προεπισκόπηση για έγγραφα μέσω του Okular Comment[es]=Vista previa generada para documentos usando Okular -Comment[fi]=Okularin asiakirjoille generoima esikatselu +Comment[fi]=Okularin tiedostoille generoima esikatselu Comment[fr]=Aperçu généré pour des documents via Okular Comment[hu]=Az Okularból származó dokumentumokhoz előállított előnézet Comment[ko]=Okular에서 생성된 문서 미리 보기 +Comment[nds]=För Dokumenten över Okular opstellt Vöransicht Comment[nl]=Gegenereerd voorbeeld voor documenten met Okular +Comment[pl]=Podgląd utworzony dla dokumentów przez Okular Comment[pt]=Antevisão gerada para os documentos, usando o Okular Comment[pt_BR]=Previsão gerada para documentos usando o Okular Comment[sk]=Náhľad vygenerovaný pre dokumenty cez Okular @@ -38,3 +43,4 @@ Comment[uk]=За допомогою Okular створено дані попереднього перегляду для документів Comment[x-test]=xxPreview generated for documents via Okularxx Comment[zh_CN]=通过 Okular 生成文档预览 +Comment[zh_TW]=透過 Okular 顯示文件的預覽 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/previews/miloutextpreview.desktop new/milou-0.1/lib/previews/miloutextpreview.desktop --- old/milou-0.0.1~eb14c9e/lib/previews/miloutextpreview.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/previews/miloutextpreview.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -12,7 +12,9 @@ Name[fr]=Module externe d'aperçu de texte pour Milou Name[hu]=Milou szöveg előnézet bővítmény Name[ko]=Milou 텍스트 미리 보기 플러그인 +Name[nds]=Milou-Textvöransichtmoduul Name[nl]=Milou voorbeeld-plug-in voor tekst +Name[pl]=Wtyczka podglądu tekstu Milou Name[pt]='Plugin' de Antevisão de Texto do Milou Name[pt_BR]=Plugin de previsão de texto do Milou Name[sk]=Plugin náhľadu textu Milou @@ -20,6 +22,7 @@ Name[uk]=Додаток попереднього перегляду тексту Milou Name[x-test]=xxMilou Text Preview Pluginxx Name[zh_CN]=Milou 文本预览插件 +Name[zh_TW]=Milou 文字預覽外掛程式 Comment=Preview generated for text files Comment[bs]=Prikaz generiran za tekstualne datoteke Comment[da]=Forhåndsvisning genereret for tekstfiler @@ -30,7 +33,9 @@ Comment[fr]=Aperçu généré pour les fichiers texte Comment[hu]=Szövegfájlokhoz előállított előnézet Comment[ko]=텍스트 파일에서 생성된 미리 보기 +Comment[nds]=För Textdateien opstellt Vöransicht Comment[nl]=Gegenereerd voorbeeld voor tekstbestanden +Comment[pl]=Podgląd utworzony dla plików tekstowych Comment[pt]=Antevisão gerada para os ficheiros de texto Comment[pt_BR]=Previsão gerada para os arquivos de texto Comment[sk]=Náhľad vygenerovaný pre textové súbory @@ -38,3 +43,4 @@ Comment[uk]=Створено дані попереднього перегляду для текстових файлів Comment[x-test]=xxPreview generated for text filesxx Comment[zh_CN]=文本文件预览 +Comment[zh_TW]=文字檔預覽 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/previews/videos/milouvideopreview.desktop new/milou-0.1/lib/previews/videos/milouvideopreview.desktop --- old/milou-0.0.1~eb14c9e/lib/previews/videos/milouvideopreview.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/previews/videos/milouvideopreview.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -12,7 +12,9 @@ Name[fr]=Module externe d'aperçu vidéo pour Milou Name[hu]=Milou videó előnézet bővítmény Name[ko]=Milou 동영상 미리 보기 플러그인 +Name[nds]=Milou-Videovöransichtmoduul Name[nl]=Milou voorbeeld-plug-in voor video +Name[pl]=Wtyczka podglądu filmów Milou Name[pt]='Plugin' de Antevisão de Vídeo do Milou Name[pt_BR]=Plugin de previsão de vídeo do Milou Name[sk]=Plugin náhľadu videa Milou @@ -20,6 +22,7 @@ Name[uk]=Додаток попереднього перегляду відео Milou Name[x-test]=xxMilou Video Preview Pluginxx Name[zh_CN]=Milou 视频预览插件 +Name[zh_TW]=Milou 影片預覽外掛程式 Comment=Preview generated for videos Comment[bs]=Prikaz generiran za video signal Comment[da]=Forhåndsvisning genereret for videoer @@ -30,7 +33,9 @@ Comment[fr]=Aperçu généré pour des vidéos Comment[hu]=Videókhoz előállított előnézet Comment[ko]=동영상에서 생성된 미리 보기 +Comment[nds]=För Videos opstellt Vöransicht Comment[nl]=Gegenereerd voorbeeld voor video's +Comment[pl]=Podgląd utworzony dla filmów Comment[pt]=Antevisão gerada para os vídeos Comment[pt_BR]=Previsão gerada para os vídeos Comment[sk]=Náhľad vygenerovaný pre videá @@ -38,3 +43,4 @@ Comment[uk]=Створено дані попереднього перегляду для відео Comment[x-test]=xxPreview generated for videosxx Comment[zh_CN]=视频文件预览 +Comment[zh_TW]=影片檔預覽 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/qml/qmlplugins.cpp new/milou-0.1/lib/qml/qmlplugins.cpp --- old/milou-0.0.1~eb14c9e/lib/qml/qmlplugins.cpp 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/qml/qmlplugins.cpp 2014-04-17 11:31:07.000000000 +0200 @@ -32,6 +32,8 @@ void QmlPlugins::initializeEngine(QDeclarativeEngine *engine, const char *uri) { + Q_UNUSED(engine); + Q_UNUSED(uri); } void QmlPlugins::registerTypes(const char *uri) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/lib/test/test.cpp new/milou-0.1/lib/test/test.cpp --- old/milou-0.0.1~eb14c9e/lib/test/test.cpp 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/lib/test/test.cpp 2014-04-17 11:31:07.000000000 +0200 @@ -75,9 +75,11 @@ KApplication app; SourcesModel* model = new SourcesModel(); - ModelTest* mt = new ModelTest(model); model->setQueryLimit(20); + ModelTest* mt = new ModelTest(model); + Q_UNUSED(mt); + TestObject obj("Summer"); obj.model = model; obj.timer.start(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/plasmoid/package/contents/ui/ResultDelegate.qml new/milou-0.1/plasmoid/package/contents/ui/ResultDelegate.qml --- old/milou-0.0.1~eb14c9e/plasmoid/package/contents/ui/ResultDelegate.qml 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/plasmoid/package/contents/ui/ResultDelegate.qml 2014-04-17 11:31:07.000000000 +0200 @@ -39,6 +39,7 @@ onContainsMouseChanged: { if (containsMouse) { + listView.currentIndex = index preview.mimetype = model.previewType; preview.url = model.previewUrl; urlLabel.text = model.previewLabel @@ -50,12 +51,6 @@ } } - // FIXME - // This has been done so that the current item looks selected - // We need a proper fix in PlasmaComponents.ListItem to show the currentItem - // as selected - opacity: ListView.isCurrentItem ? 0.5 : 1 - PlasmaComponents.ListItem { id: listItem enabled: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/plasmoid/package/contents/ui/ResultsView.qml new/milou-0.1/plasmoid/package/contents/ui/ResultsView.qml --- old/milou-0.0.1~eb14c9e/plasmoid/package/contents/ui/ResultsView.qml 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/plasmoid/package/contents/ui/ResultsView.qml 2014-04-17 11:31:07.000000000 +0200 @@ -35,6 +35,8 @@ property alias queryString: resultModel.queryString clip: true + highlight: PlasmaComponents.Highlight {} + highlightMoveDuration: 0 // This is used to keep track if the user has pressed enter before // the first result has been shown, in the case the first result should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-0.0.1~eb14c9e/plasmoid/package/metadata.desktop new/milou-0.1/plasmoid/package/metadata.desktop --- old/milou-0.0.1~eb14c9e/plasmoid/package/metadata.desktop 2014-03-20 17:48:36.000000000 +0100 +++ new/milou-0.1/plasmoid/package/metadata.desktop 2014-04-17 11:31:07.000000000 +0200 @@ -10,7 +10,9 @@ Name[fr]=Milou Name[hu]=Milou Name[ko]=Milou +Name[nds]=Milou Name[nl]=Milou +Name[pl]=Milou Name[pt]=Milou Name[pt_BR]=Milou Name[sk]=Milou @@ -18,6 +20,7 @@ Name[uk]=Milou Name[x-test]=xxMilouxx Name[zh_CN]=Milou +Name[zh_TW]=Milou Comment=Applet for finding anything Comment[bs]=Aplet za pronalaženje bilo cega Comment[cs]=Applet pro hledání čehokoliv @@ -29,7 +32,9 @@ Comment[fr]=Applet pour trouver n'importe quoi Comment[hu]=Kisalkalmazás bármi megtalálásához Comment[ko]=모든 것을 찾는 애플릿 +Comment[nds]=Lüttprogramm för't Söken vun allens Comment[nl]=Applet voor zoeken naar van alles +Comment[pl]=Aplet do znajdowania rzeczy dowolnych Comment[pt]='Applet' para pesquisar de tudo Comment[pt_BR]=Miniaplicativo para encontrar qualquer coisa Comment[sk]=Applet na hľadanie všetkého @@ -37,6 +42,7 @@ Comment[uk]=Аплет для пошуку будь-чого Comment[x-test]=xxApplet for finding anythingxx Comment[zh_CN]=可以寻找任何东西的小程序 +Comment[zh_TW]=尋找任何東西的小程式 Type=Service ServiceTypes=Plasma/Applet Icon=nepomuk -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs3 for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package kdelibs3 for openSUSE:Factory checked in at 2014-04-23 17:32:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs3 (Old) and /work/SRC/openSUSE:Factory/.kdelibs3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs3" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs3/kdelibs3.changes 2014-01-13 10:53:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs3.new/kdelibs3.changes 2014-04-23 17:32:17.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 15 09:32:22 UTC 2014 - sweet_f_a(a)gmx.de + +- use globally installed up-to-date ssl certificates (bnc#873680) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.bMIWLe/_old 2014-04-23 17:32:20.000000000 +0200 +++ /var/tmp/diff_new_pack.bMIWLe/_new 2014-04-23 17:32:20.000000000 +0200 @@ -22,6 +22,7 @@ BuildRequires: aspell-devel BuildRequires: automake BuildRequires: avahi-compat-mDNSResponder-devel +BuildRequires: ca-certificates BuildRequires: cups-devel BuildRequires: db-devel BuildRequires: fdupes @@ -72,6 +73,7 @@ Obsoletes: kdelibs3-64bit %endif # +Requires: ca-certificates Requires: hicolor-icon-theme Requires: kdelibs3-default-style Requires: openssl @@ -530,6 +532,9 @@ ln -sf ../../lib64/kde3/plugins \ $RPM_BUILD_ROOT/opt/kde3/lib/kde3/plugins-lib64 %endif + # use globally installed up-to-date ssl certificates + rm -f $RPM_BUILD_ROOT/opt/kde3/share/apps/kssl/ca-bundle.crt + ln -s /etc/ssl/ca-bundle.pem $RPM_BUILD_ROOT/opt/kde3/share/apps/kssl/ca-bundle.crt # # add missing directories # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hostapd for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package hostapd for openSUSE:Factory checked in at 2014-04-23 17:32:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hostapd (Old) and /work/SRC/openSUSE:Factory/.hostapd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hostapd" Changes: -------- --- /work/SRC/openSUSE:Factory/hostapd/hostapd.changes 2013-10-03 15:47:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hostapd.new/hostapd.changes 2014-04-23 17:32:06.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 16 15:50:48 UTC 2014 - i(a)marguerite.su + +- update version 2.1 + * see http://hostap.epitest.fi/cgit/hostap/log/ for details. +- change hostapd.diff to hostapd-2.1-defconfig.patch +- remove patch: hostapd-tmp.diff, no longer needed. + +------------------------------------------------------------------- Old: ---- hostapd-2.0.tar.gz hostapd-be-host_to_le.patch hostapd-tmp.diff hostapd.diff New: ---- hostapd-2.1-be-host_to_le.patch hostapd-2.1-defconfig.patch hostapd-2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hostapd.spec ++++++ --- /var/tmp/diff_new_pack.w9SVIC/_old 2014-04-23 17:32:07.000000000 +0200 +++ /var/tmp/diff_new_pack.w9SVIC/_new 2014-04-23 17:32:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package hostapd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -24,15 +24,14 @@ Summary: Turns Your WLAN Card into a WPA capable Access Point License: GPL-2.0 or BSD-3-Clause Group: Hardware/Wifi -Version: 2.0 +Version: 2.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://hostap.epitest.fi/ Source: http://hostap.epitest.fi/releases/hostapd-%{version}.tar.gz Source1: hostapd.service -Patch0: hostapd.diff -Patch1: hostapd-tmp.diff -Patch2: hostapd-be-host_to_le.patch +Patch0: hostapd-2.1-defconfig.patch +Patch1: hostapd-2.1-be-host_to_le.patch %{?systemd_requires} %description @@ -48,7 +47,6 @@ %setup -q -n hostapd-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 cd hostapd cp defconfig .config ++++++ hostapd-2.1-be-host_to_le.patch ++++++ Index: hostapd-2.1/src/utils/common.h =================================================================== --- hostapd-2.1.orig/src/utils/common.h +++ hostapd-2.1/src/utils/common.h @@ -208,6 +208,7 @@ static inline unsigned int wpa_swap_32(u #define host_to_le32(n) bswap_32(n) #define be_to_host32(n) (n) #define host_to_be32(n) (n) +#define host_to_le32(n) bswap_32(n) #define le_to_host64(n) bswap_64(n) #define host_to_le64(n) bswap_64(n) #define be_to_host64(n) (n) ++++++ hostapd-2.1-defconfig.patch ++++++ Index: hostapd-2.1/hostapd/defconfig =================================================================== --- hostapd-2.1.orig/hostapd/defconfig +++ hostapd-2.1/hostapd/defconfig @@ -43,7 +43,7 @@ CONFIG_DRIVER_NL80211=y #LIBS_c += -L/usr/local/lib # Driver interface for no driver (e.g., RADIUS server only) -#CONFIG_DRIVER_NONE=y +CONFIG_DRIVER_NONE=y # IEEE 802.11F/IAPP CONFIG_IAPP=y @@ -58,7 +58,7 @@ CONFIG_PEERKEY=y # This version is an experimental implementation based on IEEE 802.11w/D1.0 # draft and is subject to change since the standard has not yet been finalized. # Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y +CONFIG_IEEE80211W=y # Integrated EAP server CONFIG_EAP=y @@ -82,52 +82,52 @@ CONFIG_EAP_GTC=y CONFIG_EAP_TTLS=y # EAP-SIM for the integrated EAP server -#CONFIG_EAP_SIM=y +CONFIG_EAP_SIM=y # EAP-AKA for the integrated EAP server -#CONFIG_EAP_AKA=y +CONFIG_EAP_AKA=y # EAP-AKA' for the integrated EAP server # This requires CONFIG_EAP_AKA to be enabled, too. -#CONFIG_EAP_AKA_PRIME=y +CONFIG_EAP_AKA_PRIME=y # EAP-PAX for the integrated EAP server -#CONFIG_EAP_PAX=y +CONFIG_EAP_PAX=y # EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) -#CONFIG_EAP_PSK=y +CONFIG_EAP_PSK=y # EAP-pwd for the integrated EAP server (secure authentication with a password) -#CONFIG_EAP_PWD=y +CONFIG_EAP_PWD=y # EAP-SAKE for the integrated EAP server -#CONFIG_EAP_SAKE=y +CONFIG_EAP_SAKE=y # EAP-GPSK for the integrated EAP server -#CONFIG_EAP_GPSK=y +CONFIG_EAP_GPSK=y # Include support for optional SHA256 cipher suite in EAP-GPSK -#CONFIG_EAP_GPSK_SHA256=y +CONFIG_EAP_GPSK_SHA256=y # EAP-FAST for the integrated EAP server # Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed # for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g., # with openssl-0.9.8x-tls-extensions.patch, to add the needed functions. -#CONFIG_EAP_FAST=y +CONFIG_EAP_FAST=y # Wi-Fi Protected Setup (WPS) -#CONFIG_WPS=y +CONFIG_WPS=y # Enable WSC 2.0 support -#CONFIG_WPS2=y +CONFIG_WPS2=y # Enable UPnP support for external WPS Registrars -#CONFIG_WPS_UPNP=y +CONFIG_WPS_UPNP=y # Enable WPS support with NFC config method -#CONFIG_WPS_NFC=y +CONFIG_WPS_NFC=y # EAP-IKEv2 -#CONFIG_EAP_IKEV2=y +CONFIG_EAP_IKEV2=y # Trusted Network Connect (EAP-TNC) -#CONFIG_EAP_TNC=y +CONFIG_EAP_TNC=y # EAP-EKE for the integrated EAP server #CONFIG_EAP_EKE=y @@ -138,27 +138,27 @@ CONFIG_PKCS12=y # RADIUS authentication server. This provides access to the integrated EAP # server from external hosts using RADIUS. -#CONFIG_RADIUS_SERVER=y +CONFIG_RADIUS_SERVER=y # Build IPv6 support for RADIUS operations CONFIG_IPV6=y # IEEE Std 802.11r-2008 (Fast BSS Transition) -#CONFIG_IEEE80211R=y +CONFIG_IEEE80211R=y # Use the hostapd's IEEE 802.11 authentication (ACL), but without # the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211) -#CONFIG_DRIVER_RADIUS_ACL=y +CONFIG_DRIVER_RADIUS_ACL=y # IEEE 802.11n (High Throughput) support -#CONFIG_IEEE80211N=y +CONFIG_IEEE80211N=y # Wireless Network Management (IEEE Std 802.11v-2011) # Note: This is experimental and not complete implementation. -#CONFIG_WNM=y +CONFIG_WNM=y # IEEE 802.11ac (Very High Throughput) support -#CONFIG_IEEE80211AC=y +CONFIG_IEEE80211AC=y # Remove debugging code that is printing out debug messages to stdout. # This can be used to reduce the size of the hostapd considerably if debugging @@ -186,7 +186,7 @@ CONFIG_IPV6=y # Enable support for fully dynamic VLANs. This enables hostapd to # automatically create bridge and VLAN interfaces if necessary. -#CONFIG_FULL_DYNAMIC_VLAN=y +CONFIG_FULL_DYNAMIC_VLAN=y # Use netlink-based kernel API for VLAN operations instead of ioctl() # Note: This requires libnl 3.1 or newer. @@ -256,11 +256,11 @@ CONFIG_IPV6=y # TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) # can be enabled to get a stronger construction of messages when block ciphers # are used. -#CONFIG_TLSV11=y +CONFIG_TLSV11=y # TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) # can be enabled to enable use of stronger crypto algorithms. -#CONFIG_TLSV12=y +CONFIG_TLSV12=y # If CONFIG_TLS=internal is used, additional library and include paths are # needed for LibTomMath. Alternatively, an integrated, minimal version of @@ -281,13 +281,13 @@ CONFIG_IPV6=y # Interworking (IEEE 802.11u) # This can be used to enable functionality to improve interworking with # external networks. -#CONFIG_INTERWORKING=y +CONFIG_INTERWORKING=y # Hotspot 2.0 -#CONFIG_HS20=y +CONFIG_HS20=y # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file -#CONFIG_SQLITE=y +CONFIG_SQLITE=y # Testing options # This can be used to enable some testing options (see also the example ++++++ hostapd-2.0.tar.gz -> hostapd-2.1.tar.gz ++++++ ++++ 55580 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 digikam for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2014-04-23 17:31:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2013-10-29 09:21:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2014-04-23 17:31:48.000000000 +0200 @@ -1,0 +2,29 @@ +Mon Apr 21 00:35:31 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 4.0.0~beta4 + digikam: + - General : New Tags Manager window for easy tags management. + - General : New images quality sorter tool, based on blur, + noise, and compression analysis. + - General : Multiple selection and multiple drag-n-drop + capabilities on Tags Manager and Tags View from sidebars. + - General : Drop of Qt3Support classes. Now digiKam is + pure Qt4 implementation. + - Metadata : Support for writing face rectangles in Windows + Live Photo format. + - Editor : Port of canvas to Qt Model/view. + - Showfoto : Port of Thumbbar to Qt Model/view. + kipi-plugins: + - General: New tool to export collection to Google Drive cloud service. + - General: New tool to export collection to DropBox cloud service. + - MediaWiki: allow removal of metadata/GPS coordinates before uploading. + - MediaWiki: graphical interface improvements. + * See NEWS file for more details +- Drop rajceexport-stop-crashing-when-uploaded-nothing.patch, merged + upstream +- Drop libsoprano-devel and shared-desktop-ontologies-devel BuildRequires +- Disable gstreamer-0_10-plugins-qt-devel Buildrequires for 13.2+, + until we get qgstreamer with gstreamer 1.0 API support +- Remove unused parts of the spec (UpdatedApps repo no longer exists) + +------------------------------------------------------------------- Old: ---- digikam-3.5.0.tar.bz2 rajceexport-stop-crashing-when-uploaded-nothing.patch New: ---- digikam-4.0.0-beta4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.e78r5s/_old 2014-04-23 17:31:51.000000000 +0200 +++ /var/tmp/diff_new_pack.e78r5s/_new 2014-04-23 17:31:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package digikam # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,13 +17,14 @@ Name: digikam -Version: 3.5.0 +Version: 4.0.0~beta4 Release: 0 +%define rversion 4.0.0-beta4 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers Url: http://www.digikam.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/digikam/digikam-%{version}.tar.bz2 +Source0: http://download.kde.org/unstable/%{name}/%{name}-%{rversion}.tar.bz2 # PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work Patch0: digikam-buildtime.patch # PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez(a)suse.de bnc#711963 -- Remove GPLv2 only files from the build system @@ -32,8 +33,6 @@ Patch5: digikam_no_build_vkontakte.diff # PATCH-FIX-UPSTREAM digikam-3.0.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken Patch6: digikam-3.0.0.no-kdcraw.version-check.patch -# PATCH-FIX-UPSTREAM rajceexport-stop-crashing-when-uploaded-nothing.patch -- rajceexport: stop crashing when uploaded nothing -Patch7: rajceexport-stop-crashing-when-uploaded-nothing.patch BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel @@ -41,7 +40,10 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: gdk-pixbuf-devel +# TODO bring gstreamer-plugins-qt back for 13.2+ once we have them with gst1.0 +%if 0%{?suse_version} < 1320 BuildRequires: gstreamer-0_10-plugins-qt-devel +%endif BuildRequires: lensfun-devel %if 0%{?suse_version} > 1230 BuildRequires: libeigen3-devel @@ -63,17 +65,13 @@ BuildRequires: libkvkontakte-devel BuildRequires: liblcms-devel BuildRequires: liblqr-devel -%if 0%{?suse_version} > 1220 BuildRequires: libpgf-devel -%endif BuildRequires: libqca2-devel BuildRequires: libqjson-devel -BuildRequires: libsoprano-devel BuildRequires: libusb-1_0-devel BuildRequires: libusb-compat-devel BuildRequires: marble-devel BuildRequires: opencv-devel >= 2.4.5 -BuildRequires: shared-desktop-ontologies-devel BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) %if 0%{?suse_version} @@ -225,14 +223,11 @@ %lang_package -n libkgeomap %prep -%setup -q +%setup -q -n %{name}-%{rversion} %patch0 %patch3 %patch5 %patch6 -p1 -pushd extra/kipi-plugins -%patch7 -p1 -popd # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -246,14 +241,7 @@ popd %build -%if !0%{?kde_updatedapps} -%if 0%{?suse_version} >= 1310 - EXTRA_FLAGS="" -%endif -%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE $EXTRA_FLAGS -%else -%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=TRUE -DENABLE_INTERNALMYSQL=FALSE -%endif +%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE # there are files in there that are so heavy to the compiler, that one is enough %make_jobs VERBOSE=1 @@ -266,10 +254,7 @@ rm -f %{buildroot}%{_kde4_libdir}/libkipiplugins.so # Not needed -rm -f %{buildroot}%{_kde4_libdir}/libPropertyBrowser.a -rm -f %{buildroot}%{_kde4_libdir}/libHUpnp.a -rm -f %{buildroot}%{_kde4_libdir}/libHUpnpAv.a -rm -f %{buildroot}%{_kde4_libdir}/libQtSoap.a +rm -fv %{buildroot}%{_kde4_libdir}/*.a %if 0%{?suse_version} %suse_update_desktop_file -r %{name} Qt KDE Graphics Photography @@ -357,20 +342,13 @@ %{_kde4_modulesdir}/kio_digikammapimages.so %{_kde4_modulesdir}/kio_digikamsearch.so %{_kde4_modulesdir}/kio_digikamtags.so -%{_kde4_servicesdir}/digikamalbums.protocol -%{_kde4_servicesdir}/digikamdates.protocol -%{_kde4_servicesdir}/digikamimageplugin_*.desktop -%{_kde4_servicesdir}/digikammapimages.protocol -%{_kde4_servicesdir}/digikamsearch.protocol -%{_kde4_servicesdir}/digikamtags.protocol +%{_kde4_servicesdir}/digikam* %{_kde4_servicetypesdir}/digikamimageplugin.desktop %files doc %defattr(-,root,root,-) %doc COPYING.DOC -%doc %{_kde4_htmldir}/en/digikam/ -%doc %{_kde4_htmldir}/en/showfoto/ -%doc %{_kde4_htmldir}/en/kipi-plugins/ +%doc %{_kde4_htmldir}/*/ %doc %{_mandir}/man1/cleanup_digikamdb.1%{ext_man} %doc %{_mandir}/man1/digitaglinktree.1%{ext_man} @@ -398,31 +376,8 @@ %{_kde4_configkcfgdir}/photolayoutseditor.kcfg %dir %{_kde4_iconsdir}/hicolor/24x24/apps %{_kde4_iconsdir}/hicolor/*/actions/*.* +%{_kde4_iconsdir}/hicolor/*/apps/kipi-*.* %exclude %{_kde4_iconsdir}/hicolor/*/apps/kipi-gpsimagetag.png -%{_kde4_iconsdir}/hicolor/*/apps/kipi-debianscreenshots.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-dlna.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-dngconverter.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-expoblending.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-facebook.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-flash.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-flickr.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-gallery.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-hq.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-imageshack.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-imgur.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-jalbum.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-metadataedit.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-ogl.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-panorama.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-picasa.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-piwigo.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-rajce.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-shwup.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-slideshow.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-smugmug.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-timeadjust.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-wikimedia.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-zooomr.* %{_kde4_iconsdir}/hicolor/*/apps/photolayoutseditor.* %{_kde4_iconsdir}/hicolor/*/apps/rawconverter.* %{_kde4_iconsdir}/oxygen/*/apps/rawconverter.* @@ -497,183 +452,4 @@ %{_kde4_libdir}/pkgconfig/libmediawiki.pc %{_kde4_appsdir}/cmake/modules/FindMediawiki.cmake -%if 0%{?kde_updatedapps} - -%package -n libkdcraw20 -Version: 4.7.50 -Release: 0 -Summary: Shared library interface around dcraw -License: LGPL-2.1+ -Group: Development/Libraries/KDE -%requires_ge libqt4-x11 - -%description -n libkdcraw20 -Libkdcraw is a C++ interface around dcraw binary program used to decode -RAW picture files. The library documentation is available on header -files. - -This library is used by kipi-plugins, digiKam and others kipi host -programs. - -%files -n libkdcraw20 -%defattr(-,root,root) -%{_kde4_libdir}/libkdcraw.so.* -%{_kde4_appsdir}/libkdcraw/ -%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.png - -%post -n libkdcraw20 -p /sbin/ldconfig - -%postun -n libkdcraw20 -p /sbin/ldconfig - -%package -n libkdcraw-devel -Version: 4.7.50 -Release: 0 -Summary: Shared library interface around dcraw -License: LGPL-2.1+ -Group: Development/Libraries/KDE -Requires: libkdcraw20 = %{version} - -%description -n libkdcraw-devel -Libkdcraw is a C++ interface around dcraw binary program used to decode -RAW picture files. The library documentation is available on header -files. - -This library is used by kipi-plugins, digiKam and others kipi host -programs. - -%files -n libkdcraw-devel -%defattr(-,root,root) -%{_kde4_libdir}/libkdcraw.so -%{_kde4_includedir}/libkdcraw/ -%{_kde4_libdir}/pkgconfig/libkdcraw.pc - -%package -n libkipi8 -Version: 4.7.50 -Release: 0 -Summary: KDE Image Plug-In Interface -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT -Group: Development/Libraries/KDE -Recommends: libkipi8-lang = %{version} -%requires_ge libqt4-x11 - -%description -n libkipi8 -This package provides a generic KDE image plug-in interface used by -some KDE image applications. Plug-ins for this interface are in the -kipi-plugins package. - -%files -n libkipi8 -%defattr(-,root,root) -%{_kde4_libdir}/libkipi.so.* -%{_kde4_appsdir}/kipi/ -%{_kde4_iconsdir}/hicolor/*/apps/kipi.png -%{_kde4_servicetypesdir}/kipiplugin.desktop - -%post -n libkipi8 -p /sbin/ldconfig - -%postun -n libkipi8 -p /sbin/ldconfig - -%lang_package -n libkipi8 - -%files -n libkipi8-lang -f libkipi.lang -%defattr(-,root,root,-) - -%package -n libkipi-devel -Version: 4.7.50 -Release: 0 -Summary: KDE Image Plugin Interface -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT -Group: Development/Libraries/KDE -Requires: libkipi8 = %{version} - -%description -n libkipi-devel -This package provides a generic KDE Image Plug-in Interface used by -some KDE image applications. Plug-ins for this interface are in the -kipi-plugins package. - -%files -n libkipi-devel -%defattr(-,root,root) -%{_kde4_libdir}/libkipi.so -%{_kde4_includedir}/libkipi/ -%{_kde4_libdir}/pkgconfig/libkipi.pc - -%package -n libkexiv2-10 -Version: 4.7.50 -Release: 0 -Summary: Library to manipulate picture meta data -License: GPL-2.0+ -Group: Development/Libraries/KDE - -%description -n libkexiv2-10 -Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures -metadata. - -%files -n libkexiv2-10 -%defattr(-,root,root) -%{_kde4_appsdir}/libkexiv2/ -%{_kde4_libdir}/libkexiv2.so.* - -%package -n libkexiv2-devel -Version: 4.7.50 -Release: 0 -Summary: Library to manipulate picture meta data -License: GPL-2.0+ -Group: Development/Libraries/KDE -Requires: libkexiv2-10 = %{version} -%requires_ge libqt4-x11 - -%description -n libkexiv2-devel -Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures -metadata. - -%files -n libkexiv2-devel -%defattr(-,root,root) -%{_kde4_libdir}/libkexiv2.so -%{_kde4_includedir}/libkexiv2/ -%{_kde4_libdir}/pkgconfig/libkexiv2.pc - -%post -n libkexiv2-10 -p /sbin/ldconfig - -%postun -n libkexiv2-10 -p /sbin/ldconfig - -%package -n libksane0 -Version: 4.7.50 -Release: 0 -Summary: KDE scan library -License: GPL-2.0+ -Group: Productivity/Graphics/Other - -%description -n libksane0 -This package contains a library to add scan support to KDE -applications. - -%post -n libksane0 -p /sbin/ldconfig - -%postun -n libksane0 -p /sbin/ldconfig - -%files -n libksane0 -%defattr(-,root,root) -%_kde4_libdir/libksane.so.* - -%package -n libksane-devel -Version: 4.7.50 -Release: 0 -Summary: KDE scan library - Development Files -License: GPL-2.0+ -Group: Development/Libraries/KDE -Requires: libksane0 = %{version} -Requires: sane-backends-devel - -%description -n libksane-devel -This package contains a library to add scan support to KDE -applications. - -%files -n libksane-devel -%defattr(-,root,root) -%{_kde4_includedir}/libksane/ -%{_kde4_libdir}/pkgconfig/libksane.pc -%{_kde4_libdir}/libksane.so -%{_kde4_libdir}/cmake/KSane/ - -%endif - %changelog ++++++ digikam_no_build_vkontakte.diff ++++++ --- /var/tmp/diff_new_pack.e78r5s/_old 2014-04-23 17:31:51.000000000 +0200 +++ /var/tmp/diff_new_pack.e78r5s/_new 2014-04-23 17:31:51.000000000 +0200 @@ -1,6 +1,6 @@ --- CMakeLists.txt 2012-01-03 01:42:09.000000000 +0100 +++ CMakeLists.txt 2012-01-05 13:49:28.920827859 +0100 -@@ -70,7 +70,6 @@ +@@ -134,7 +134,6 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules ${CMAKE_SOURCE_DIR}/extra/libkface/cmake/modules @@ -8,7 +8,7 @@ ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ) -@@ -85,7 +84,6 @@ +@@ -149,7 +148,6 @@ ENDIF() SET(KFACE_LOCAL_DIR extra/libkface) SET(KGEOMAP_LOCAL_DIR extra/libkgeomap) SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) @@ -18,7 +18,7 @@ ADD_SUBDIRECTORY(core) --- extra/CMakeLists.txt 2012-01-03 01:31:52.000000000 +0100 +++ extra/CMakeLists.txt 2012-01-05 13:49:38.665828606 +0100 -@@ -33,7 +33,6 @@ +@@ -33,7 +33,6 @@ IF(${ENABLE_PRIVATE_KDEGRAPHICS}) ENDIF() MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) ++++++ remove-gplv2-only.patch ++++++ --- /var/tmp/diff_new_pack.e78r5s/_old 2014-04-23 17:31:51.000000000 +0200 +++ /var/tmp/diff_new_pack.e78r5s/_new 2014-04-23 17:31:51.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- extra/kipi-plugins/gpssync/CMakeLists.txt.orig +++ extra/kipi-plugins/gpssync/CMakeLists.txt -@@ -33,10 +33,8 @@ SET(kipiplugin_gpssync_PART_SRCS +@@ -32,10 +32,8 @@ SET(kipiplugin_gpssync_PART_SRCS IF(KDE4_BUILD_TESTS) INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/borrowed") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ConsoleKit for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package ConsoleKit for openSUSE:Factory checked in at 2014-04-23 17:31:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ConsoleKit (Old) and /work/SRC/openSUSE:Factory/.ConsoleKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ConsoleKit" Changes: -------- --- /work/SRC/openSUSE:Factory/ConsoleKit/ConsoleKit-doc.changes 2014-01-23 15:39:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ConsoleKit.new/ConsoleKit-doc.changes 2014-04-23 17:31:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 15 10:08:29 UTC 2014 - aj(a)suse.com + +- ConsoleKit was moved to /run, fix filelist for this as well. + +------------------------------------------------------------------- ConsoleKit.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ConsoleKit-doc.spec ++++++ --- /var/tmp/diff_new_pack.scEmHA/_old 2014-04-23 17:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.scEmHA/_new 2014-04-23 17:31:41.000000000 +0200 @@ -192,7 +192,7 @@ %{_sbindir}/* %{_mandir}/man8/pam_ck_connector.8.gz /%{_lib}/security -%ghost %_localstatedir/run/ConsoleKit +%ghost /run/ConsoleKit %{_datadir}/polkit-1/actions/org.freedesktop.consolekit.policy %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml ++++++ ConsoleKit.spec ++++++ --- /var/tmp/diff_new_pack.scEmHA/_old 2014-04-23 17:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.scEmHA/_new 2014-04-23 17:31:41.000000000 +0200 @@ -192,7 +192,7 @@ %{_sbindir}/* %{_mandir}/man8/pam_ck_connector.8.gz /%{_lib}/security -%ghost %_localstatedir/run/ConsoleKit +%ghost /run/ConsoleKit %{_datadir}/polkit-1/actions/org.freedesktop.consolekit.policy %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2014-04-23 17:31:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2014-04-12 08:33:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2014-04-23 17:31:32.000000000 +0200 @@ -39,0 +40,7 @@ +- No longer build against system libraries as that Chromium works + a lot better and crashes less on websites than with system libs + +- Added package depot_tools.tar.gz as that the chromium build now + requires it during the initial build phase. It just contains some + utilities and nothing from it is being installed. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apper for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package apper for openSUSE:Factory checked in at 2014-04-23 17:31:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apper (Old) and /work/SRC/openSUSE:Factory/.apper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apper" Changes: -------- --- /work/SRC/openSUSE:Factory/apper/apper.changes 2013-11-11 14:43:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apper.new/apper.changes 2014-04-23 17:31:09.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Apr 20 20:12:45 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 0.8.2 + * Better Apstream support + * Fixed translation catalog loading + * Fixed memleak + * Fixed accepting multiple license agreements +- Drop 0001-Fix-accept-multiple-licenses.dif and + 0002-Load-the-main-apper-catalog-for-the-applet.diff, merged upstream +- Drop checks for no longer supported versions +- Add Source URL + +------------------------------------------------------------------- Old: ---- 0001-Fix-accept-multiple-licenses.diff 0002-Load-the-main-apper-catalog-for-the-applet.diff apper-0.8.1.tar.bz2 New: ---- apper-0.8.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apper.spec ++++++ --- /var/tmp/diff_new_pack.klyoTE/_old 2014-04-23 17:31:10.000000000 +0200 +++ /var/tmp/diff_new_pack.klyoTE/_new 2014-04-23 17:31:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package apper # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,29 +16,19 @@ # -%if 0%{?suse_version} < 1310 -%define split_plasmoid 1 -%else -%define split_plasmoid 0 -%endif - Name: apper Summary: KDE interface for PackageKit License: GPL-2.0+ and LGPL-3.0+ Group: System/Packages -Version: 0.8.1 +Version: 0.8.2 Release: 0 -Source0: %{name}-%{version}.tar.bz2 +Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… Source1: 10-opensuse-org.packagekit.updater.js Patch0: apper-ui-fixes.diff # https://bugzilla.novell.com/show_bug.cgi?id=729164 Patch1: apper-no-dbus-service.diff # setting proxy requires polkit permissions - for very little gain Patch2: apper-no-user-proxy.diff -# PATCH-FIX-UPSTREAM 0001-Fix-accept-multiple-licenses.diff bnc#847346, kde#326619 -Patch3: 0001-Fix-accept-multiple-licenses.diff -# PATCH-FIX-UPSTREAM 0002-Load-the-main-apper-catalog-for-the-applet.diff -Patch4: 0002-Load-the-main-apper-catalog-for-the-applet.diff Url: http://kde-apps.org/content/show.php/Apper?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PackageKit-Qt-devel >= 0.8.8 @@ -48,51 +38,25 @@ Recommends: %{name}-lang = %{version} Provides: org.freedesktop.PackageKit.service Requires: PackageKit >= 0.8.8 -# last used in 11.3 -Provides: kupdateapplet = 0.9.18 -Obsoletes: kupdateapplet <= 0.9.17 -# last used in 11.0 -Provides: kde4-opensuse-updater = 0.8 -Obsoletes: kde4-opensuse-updater < 0.8 - -# last used in 11.3 -Obsoletes: kpackagekit < %{version} -Provides: kpackagekit = %{version} -%if !%{split_plasmoid} Obsoletes: apper-plasmoid < %{version} Provides: apper-plasmoid = %{version} -%endif %kde4_runtime_requires %description KDE interface for PackageKit package management. -%if %{split_plasmoid} -%package plasmoid -Summary: Plasmoid for the Apper Package management -Group: System/Packages -Requires: %{name} = %{version} - -%description plasmoid -The Plasmoids for the Apper Package Management -%endif - %lang_package %prep %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %cmake_kde4 -d build -- -DSCREENSHOT_PROVIDER=openSUSE %make_jobs %install -cd build -%makeinstall -cd .. +%kde4_makeinstall -C build # avoid confusion with yast %suse_update_desktop_file -C "Install, Update or Remove Software Packages" -N "Apper Software Management" %{buildroot}/%{_kde4_servicesdir}/kcm_apper.desktop @@ -120,33 +84,25 @@ %files %defattr(-,root,root) %doc COPYING TODO -%_kde4_libexecdir/apper-pk-session -%_kde4_appsdir/apperd/ -%_kde4_appsdir/apper/ -%_kde4_bindir/apper -%dir %_kde4_libdir/apper -%_kde4_applicationsdir/apper*.desktop -%_kde4_servicesdir/kcm_apper.desktop -%_kde4_servicesdir/kded/apperd.desktop +%{_kde4_libexecdir}/apper-pk-session +%{_kde4_appsdir}/apperd/ +%{_kde4_appsdir}/apper/ +%{_kde4_bindir}/apper +%dir %{_kde4_libdir}/apper +%{_kde4_applicationsdir}/apper*.desktop +%{_kde4_servicesdir}/kcm_apper.desktop +%{_kde4_servicesdir}/kded/apperd.desktop %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service -%if !%{split_plasmoid} -%_kde4_appsdir/plasma/ -%_kde4_servicesdir/plasma-applet-org.packagekit.updater.desktop +%{_kde4_appsdir}/plasma/ +%{_kde4_servicesdir}/plasma-applet-org.packagekit.updater.desktop %{_kde4_appsdir}/plasma-desktop/updates/10-opensuse-org.packagekit.updater.js -%endif %doc %{_kde4_mandir}/man1/* -%_kde4_libdir/%{name}/libapper.so -%_kde4_modulesdir/*.so +%{_kde4_libdir}/%{name}/libapper.so +%{_kde4_modulesdir}/*.so %config %{_kde4_sysconfdir}/ld.so.conf.d/apper.conf -%_kde4_modulesdir/imports/org/kde/%{name}/ - -%if %{split_plasmoid} -%files plasmoid -%defattr(-,root,root) -%_kde4_appsdir/plasma/ -%_kde4_servicesdir/plasma-applet-org.packagekit.updater.desktop -%{_kde4_appsdir}/plasma-desktop/updates/10-opensuse-org.packagekit.updater.js -%endif +%{_kde4_modulesdir}/imports/org/kde/%{name}/ +%dir %{_kde4_datadir}/appdata +%{_kde4_datadir}/appdata/apper.appdata.xml %files lang -f %{name}.lang %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit akonadi-runtime for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at 2014-04-23 17:31:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-runtime (Old) and /work/SRC/openSUSE:Factory/.akonadi-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "akonadi-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-runtime/akonadi-runtime.changes 2014-04-08 22:36:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-runtime.new/akonadi-runtime.changes 2014-04-23 17:31:02.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 22 10:09:03 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch, + resolves migration problems from earlier akonadi versions, kde#331867 + +------------------------------------------------------------------- New: ---- 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.n0JvTK/_old 2014-04-23 17:31:03.000000000 +0200 +++ /var/tmp/diff_new_pack.n0JvTK/_new 2014-04-23 17:31:03.000000000 +0200 @@ -25,6 +25,8 @@ Group: System/GUI/KDE Url: http://akonadi-project.org Source: http://download.kde.org/stable/%{rname}/src/%{rname}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch -- resolves migration problems from earlier akonadi versions, kde#331867 +Patch0: 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch BuildRequires: boost-devel BuildRequires: cmake >= 2.8.8 BuildRequires: fdupes @@ -68,6 +70,7 @@ %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 %build %cmake_kde4 -d build -- -DCONFIG_INSTALL_DIR=/etc -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DWITH_SOPRANO=FALSE ++++++ 0001-Remove-the-invalid-GID-part-from-PartTable-before-st.patch ++++++ >From 4ca8b846baaad48ebbd723f6411f9571a3b0f5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil(a)redhat.com> Date: Tue, 22 Apr 2014 11:28:07 +0200 Subject: [PATCH 1/1] Remove the invalid GID part from PartTable before starting PartTable migration More people than we expected have invalid 'GID' part in their PartTable, which breaks migration to schema 25, because it expects all part types to have a valid name. To work around this fact, we DELETE all parts with name 'GID' from PartTable before starting the actual migration. This will not fix the migration for people with other invalid parts, but I haven't heard of any such. To make this completely bullet-proof, we would need to iterate through all entries, which would be massively slower than current INSERT INTO ... SELECT FROM approach. Distributions, this is a good choice for backporting into 1.12.1 ;-) BUG: 331867 FIXED-IN: 1.12.2 --- server/src/storage/dbupdater.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/src/storage/dbupdater.cpp b/server/src/storage/dbupdater.cpp index ccaf584..d6368b5 100644 --- a/server/src/storage/dbupdater.cpp +++ b/server/src/storage/dbupdater.cpp @@ -261,6 +261,15 @@ bool DbUpdater::complexUpdate_25() } } + { + // It appears that more users than expected have the invalid "GID" part in their + // PartTable, which breaks the migration below (see BKO#331867), so we apply this + // wanna-be fix to remove the invalid part before we start the actual migration. + QueryBuilder qb( QLatin1String( "PartTable" ), QueryBuilder::Delete ); + qb.addValueCondition( QLatin1String( "PartTable.name" ), Query::Equals, QLatin1String( "GID" ) ); + qb.exec(); + } + akDebug() << "Creating a PartTable_new"; { TableDescription description; -- 1.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2014-04-23 17:28:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2014-04-06 09:56:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2014-04-23 17:28:17.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Apr 22 06:04:00 UTC 2014 - krahmer(a)suse.com + +- adding baloo DBUS service file (missing in last request) (bnc#866131) + +------------------------------------------------------------------- +Wed Apr 16 13:02:10 UTC 2014 - krahmer(a)suse.com + +- adding baloo DBUS config, formerly nepomuk (bnc#866131) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ config ++++++ --- /var/tmp/diff_new_pack.RhEEL6/_old 2014-04-23 17:28:18.000000000 +0200 +++ /var/tmp/diff_new_pack.RhEEL6/_new 2014-04-23 17:28:18.000000000 +0200 @@ -608,7 +608,10 @@ "org.neard.conf", "org.neard.service", # networkmanager-openswan (bnc#808549) - "nm-openswan-service.conf" + "nm-openswan-service.conf", + # baloo, formerly nepomuk (bnc#866131) + "org.kde.baloo.filewatch.conf", + "org.kde.baloo.filewatch.service" )) setOption("PAMModules.WhiteList", ( -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fcoe-utils for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package fcoe-utils for openSUSE:Factory checked in at 2014-04-23 17:28:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcoe-utils (Old) and /work/SRC/openSUSE:Factory/.fcoe-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcoe-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/fcoe-utils/fcoe-utils.changes 2014-04-05 14:42:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcoe-utils.new/fcoe-utils.changes 2014-04-23 17:28:15.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Apr 11 15:08:04 CEST 2014 - hare(a)suse.de + +- Replace patches with upstream version + Remove: 0025-systemctl-cannot-start-fcoemon.socket.patch + Add: 0028-systemctl-cannot-start-fcoemon.socket.patch +- Pull in patches from upstream: + * Really break out of recv_loop in fipvlan (bnc#870300) + Add: 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch + * Update documentation + Add: 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch + Add: 0027-man-Fix-typo-in-fcoemon-documentation.patch +- Add dependency on libhbalinux2 (bnc#873066) +- Correctly handle options when invoking fcoemon (bnc#872732) + Add: 0029-fcoemon-Correctly-handle-options-in-the-service-file.patch +- Include bnx2fc to SUPPORTED_DRIVERS (bnc#872741) + +------------------------------------------------------------------- Old: ---- 0025-systemctl-cannot-start-fcoemon.socket.patch New: ---- 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch 0027-man-Fix-typo-in-fcoemon-documentation.patch 0028-systemctl-cannot-start-fcoemon.socket.patch 0029-fcoemon-Correctly-handle-options-in-the-service-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcoe-utils.spec ++++++ --- /var/tmp/diff_new_pack.Ajxgw5/_old 2014-04-23 17:28:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ajxgw5/_new 2014-04-23 17:28:16.000000000 +0200 @@ -24,10 +24,11 @@ BuildRequires: libhbalinux2-devel BuildRequires: libtool BuildRequires: open-lldp-devel +BuildRequires: systemd-devel Requires: device-mapper Requires: iproute +Requires: libhbalinux2 Requires: open-lldp -BuildRequires: systemd-devel %systemd_requires Version: 1.0.29 Release: 0 @@ -36,7 +37,6 @@ Group: System/Daemons # git://open-fcoe.org/fcoe/fcoe-utils.git Source0: %{name}-%{version}.tar.xz -Source2: fcoe.config # Patches from git repository Patch1: 0001-man-Fix-small-typo-regarding-fcf-option.patch Patch2: 0002-Don-t-call-AM_INIT_AUTOMAKE-twice.patch @@ -55,8 +55,6 @@ Patch15: 0015-fipvlan-break-out-of-receive-loop-on-error.patch Patch16: 0016-fipvlan-handle-errors-from-fip-socket-creation.patch Patch17: 0017-fipvlan-filter-interfaces-from-rtnl_getlink.patch - -# Patches to be upstreamed Patch18: 0018-Add-missing-DESTDIR-when-installing-bash-completion.patch Patch19: 0019-Fix-build-with-Wl-as-needed.patch Patch20: 0020-Fix-integer-formatting.patch @@ -64,7 +62,13 @@ Patch22: 0022-fcnsq-Fixup-64bit-integer-handling.patch Patch23: 0023-fcoemon-add-systemd-service-file.patch Patch24: 0024-fcoemon-systemd-socket-activation.patch -Patch25: 0025-systemctl-cannot-start-fcoemon.socket.patch +Patch25: 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch +Patch26: 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch +Patch27: 0027-man-Fix-typo-in-fcoemon-documentation.patch + +# Patches to be upstreamed +Patch28: 0028-systemctl-cannot-start-fcoemon.socket.patch +Patch29: 0029-fcoemon-Correctly-handle-options-in-the-service-file.patch # Patches from Fedora Patch101: fcoe-utils-1.0.29-make.patch @@ -102,6 +106,10 @@ %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 %patch101 -p1 %build @@ -117,9 +125,6 @@ # unitfile ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcfcoe -# config -install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/fcoe/config - # contrib files mkdir -p %{buildroot}%{_libexecdir}/fcoe for file in \ ++++++ 0018-Add-missing-DESTDIR-when-installing-bash-completion.patch ++++++ --- /var/tmp/diff_new_pack.Ajxgw5/_old 2014-04-23 17:28:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ajxgw5/_new 2014-04-23 17:28:16.000000000 +0200 @@ -1,9 +1,10 @@ -From 51cfb504c434a8a0a1df9fa7c3cd9000c4e53d92 Mon Sep 17 00:00:00 2001 +From 0e5d536b20ed481d5a057e9bfee772b4c53bdb0f Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> -Date: Fri, 6 Dec 2013 11:08:23 +0100 -Subject: Add missing 'DESTDIR' when installing bash completion +Date: Fri, 6 Dec 2013 19:51:51 +0000 +Subject: build: Add missing 'DESTDIR' when installing bash completion Signed-off-by: Hannes Reinecke <hare(a)suse.de> +Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ++++++ 0019-Fix-build-with-Wl-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.Ajxgw5/_old 2014-04-23 17:28:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ajxgw5/_new 2014-04-23 17:28:16.000000000 +0200 @@ -1,12 +1,13 @@ -From a76be731a5e5262abf0c8deadf8f4f541559b9f8 Mon Sep 17 00:00:00 2001 +From 9869390ff1a6ecca1e6599e37128a07d237655e6 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> -Date: Fri, 6 Dec 2013 11:23:34 +0100 -Subject: Fix build with '-Wl,--as-needed' +Date: Fri, 6 Dec 2013 19:51:52 +0000 +Subject: build: Fix build with '-Wl,--as-needed' The libraries need to be specified correctly to get '--as-needed' to work. Signed-off-by: Hannes Reinecke <hare(a)suse.de> +Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- Makefile.am | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ++++++ 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch ++++++ >From fa308a68bda455d7305fc194d716ebc06b6f26c7 Mon Sep 17 00:00:00 2001 From: Robert Love <robert.w.love(a)intel.com> Date: Wed, 18 Dec 2013 11:51:35 -0800 Subject: doc: Update QUICKSTART/INSTALL docs for systemd init file install Update installation instructions so that systemd init files may be installed. Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- INSTALL | 3 +++ QUICKSTART | 3 +++ 2 files changed, 6 insertions(+) diff --git a/INSTALL b/INSTALL index 3abdf07..ea8c95e 100644 --- a/INSTALL +++ b/INSTALL @@ -19,6 +19,9 @@ DEPENDENCIES 1) Bootstrap, configure, make and make install # ./bootstrap.sh + Either execute the next line for System V init script install # rpm --eval "%configure" | sh + or the following line to install systemd unit scripts + # rpm --eval "%configure --with-systemdsystemunitdir=/" | sh # make # make install diff --git a/QUICKSTART b/QUICKSTART index 6fc82b3..c001bc1 100644 --- a/QUICKSTART +++ b/QUICKSTART @@ -201,7 +201,10 @@ PROCESS 2) Bootstrap, configure, make and make install # cd fcoe-utils # ./bootstrap.sh + Either execute the next line for System V init script install # rpm --eval "%configure" | sh + or the following line to install systemd unit scripts + # rpm --eval "%configure --with-systemdsystemunitdir=/" | sh # make # make install -- 1.8.1.4 ++++++ 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch ++++++ >From f90bbd76499b71a62f1e7c4ec68a62008031ee8e Mon Sep 17 00:00:00 2001 From: Eddie Wai <eddie.wai(a)broadcom.com> Date: Wed, 5 Mar 2014 14:42:28 +0000 Subject: FIPVLAN: Really break out of the recv_loop upon fip_recv error This patch adds additional code to break out of the recv_loop's while loop upon fip_recv error. This completes the fix from commit 78ea81aaef57b5b40fdc86335a7e6a432a72ad48. Without this, we have seen cases where the recv_loop gets stuck looping indefinitely. Signed-off-by: Eddie Wai <eddie.wai(a)broadcom.com> Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- fipvlan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fipvlan.c b/fipvlan.c index 1b8492d..cc71412 100644 --- a/fipvlan.c +++ b/fipvlan.c @@ -792,6 +792,8 @@ static void recv_loop(int timeout) break; } } + if (i < pfd_len) + break; } } -- 1.8.1.4 ++++++ 0027-man-Fix-typo-in-fcoemon-documentation.patch ++++++ >From 4982e604dab3f350f3a3ca20b3c001f8ee66fdc2 Mon Sep 17 00:00:00 2001 From: Robert Love <robert.w.love(a)intel.com> Date: Sat, 25 Jan 2014 03:10:21 +0000 Subject: man: Fix typo in fcoemon documentation "module" was misspelled "modlue." This patch fixes it. Signed-off-by: Robert Love <robert.w.love(a)intel.com> --- doc/fcoemon.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/fcoemon.txt b/doc/fcoemon.txt index 09ee5a2..7ccf892 100644 --- a/doc/fcoemon.txt +++ b/doc/fcoemon.txt @@ -56,7 +56,7 @@ OPTIONS *-d*, *--debug*:: Enable debugging messages. *-l*, *--legacy*:: - Force fcoemon to use the legacy /sys/modlue/libfcoe/parameters/ + Force fcoemon to use the legacy /sys/module/libfcoe/parameters/ interface. The default is to use the newer /sys/bus/fcoe/ interfaces if they are available. *-s*, *--syslog*:: -- 1.8.1.4 ++++++ 0025-systemctl-cannot-start-fcoemon.socket.patch -> 0028-systemctl-cannot-start-fcoemon.socket.patch ++++++ --- /work/SRC/openSUSE:Factory/fcoe-utils/0025-systemctl-cannot-start-fcoemon.socket.patch 2014-04-05 14:42:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcoe-utils.new/0028-systemctl-cannot-start-fcoemon.socket.patch 2014-04-23 17:28:15.000000000 +0200 @@ -1,4 +1,4 @@ -From 913faf7761a8fb004d44b5515b14efb0f60e9fa9 Mon Sep 17 00:00:00 2001 +From 444f3c66ee5a2b59a563d78cb70db7da2326d446 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> Date: Fri, 21 Mar 2014 14:46:40 +0100 Subject: systemctl cannot start fcoemon.socket ++++++ 0029-fcoemon-Correctly-handle-options-in-the-service-file.patch ++++++ >From 5216ae2ef4434d92ff3d49c4d5a7b73b438aee2d Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare(a)suse.de> Date: Fri, 11 Apr 2014 15:38:26 +0200 Subject: fcoemon: Correctly handle options in the service file When runnig under systemd we can't really modify the arguments to provide an 'FCOEMON_OPTS' variable. Instead we should be modifying fcoemon --debug and --syslog to accept 'yes' or 'no' as parameters; that way we can use the variables directly. References: bnc#872732 Signed-off-by: Hannes Reinecke <hare(a)suse.de> --- doc/fcoemon.txt | 6 +++--- etc/systemd/fcoe.service | 4 ++-- fcoemon.c | 24 +++++++++++++++--------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/doc/fcoemon.txt b/doc/fcoemon.txt index 7ccf892..7449601 100644 --- a/doc/fcoemon.txt +++ b/doc/fcoemon.txt @@ -53,13 +53,13 @@ OPTIONS ------- *-f*, *--foreground*:: Run *fcoemon* in the foreground. -*-d*, *--debug*:: - Enable debugging messages. +*-d*, *--debug=yes|no*:: + Enable or disable debugging messages. *-l*, *--legacy*:: Force fcoemon to use the legacy /sys/module/libfcoe/parameters/ interface. The default is to use the newer /sys/bus/fcoe/ interfaces if they are available. -*-s*, *--syslog*:: +*-s*, *--syslog=yes|no*:: Use syslogd for logging. The default behavior is to log to stdout and stderr. *-h*, *--help*:: diff --git a/etc/systemd/fcoe.service b/etc/systemd/fcoe.service index 5e5c8a2..2e10bcd 100644 --- a/etc/systemd/fcoe.service +++ b/etc/systemd/fcoe.service @@ -4,9 +4,9 @@ After=syslog.target network.target [Service] Type=simple -EnvironmentFile=/etc/sysconfig/fcoe +EnvironmentFile=/etc/fcoe/config ExecStartPre=/sbin/modprobe -qa $SUPPORTED_DRIVERS -ExecStart=/usr/sbin/fcoemon $FCOEMON_OPTS +ExecStart=/usr/sbin/fcoemon --debug=$DEBUG --syslog=$SYSLOG [Install] WantedBy=multi-user.target diff --git a/fcoemon.c b/fcoemon.c index 5e4f8d7..23fc2f6 100644 --- a/fcoemon.c +++ b/fcoemon.c @@ -336,9 +336,9 @@ static int fcoe_vid_from_ifname(const char *ifname); * Table for getopt_long(3). */ static struct option fcm_options[] = { - {"debug", 0, NULL, 'd'}, + {"debug", 1, NULL, 'd'}, {"legacy", 0, NULL, 'l'}, - {"syslog", 0, NULL, 's'}, + {"syslog", 1, NULL, 's'}, {"exec", 1, NULL, 'e'}, {"foreground", 0, NULL, 'f'}, {"version", 0, NULL, 'v'}, @@ -3192,9 +3192,9 @@ static void fcm_usage(void) { printf("Usage: %s\n" "\t [-f|--foreground]\n" - "\t [-d|--debug]\n" + "\t [-d|--debug=yes|no]\n" "\t [-l|--legacy]\n" - "\t [-s|--syslog]\n" + "\t [-s|--syslog=yes|no]\n" "\t [-v|--version]\n" "\t [-h|--help]\n\n", progname); exit(1); @@ -3648,22 +3648,28 @@ int main(int argc, char **argv) sa_log_flags = 0; openlog(sa_log_prefix, LOG_CONS, LOG_DAEMON); - while ((c = getopt_long(argc, argv, "fdhlsv", + while ((c = getopt_long(argc, argv, "fd:hls:v", fcm_options, NULL)) != -1) { switch (c) { case 'f': fcm_fg = 1; break; case 'd': - fcoe_config.debug = 1; - enable_debug_log(1); + if (!strncmp(optarg, "yes", 3) || + !strncmp(optarg, "YES", 3)) { + fcoe_config.debug = 1; + enable_debug_log(1); + } break; case 'l': force_legacy = true; break; case 's': - fcoe_config.use_syslog = 1; - enable_syslog(1); + if (!strncmp(optarg, "yes", 3) || + !strncmp(optarg, "YES", 3)) { + fcoe_config.use_syslog = 1; + enable_syslog(1); + } break; case 'v': printf("%s\n", FCOE_UTILS_VERSION); -- 1.8.1.4 ++++++ fcoe.config ++++++ --- /var/tmp/diff_new_pack.Ajxgw5/_old 2014-04-23 17:28:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ajxgw5/_new 2014-04-23 17:28:16.000000000 +0200 @@ -1,5 +1,5 @@ # All supported drivers listed here are loaded when service starts -SUPPORTED_DRIVERS="libfc fcoe" +SUPPORTED_DRIVERS="libfc fcoe bnx2fc" # Add --debug to enable debug messages FCOEMON_OPTS="--syslog" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nfs-utils for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2014-04-23 17:28:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nfs-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-03-20 06:53:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-04-23 17:28:14.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Apr 16 15:24:27 UTC 2014 - trenn(a)suse.de + +- Remove mkinitrd bits -> we use dracut now which already has + nfs stuff provided in its package in: + /usr/lib/dracut/modules.d/95nfs/ + Remove sources: + - mkinitrd-boot.sh + - mkinitrd-setup.sh + +------------------------------------------------------------------- Old: ---- mkinitrd-boot.sh mkinitrd-setup.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.EcjEUA/_old 2014-04-23 17:28:15.000000000 +0200 +++ /var/tmp/diff_new_pack.EcjEUA/_new 2014-04-23 17:28:15.000000000 +0200 @@ -16,6 +16,7 @@ # + Name: nfs-utils BuildRequires: device-mapper-devel BuildRequires: e2fsprogs-devel @@ -58,8 +59,6 @@ Source6: README.NFSv4 Source7: fw-client Source8: fw-server -Source9: mkinitrd-setup.sh -Source10: mkinitrd-boot.sh Source11: idmapd.conf Source12: start-statd Source13: nfs-utils.rpmlintrc @@ -203,9 +202,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services install -m 0644 %{SOURCE7} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-client install -m 0644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server -install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{S:9} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-nfs.sh -install -m 755 %{S:10} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-nfs.sh install -m 755 %{S:12} $RPM_BUILD_ROOT/usr/sbin/start-statd install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf # @@ -232,7 +228,6 @@ mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs fi ### -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %{fillup_and_insserv -n nfs nfs} # %set_permissions /sbin/mount.nfs @@ -244,7 +239,6 @@ %postun -n nfs-client %restart_on_update nfs -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %insserv_cleanup %service_del_postun nfs @@ -281,10 +275,6 @@ %config /etc/init.d/nfs %config /etc/idmapd.conf %config /etc/nfsmount.conf -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/setup-nfs.sh -/lib/mkinitrd/scripts/boot-nfs.sh %verify(not mode) %attr(0755,root,root) /sbin/mount.nfs /sbin/mount.nfs4 /sbin/umount.nfs -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tk for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package tk for openSUSE:Factory checked in at 2014-04-23 17:28:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tk (Old) and /work/SRC/openSUSE:Factory/.tk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tk" Changes: -------- --- /work/SRC/openSUSE:Factory/tk/tk.changes 2013-10-23 10:15:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tk.new/tk.changes 2014-04-23 17:28:12.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Mar 31 02:35:59 UTC 2014 - badshah400(a)gmail.com + +- Add tk-fix-pkgconfig-file.patch to fix undefined linker flag + (@TK_LIBS@) in tk.pc pkgconfig file; patch sent upstream, see + https://core.tcl.tk/tcl/tktview?name=5bcb5026ad51abb7 . + +------------------------------------------------------------------- New: ---- tk-fix-pkgconfig-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tk.spec ++++++ --- /var/tmp/diff_new_pack.ve4eCZ/_old 2014-04-23 17:28:13.000000000 +0200 +++ /var/tmp/diff_new_pack.ve4eCZ/_new 2014-04-23 17:28:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tk # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -52,6 +52,8 @@ Source3: http://tkcon.cvs.sourceforge.net/tkcon/tkcon/tkcon.tcl Patch0: %name.patch Patch1: tk-8.5.12-fix-xft.patch +# PATCH-FIX-UPSTREAM tk-fix-pkgconfig-file.patch badshah400(a)gmail.com -- Fix undefined token (@TK_LIBS@) in linker flag in pkgconfig file; patch sent upstream +Patch2: tk-fix-pkgconfig-file.patch %description Tk is a graphical user interface toolkit that takes developing desktop @@ -99,6 +101,7 @@ %setup -q -n %name%version %patch0 %patch1 -p1 +%patch2 -p1 %build cd unix ++++++ tk-fix-pkgconfig-file.patch ++++++ https://core.tcl.tk/tcl/tktview?name=5bcb5026ad51abb7 Index: tk8.6.1/unix/tk.pc.in =================================================================== --- tk8.6.1.orig/unix/tk.pc.in +++ tk8.6.1/unix/tk.pc.in @@ -11,5 +11,5 @@ URL: http://www.tcl.tk/ Version: @TK_VERSION@ Requires: Conflicts: -Libs: -L${libdir} @TK_LIBS@ +Libs: -L${libdir} @TK_LIB_FLAG@ Cflags: -I${includedir} -- 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-numpy for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package python-numpy for openSUSE:Factory checked in at 2014-04-23 17:28:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-numpy (Old) and /work/SRC/openSUSE:Factory/.python-numpy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-numpy" Changes: -------- --- /work/SRC/openSUSE:Factory/python-numpy/python-numpy-doc.changes 2014-02-04 22:46:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-numpy.new/python-numpy-doc.changes 2014-04-23 17:28:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 05:24:31 UTC 2014 - arun(a)gmx.de + +- bugfix release 1.8.1 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-numpy/python-numpy.changes 2013-12-08 19:46:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-numpy.new/python-numpy.changes 2014-04-23 17:28:09.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 14 05:23:39 UTC 2014 - arun(a)gmx.de + +- bugfix release 1.8.1 + +------------------------------------------------------------------- Old: ---- numpy-1.8.0.tar.gz New: ---- numpy-1.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-numpy-doc.spec ++++++ --- /var/tmp/diff_new_pack.UKOJQu/_old 2014-04-23 17:28:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UKOJQu/_new 2014-04-23 17:28:10.000000000 +0200 @@ -19,7 +19,7 @@ %define modname numpy Name: python-%{modname}-doc %define docname numpydoc -Version: 1.8.0 +Version: 1.8.1 Release: 0 %define docvers 0.4 Url: http://sourceforge.net/projects/numpy ++++++ python-numpy.spec ++++++ --- /var/tmp/diff_new_pack.UKOJQu/_old 2014-04-23 17:28:10.000000000 +0200 +++ /var/tmp/diff_new_pack.UKOJQu/_new 2014-04-23 17:28:10.000000000 +0200 @@ -20,7 +20,7 @@ %define modname numpy Name: python-%{modname} -Version: 1.8.0 +Version: 1.8.1 Release: 0 Url: http://sourceforge.net/projects/numpy Summary: NumPy array processing for numbers, strings, records and objects ++++++ numpy-1.8.0.tar.gz -> numpy-1.8.1.tar.gz ++++++ ++++ 31958 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 vdr for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package vdr for openSUSE:Factory checked in at 2014-04-22 17:09:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vdr (Old) and /work/SRC/openSUSE:Factory/.vdr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vdr" Changes: -------- --- /work/SRC/openSUSE:Factory/vdr/vdr.changes 2013-03-05 16:34:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vdr.new/vdr.changes 2014-04-22 17:09:22.000000000 +0200 @@ -1,0 +2,92 @@ +Tue Apr 22 10:38:57 UTC 2014 - seife+obs(a)b1-systems.com + +- remove support for ancient distributions +- list of patches which fix stuff: + vdr-1.7.21-pluginmissing.patch - don't die on missing plugin + vdr-1.7.29-menuselection.patch + vdr-1.7.36-wareagle.patch - wareagle icons + vdr-2.0.6-wareagle-fix.patch + vdr-2.0.3-dynamite.patch - allow the dynamite plugin + vdr-2.0.4-MainMenuHooks-v1_0_1.patch + +------------------------------------------------------------------- +Thu Apr 10 21:40:38 UTC 2014 - seife+obs(a)b1-systems.com + +- vdr.macros: remove vdr_old_plugin_* and vdr_install_plugin_*, + all current users are converted now + +------------------------------------------------------------------- +Sun Apr 6 21:57:34 UTC 2014 - seife+obs(a)b1-systems.com + +- fix broken record filenames in e.g. streamdev, bug in wareagle + patch (vdr-2.0.6-wareagle-fix.patch) + +------------------------------------------------------------------- +Wed Apr 2 16:19:07 UTC 2014 - seife+obs(a)b1-systems.com + +- small fix for classic runvdr init script +- recommend instead of suggest runvdr-extreme on >=12.1, vdr-runvdr + on < 12.2 + +------------------------------------------------------------------- +Sun Mar 30 18:31:26 UTC 2014 - seife+obs(a)b1-systems.com + +- fix build on SLES11 +- remove unused vdr_old_dvbapi.diff and Make.config + +------------------------------------------------------------------- +Sun Mar 30 16:34:31 UTC 2014 - seife+obs(a)b1-systems.com + +- split off init script into vdr-runvdr package + It is recommended to use runvdr-extreme-systemd instead + +------------------------------------------------------------------- +Sun Mar 30 12:05:23 UTC 2014 - seife+obs(a)b1-systems.com + +- avoid putting build time into locale files, causing republishing +- install msgmerge wrapper to /usr/share/vdr to make it usable + by plugins + +------------------------------------------------------------------- +Sun Mar 30 02:02:25 UTC 2014 - seife+obs(a)b1-systems.com + +- update to vdr 2.0.6 + - see HISTORY file for changes + - vdrapi version bumped to 2.0.6 + +------------------------------------------------------------------- +Sat Mar 29 20:12:03 UTC 2014 - seife+obs(a)b1-systems.com + +- vdr.macros: allow empty srcdir in vdr_old_plugin_make + +------------------------------------------------------------------- +Sat Mar 29 19:07:25 UTC 2014 - seife+obs(a)b1-systems.com + +- vdr.macros: set vdr_includedir back to /usr/include/vdr + +------------------------------------------------------------------- +Sat Mar 29 16:32:55 UTC 2014 - seife+obs(a)b1-systems.com + +- remove plugin build macros + +------------------------------------------------------------------- +Sun Jan 12 12:02:45 UTC 2014 - wagner-thomas(a)gmx.at + +- Update to vdr 2.0.5 + +------------------------------------------------------------------- +Tue Nov 26 16:06:50 UTC 2013 - hpj(a)urpla.net + +- Update to vdr 2.0.4 + +------------------------------------------------------------------- +Tue Jun 4 21:33:54 UTC 2013 - hpj(a)urpla.net + +- Adjust vdr macros + +------------------------------------------------------------------- +Tue Jun 4 21:12:42 UTC 2013 - hpj(a)urpla.net + +- Update to vdr 2.0.2 + +------------------------------------------------------------------- Old: ---- channels.conf vdr-1.6.0-1.diff vdr-1.6.0-2.diff vdr-1.6.0-bnc786040-use-v4l2.patch vdr-1.6.0-const.diff vdr-1.6.0-gcc46.patch vdr-1.6.0-kernel-2.6.29.diff vdr-1.6.0-ncurses.diff vdr-1.6.0.tar.bz2 vdr-FcFontSort-72c5ec3.diff vdr-gcc47.patch New: ---- msgmerge vdr-1.7.21-pluginmissing.patch vdr-1.7.29-menuselection.patch vdr-1.7.36-wareagle.patch vdr-2.0.3-dynamite.patch vdr-2.0.4-MainMenuHooks-v1_0_1.patch vdr-2.0.6-wareagle-fix.patch vdr-2.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr.spec ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vdr # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,28 +17,29 @@ Name: vdr +BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: fontconfig-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ +BuildRequires: graphviz +BuildRequires: libcap-devel BuildRequires: libjpeg-devel +BuildRequires: linux-glibc-devel BuildRequires: ncurses-devel -%if %suse_version > 1000 -BuildRequires: libcap-devel -%else -BuildRequires: libcap -%endif +BuildRequires: pkg-config # %define vdrname vdr -%define vdr_apiversion 1.6.0 +%define vdr_apiversion 2.0.6 %define vdr_localedir %{_datadir}/vdr/locale -%define vdr_libdir %{_libdir}/vdr/ +%define vdr_libdir %{_libdir}/vdr %define vdr_includedir %{_includedir}/vdr %define vdr_videodir /var/spool/video %define vdr_sysconfdir /etc/vdr # Url: http://www.tvdr.de/ -PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq -Version: 1.6.0 +PreReq: /usr/sbin/useradd +Version: 2.0.6 Release: 0 Summary: Video Disk Recorder License: GPL-2.0+ @@ -48,12 +49,11 @@ Source2: sysconfig.vdr Source3: vdr-shutdown.sh Source4: runvdr -#Source5: README.SuSE-vdr +Source5: remote.conf Source6: openvt.diff Source7: vdr-genindex.c -Source8: channels.conf -Source9: remote.conf Source10: vdr.macros +Source42: msgmerge # generated from wiki page Source90: README.SuSE-vdr.txt Source91: README.SuSE-vdr.html @@ -61,24 +61,25 @@ Source93: vdr-fetchwikipage Source94: vdr-renderwikipage Source95: vdr-doc.desktop -Patch0: ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-1.diff -Patch1: ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-2.diff -Patch20: vdr-1.6.0-ncurses.diff -Patch21: vdr-1.6.0-kernel-2.6.29.diff -Patch22: vdr-1.6.0-const.diff -# PATCH-FIX-UPSTREAM vdr-1.6.0-gcc46.patch idoenmez(a)suse.de -- Fix compilation with gcc 4.6 -Patch23: vdr-1.6.0-gcc46.patch -# PATCH-FIX-UPSTREAM vdr-gcc47.patch dimstar(a)opensuse.org -- Fix build with gcc 4.7. -Patch25: vdr-gcc47.patch -# UPSTREAM 72c5ec3 to make it work with fontconfig-2.9 -Patch26: vdr-FcFontSort-72c5ec3.diff -# PATCH-FIX-Upstream vdr-1.6.0-bnc786040-use-v4l2.patch seife(a)novel.slipkontur.de -- use v4l2. -Patch27: vdr-1.6.0-bnc786040-use-v4l2.patch +# +Patch1: vdr-1.7.29-menuselection.patch +Patch2: vdr-1.7.21-pluginmissing.patch +Patch3: vdr-1.7.36-wareagle.patch +Patch4: vdr-2.0.3-dynamite.patch +Patch5: vdr-2.0.4-MainMenuHooks-v1_0_1.patch +Patch6: vdr-2.0.6-wareagle-fix.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: vdr-devel Provides: vdr(abi) = %vdr_apiversion +Obsoletes: vdr(abi) < %vdr_apiversion +Provides: vdrapi = %vdr_apiversion Requires: xorg-x11-fonts-scalable -Recommends: vdr-plugins dvb +%if 0%{?suse_version} >= 1220 +Recommends: runvdr-extreme-systemd +%else +Recommends: vdr-runvdr +%endif %package devel Summary: Video Disk Recorder @@ -86,86 +87,52 @@ PreReq: vdr = %version %description -Video Disk Recorder (VDR) is a digital satellite (DVB) receiver -program. It can record MPEG2 streams, as well as output the stream to -TV. - - - -Authors: --------- - Klaus Schmidinger <Klaus.Schmidinger(a)tvdr.de> - Carsten Koch <Carsten.Koch(a)icem.de> - Plamen Ganev <pganev(a)com-it.net> - Heino Goldenstein <heino.goldenstein(a)microplex.de> - Guido Fiala <gfiala(a)s.netic.de> - Robert Schneider <Robert.Schneider(a)lotus.com> - Niels de Carpentier <niels(a)casema.net> - Martin Hammerschmid <martin(a)hammerschmid.com> - Bastian Guse <bastian(a)nocopy.de> - Matthias Schniedermeyer <ms(a)citd.de> - Miha Setina <mihasetina(a)softhome.net> - Alberto Carraro <bertocar(a)tin.it> - Deti Fliegl <deti(a)fliegl.de> - Dave Chapman <dave(a)dchapman.com> - Hans-Peter Raschke <Hans-Peter.Raschke(a)Wintermann-DatenService.de> - Peter Hofmann <software(a)pxh.de> - Axel Gruber <axel(a)agm.de> - Arnold Niessen <niessen(a)iae.nl> <arnold.niessen(a)philips.com> - Jürgen Sauer <jojo(a)automatix.de> - Benjamin Reichardt <reichard(a)math.uni-goettingen.de> - Henning Holtschneider <hh(a)holtschneider.com> +Version 2.0 of VDR, the Linux Video Disk Recorder provides HDTV support, the +Transport Stream recording format, DVB subtitles, ATSC support, and improved +Electronic Program Guides handling. %description devel -Video Disk Recorder (VDR) is a digital satellite (DVB) receiver -program. It can record MPEG2 streams, as well as output the stream to -TV. - +Development files for VDR, needed for building plugins, including API documentation. +%package runvdr +Summary: Init script for VDR +Group: Hardware/TV +PreReq: vdr = %version +PreReq: %fillup_prereq %insserv_prereq -Authors: --------- - Klaus Schmidinger <Klaus.Schmidinger(a)tvdr.de> - Carsten Koch <Carsten.Koch(a)icem.de> - Plamen Ganev <pganev(a)com-it.net> - Heino Goldenstein <heino.goldenstein(a)microplex.de> - Guido Fiala <gfiala(a)s.netic.de> - Robert Schneider <Robert.Schneider(a)lotus.com> - Niels de Carpentier <niels(a)casema.net> - Martin Hammerschmid <martin(a)hammerschmid.com> - Bastian Guse <bastian(a)nocopy.de> - Matthias Schniedermeyer <ms(a)citd.de> - Miha Setina <mihasetina(a)softhome.net> - Alberto Carraro <bertocar(a)tin.it> - Deti Fliegl <deti(a)fliegl.de> - Dave Chapman <dave(a)dchapman.com> - Hans-Peter Raschke <Hans-Peter.Raschke(a)Wintermann-DatenService.de> - Peter Hofmann <software(a)pxh.de> - Axel Gruber <axel(a)agm.de> - Arnold Niessen <niessen(a)iae.nl> <arnold.niessen(a)philips.com> - Jürgen Sauer <jojo(a)automatix.de> - Benjamin Reichardt <reichard(a)math.uni-goettingen.de> - Henning Holtschneider <hh(a)holtschneider.com> +%description runvdr +The "classic" SUSE start script for VDR. Not recommended, use runvdr-extreme-systemd instead. %prep %setup -q -n vdr-%{version} -cp %{SOURCE1} . -cp %{SOURCE2} . -cp %{SOURCE4} . +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} . +# +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 # cat > Make.config <<EOF ### The C compiler options: CFLAGS = $RPM_OPT_FLAGS -fPIC -Wall -CXXFLAGS = -fPIC $RPM_OPT_FLAGS -Wall -Woverloaded-virtual +CXXFLAGS = $RPM_OPT_FLAGS -fPIC -Wall -Werror=overloaded-virtual -Wparentheses ### The directory environment: -MANDIR = %{_mandir} +PREFIX = %{_prefix} BINDIR = %{_bindir} +INCDIR = %{_includedir} +LIBDIR = %{vdr_libdir} LOCDIR = %{vdr_localedir} +MANDIR = %{_mandir} +PCDIR = %{_libdir}/pkgconfig +RESDIR = %{_datadir}/vdr + VIDEODIR = %{vdr_videodir} -REMOTE = LIRC -PLUGINLIBDIR = %{vdr_libdir} +CONFDIR = %{vdr_sysconfdir} +CACHEDIR = %{_localstatedir}/cache/vdr +LIRC_DEVICE = /var/run/lirc/lircd VDR_USER = vdr -WITH_CAPABILITIES = 1 EOF # APIVERSION=`sed -ne '/define APIVERSION/s/^.*"$.*$".*$/\1/p' config.h` @@ -173,67 +140,45 @@ echo "*** APIVERSION must be $APIVERSION, fix definition!" false fi -%patch0 -p1 -%patch1 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 +# for some reason, graphviz doesn't like png here +sed -i 's|^$DOT_IMAGE_FORMAT\s\+= $.*$|\1svg|g + s|^$INTERACTIVE_SVG\s\+= $.*$|\1YES|g' Doxyfile +# do not include build date in locale files +cp -a %{SOURCE42} . +chmod 0755 msgmerge %build -#cp %{SOURCE5} README.SuSE -cp %{SOURCE6} . -cp %{SOURCE7} . +# to use msgmerge script +export PATH=`pwd`:$PATH make %{?jobs:-j%jobs} make plugins +make srcdoc gcc -o vdr-genindex %{optflags} -funroll-loops vdr-genindex.c %install -install -d -m 755 %{buildroot}%{_mandir}/man{1,5} -install -d -m 755 %{buildroot}%{_sbindir} -install -d -m 755 %{buildroot}%{_bindir} -install -d -m 755 %{buildroot}%{vdr_sysconfdir} -install -d -m 755 %{buildroot}%{vdr_sysconfdir}/plugins -install -d -m 755 %{buildroot}%{vdr_videodir} -install -d -m 755 %{buildroot}%{vdr_libdir} -install -d -m 755 %{buildroot}%{vdr_includedir} -install -d -m 755 %{buildroot}%{vdr_includedir}/libsi -make MANDIR=%{buildroot}%{_mandir} \ - BINDIR=%{buildroot}%{_sbindir} \ - VIDEODIR=%{buildroot}%{vdr_videodir} \ - PLUGINLIBDIR=%{buildroot}%{vdr_libdir} \ - LOCDIR=%{buildroot}%{vdr_localedir} \ - install -# +%makeinstall install -m 644 *.conf %{buildroot}%{vdr_sysconfdir} -for i in epg2html.pl svdrpsend.pl PLUGINS/src/sky/getskyepg.pl; do - install -m 755 $i %{buildroot}%{_bindir}/${i##*/} -done -install -m 644 *.h %{buildroot}%{vdr_includedir} -install -m 644 libsi/*.h %{buildroot}%{vdr_includedir}/libsi install -m 644 Make.config %{buildroot}%{vdr_includedir} -ln -s . %{buildroot}%{vdr_includedir}/vdr -ln -s . %{buildroot}%{vdr_includedir}/include -install -m 755 PLUGINS/lib/* %{buildroot}%{vdr_libdir}/ -install -m 755 %{SOURCE3} %{buildroot}%{vdr_sysconfdir}/shutdown.sh -#sysconfig&init +install -m 755 vdr-shutdown.sh %{buildroot}%{vdr_sysconfdir}/shutdown.sh +install -d -m 755 %{buildroot}%{_localstatedir}/cache/vdr +# sysconfig&init for vdr-runvdr install -d -m 755 %{buildroot}/var/adm/fillup-templates install -m 644 sysconfig.vdr %{buildroot}/var/adm/fillup-templates/sysconfig.vdr install -d -m 755 %{buildroot}/etc/init.d +install -d -m 755 %{buildroot}%{_sbindir} install -m 755 rcvdr %{buildroot}/etc/init.d/vdr -ln -s ../../etc/init.d/vdr %{buildroot}%{_sbindir}/rcvdr +# ln -s ../../etc/init.d/vdr %%{buildroot}%%{_sbindir}/rcvdr +ln -s service %{buildroot}%{_sbindir}/rcvdr # create plugins doc dir mkdir plugins -cp -a PLUGINS/src/sky/channels.conf.sky PLUGINS/src/sky/lircd.conf.sky plugins -cp -a PLUGINS/src/sky/README plugins/README.sky -cp -a PLUGINS/src/osddemo/README plugins/README.osddemo -rm %{buildroot}%{_sbindir}/runvdr +for d in PLUGINS/src; do + test -d PLUGINS/src/$d && { + for f in README HISTORY COPYING; do + test -f PLUGINS/src/$d/$f && cp -a PLUGINS/src/$d/$f plugins/$f.$d + done + } +done install -m 755 runvdr %{buildroot}%{_sbindir}/runvdr -install -m 644 %{SOURCE8} %{buildroot}%{vdr_sysconfdir}/channels.conf -install -m 644 %{SOURCE9} %{buildroot}%{vdr_sysconfdir}/remote.conf install -m 755 vdr-genindex %{buildroot}%{_bindir} # # docu @@ -250,6 +195,11 @@ echo "%%lang(${f%%%%/*}) %{vdr_localedir}/$f" done >> vdr.lang # +# source code docu (installed manually for the sake of fdupes' success) +install -d -m 755 %{buildroot}%{_docdir}/%{name}-devel +cp -a srcdoc/html %{buildroot}%{_docdir}/%{name}-devel +%fdupes %{buildroot}%{_docdir}/%{name}-devel +# # rpm macro file install -d -m 755 %{buildroot}/etc/rpm cat > %{buildroot}/etc/rpm/macros.vdr <<EOF @@ -263,6 +213,9 @@ %%vdr_prereq vdr(abi) = %{vdr_apiversion} EOF cat %{SOURCE10} >> %{buildroot}/etc/rpm/macros.vdr +# +# msgmerge helper for plugins +install -m 0755 msgmerge %{buildroot}%{_datadir}/vdr/msgmerge %clean rm -rf $RPM_BUILD_ROOT @@ -270,41 +223,49 @@ %pre /usr/sbin/useradd -r -d %{vdr_videodir} -s /bin/false -c "Video Disk Recorder" -g video vdr 2> /dev/null || : -%post +%post runvdr %{fillup_and_insserv vdr} -%postun +%postun runvdr %{insserv_cleanup} -%preun +%preun runvdr %stop_on_removal %files -f vdr.lang %defattr(-,root,root) %doc README.SuSE README.SuSE.html greenish.css %doc %{_datadir}/susehelp -%doc COPYING INSTALL README CONTRIBUTORS HISTORY +%doc COPYING INSTALL README* UPDATE* CONTRIBUTORS HISTORY %doc MANUAL channels.conf.* PLUGINS.html plugins %doc openvt.diff %attr(755,vdr,root) %dir %{vdr_videodir} %attr(755,vdr,root) %dir %{vdr_sysconfdir} +%attr(755,vdr,root) %dir %{_localstatedir}/cache/vdr %dir %{vdr_libdir} %dir %{_datadir}/vdr %dir %{vdr_localedir} %dir %{vdr_localedir}/* %dir %{vdr_localedir}/*/LC_MESSAGES %attr(-,vdr,root) %config(noreplace) %{vdr_sysconfdir}/* -%{_sbindir}/* %{_bindir}/* +%{_sbindir}/rcvdr %{vdr_libdir}/* %{_mandir}/man?/* -/etc/init.d/* -/var/adm/fillup-templates/* %files devel %defattr(-,root,root) %config /etc/rpm/macros.vdr -%dir %{vdr_includedir} -%{vdr_includedir}/* +%{vdr_includedir} +%{_includedir}/libsi +%{_libdir}/pkgconfig/* +%{_docdir}/%{name}-devel +%{_datadir}/vdr/msgmerge + +%files runvdr +%defattr(-,root,root) +/etc/init.d/* +%{_sbindir}/runvdr +/var/adm/fillup-templates/* %changelog ++++++ README.SuSE-vdr.html ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -33,7 +33,7 @@ Astra-19.2E (DVB-S). You can create you own using dvbscan. For example if you live in Nuernberg, Germany and want to create a channels.conf for DVB-T you would run</p> -<pre> dvbscan -o vdr /usr/share/dvb/scan/dvb-t/de-Nuernberg > /etc/vdr/channels.conf +<pre> scan -o vdr /usr/share/dvb/scan/dvb-t/de-Nuernberg > /etc/vdr/channels.conf </pre> <a name='Using%20vdr%20with%20a%20TV%20set%20attached'></a><h2>Using vdr with a TV set attached</h2> @@ -84,4 +84,4 @@ <p>Packages for the most recent stable vdr version are available via the <a href='http://download.opensuse.org/repositories/vdr/'>openSUSE build service</a></p> -</html></body> \ No newline at end of file +</html></body> ++++++ README.SuSE-vdr.txt ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -14,8 +14,8 @@ • /var/spool/video is the place where recordings are stored. If you are low on space you should consider putting this on a separate partition. Recordings can take up several Gigabytes. - • /usr/lib/vdr contains shared libraries for plugins. If you compile you own - plugins you need to put them there. + • /usr/{lib,lib64}/vdr contains shared libraries for plugins. If you compile + you own plugins you need to put them there. • /usr/include/vdr contains header files necessary to compile plugins. Start scripts @@ -36,7 +36,7 @@ live in Nuernberg, Germany and want to create a channels.conf for DVB-T you would run - dvbscan -o vdr /usr/share/dvb/scan/dvb-t/de-Nuernberg > /etc/vdr/channels.conf + scan -o vdr /usr/share/dvb/scan/dvb-t/de-Nuernberg > /etc/vdr/channels.conf Using vdr with a TV set attached ++++++ msgmerge ++++++ #!/bin/bash # wrapper script for msgmerge to avoid changed POT-Creation-Date: # on every rebuild. # (C) 2014 Stefan Seyfried, License: WTFPL v2 # # msgmerge is called like that in vdr makefiles # msgmerge -U --no-wrap --no-location --backup=none -q -N po/lt_LT.po po/skincurses.pot ARGS="$@" NUM=$# shift $((NUM - 2)) IN="$1" CREATE=$(grep ^\"POT-Creation-Date: "$IN") CREATE=${CREATE//\\/\\\\} # double the backslashes... /usr/bin/msgmerge $ARGS RET=$? sed -i -e s#^.POT-Creation-Date:.*#"$CREATE"# "$IN" exit $RET ++++++ rcvdr ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -19,7 +19,7 @@ ### END INIT INFO # Check for missing binaries (stale symlinks should not happen) -VDR_BIN=/usr/sbin/vdr +VDR_BIN=/usr/bin/vdr test -x $VDR_BIN || exit 5 # Check for existence of needed config file and read it @@ -82,10 +82,16 @@ rm -f /var/run/runvdr_exit /bin/openvt -c "$VDR_VTNUMBER" $doswitch /usr/sbin/runvdr - sleep 1 && checkproc $VDR_BIN - - # Remember status and be verbose - rc_status -v + # especially during system startup, it can take quite some time until vdr is running + for i in 1 2 3 4 5 6 7 8 9 10; do + sleep 1 + checkproc $VDR_BIN + RET=$? + rc_status + if [ $RET = 0 ]; then + break + fi + done ;; stop) echo -n "Shutting down Video Disk Recorder " ++++++ runvdr ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -10,7 +10,7 @@ # # $Id: runvdr 1.11 2003/08/26 16:15:41 kls Exp $ -VDR_BIN="/usr/sbin/vdr" +VDR_BIN="/usr/bin/vdr" rcdvb="/usr/sbin/rcdvb" cd # go home ++++++ sysconfig.vdr ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:23.000000000 +0200 @@ -1,3 +1,8 @@ +################################################################ +###### Attention: This is only used by vdr-runvdr package ###### +### runvdr-extreme-systemd is configured in /etc/runvdr.conf ### +################################################################ + ## Path: Applications/VDR ## Description: VDR digital video recorder configuration ## ServiceRestart: vdr ++++++ vdr-1.7.21-pluginmissing.patch ++++++ diff -ruN vdr-1.7.20/plugin.c vdr-1.7.20.patched//plugin.c --- vdr-1.7.20/plugin.c 2010-01-06 12:36:46.000000000 +0100 +++ vdr-1.7.20.patched//plugin.c 2011-08-16 23:48:20.264919835 +0200 @@ -317,6 +317,12 @@ char *p = strchr(s, ' '); if (p) *p = 0; + struct stat st; + if (stat (cString::sprintf("%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, APIVERSION), &st) && errno == ENOENT) { + esyslog("WARN: missing plugin '%s'", s); + fprintf(stderr, "vdr: missing plugin '%s'\n", s); + } + else dlls.Add(new cDll(cString::sprintf("%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, APIVERSION), Args)); free(s); } @@ -325,7 +331,7 @@ { for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) { if (!dll->Load(Log)) - return false; + ; } return true; } ++++++ vdr-1.7.29-menuselection.patch ++++++ diff -Nru vdr-1.7.29-vanilla/osdbase.c vdr-1.7.29-menuselection/osdbase.c --- vdr-1.7.29-vanilla/osdbase.c 2012-07-17 22:37:09.000000000 +0300 +++ vdr-1.7.29-menuselection/osdbase.c 2012-07-17 22:44:15.000000000 +0300 @@ -77,6 +77,7 @@ { isMenu = true; digit = 0; + key_nr = -1; hasHotkeys = false; displayMenuItems = 0; title = NULL; @@ -126,7 +127,7 @@ digit = -1; // prevents automatic hotkeys - input already has them if (digit >= 0) { digit++; - buffer = cString::sprintf(" %c %s", (digit < 10) ? '0' + digit : ' ' , s); + buffer = cString::sprintf(" %2d%s %s", digit, (digit > 9) ? "" : " ", s); s = buffer; } } @@ -472,20 +473,60 @@ } } +#define MENUKEY_TIMEOUT 1500 + eOSState cOsdMenu::HotKey(eKeys Key) { - for (cOsdItem *item = First(); item; item = Next(item)) { + bool match = false; + bool highlight = false; + int item_nr; + int i; + + if (Key == kNone) { + if (lastActivity.TimedOut()) + Key = kOk; + else + return osContinue; + } + else + lastActivity.Set(MENUKEY_TIMEOUT); + for (cOsdItem *item = Last(); item; item = Prev(item)) { const char *s = item->Text(); - if (s && (s = skipspace(s)) != NULL) { - if (*s == Key - k1 + '1') { + i = 0; + item_nr = 0; + if (s && (s = skipspace(s)) != '\0' && '0' <= s[i] && s[i] <= '9') { + do { + item_nr = item_nr * 10 + (s[i] - '0'); + } + while ( !((s[++i] == '\t')||(s[i] == ' ')) && (s[i] != '\0') && ('0' <= s[i]) && (s[i] <= '9')); + if ((Key == kOk) && (item_nr == key_nr)) { current = item->Index(); RefreshCurrent(); Display(); cRemote::Put(kOk, true); + key_nr = -1; break; } + else if (Key != kOk) { + if (!highlight && (item_nr == (Key - k0))) { + highlight = true; + current = item->Index(); + } + if (!match && (key_nr == -1) && ((item_nr / 10) == (Key - k0))) { + match = true; + key_nr = (Key - k0); + } + else if (((key_nr == -1) && (item_nr == (Key - k0))) || (!match && (key_nr >= 0) && (item_nr == (10 * key_nr + Key - k0)))) { + current = item->Index(); + cRemote::Put(kOk, true); + key_nr = -1; + break; + } + } } } + if ((!match) && (Key != kNone)) + key_nr = -1; return osContinue; } @@ -524,8 +565,8 @@ } } switch (int(Key)) { - case k0: return osUnknown; - case k1...k9: return hasHotkeys ? HotKey(Key) : osUnknown; + case kNone: + case k0...k9: return hasHotkeys ? HotKey(Key) : osUnknown; case kUp|k_Repeat: case kUp: CursorUp(); break; case kDown|k_Repeat: diff -Nru vdr-1.7.29-vanilla/osdbase.h vdr-1.7.29-menuselection/osdbase.h --- vdr-1.7.29-vanilla/osdbase.h 2012-07-17 22:37:09.000000000 +0300 +++ vdr-1.7.29-menuselection/osdbase.h 2012-07-17 22:44:15.000000000 +0300 @@ -97,6 +97,8 @@ char *status; int digit; bool hasHotkeys; + int key_nr; + cTimeMs lastActivity; void DisplayHelp(bool Force = false); protected: void SetDisplayMenu(void); ++++++ vdr-1.7.36-wareagle.patch ++++++ diff -ruN vdr-1.7.36.orig/config.c vdr-1.7.36/config.c --- vdr-1.7.36.orig/config.c 2013-01-27 12:54:57.743017655 +0100 +++ vdr-1.7.36/config.c 2013-01-27 12:56:24.230017960 +0100 @@ -376,6 +376,7 @@ strcpy(OSDLanguage, ""); // default is taken from environment strcpy(OSDSkin, "lcars"); strcpy(OSDTheme, "default"); + WarEagleIcons = 1; PrimaryDVB = 1; ShowInfoOnChSwitch = 1; TimeoutRequChInfo = 1; @@ -578,6 +579,7 @@ if (!strcasecmp(Name, "OSDLanguage")) { strn0cpy(OSDLanguage, Value, sizeof(OSDLanguage)); I18nSetLocale(OSDLanguage); } else if (!strcasecmp(Name, "OSDSkin")) Utf8Strn0Cpy(OSDSkin, Value, MaxSkinName); else if (!strcasecmp(Name, "OSDTheme")) Utf8Strn0Cpy(OSDTheme, Value, MaxThemeName); + else if (!strcasecmp(Name, "WarEagleIcons")) WarEagleIcons = atoi(Value); else if (!strcasecmp(Name, "PrimaryDVB")) PrimaryDVB = atoi(Value); else if (!strcasecmp(Name, "ShowInfoOnChSwitch")) ShowInfoOnChSwitch = atoi(Value); else if (!strcasecmp(Name, "TimeoutRequChInfo")) TimeoutRequChInfo = atoi(Value); @@ -684,6 +686,7 @@ Store("OSDLanguage", OSDLanguage); Store("OSDSkin", OSDSkin); Store("OSDTheme", OSDTheme); + Store("WarEagleIcons", WarEagleIcons); Store("PrimaryDVB", PrimaryDVB); Store("ShowInfoOnChSwitch", ShowInfoOnChSwitch); Store("TimeoutRequChInfo", TimeoutRequChInfo); diff -ruN vdr-1.7.36.orig/config.h vdr-1.7.36/config.h --- vdr-1.7.36.orig/config.h 2013-01-27 12:54:57.743017655 +0100 +++ vdr-1.7.36/config.h 2013-01-27 12:56:24.230017960 +0100 @@ -250,6 +250,7 @@ char OSDLanguage[I18N_MAX_LOCALE_LEN]; char OSDSkin[MaxSkinName]; char OSDTheme[MaxThemeName]; + int WarEagleIcons; int PrimaryDVB; int ShowInfoOnChSwitch; int TimeoutRequChInfo; diff -ruN vdr-1.7.36.orig/iconpatch.c vdr-1.7.36/iconpatch.c --- vdr-1.7.36.orig/iconpatch.c 1970-01-01 01:00:00.000000000 +0100 +++ vdr-1.7.36/iconpatch.c 2013-01-27 12:56:24.231017960 +0100 @@ -0,0 +1,27 @@ +#include "iconpatch.h" + +#include <langinfo.h> +#include <locale.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +bool IsLangUtf8(void) +{ + char *CodeSet = NULL; + if (setlocale(LC_CTYPE, "")) + CodeSet = nl_langinfo(CODESET); + else { + char *LangEnv = getenv("LANG"); // last resort in case locale stuff isn't installed + if (LangEnv) { + CodeSet = strchr(LangEnv, '.'); + if (CodeSet) + CodeSet++; // skip the dot + } + } + + if (CodeSet && strcasestr(CodeSet, "UTF-8") != 0) + return true; + + return false; +} diff -ruN vdr-1.7.36.orig/iconpatch.h vdr-1.7.36/iconpatch.h --- vdr-1.7.36.orig/iconpatch.h 1970-01-01 01:00:00.000000000 +0100 +++ vdr-1.7.36/iconpatch.h 2013-01-27 12:56:24.231017960 +0100 @@ -0,0 +1,70 @@ +/* + * iconpatch.h: Information of iconpatch + * + * Diese Datei ist die Übersichtsdatei für den Iconpatch. + * Hier werden kleine Infos abgelegt. + * Der Iconpatch ändert die Dateien: + * iconpatch.h + * menu.c + * recording.c + * fontosd.c + * + */ + +// Iconpatch-Variablen - Anfang +#define ICON_NUMBERSIGN "\x23" +#define ICON_ASTERISK "\x2A" +#define ICON_GREATER "\x3E" +#define ICON_EXCLAM "\x21" +#define ICON_PLUSMINUS "\xB1" + +#define ICON_RESUME "\x80" +#define ICON_DVD "\x81" +#define ICON_FOLDER "\x82" +#define ICON_BLANK "\x83" +#define ICON_CUTTING "\x84" +#define ICON_MOVE_FILE "\x85" +#define ICON_MOVE_FOLDER "\x86" +#define ICON_BAR_START "\x87" +#define ICON_BAR_FILLED "\x88" +#define ICON_BAR_CLEAR "\x89" +#define ICON_BAR_END "\x8A" +#define ICON_REC "\x8B" +#define ICON_CLOCK "\x8C" +#define ICON_TV_CRYPTED "\x8D" +#define ICON_RADIO "\x8E" +#define ICON_TV "\x8F" +#define ICON_NEW "\x90" +#define ICON_ARROW "\x91" +#define ICON_RUNNING "\x92" +#define ICON_VPS "\x93" +#define ICON_CLOCK_UH "\x94" +#define ICON_CLOCK_LH "\x95" + +// UTF-8 Icons +#define ICON_RESUME_UTF8 "\uE000" +#define ICON_DVD_UTF8 "\uE001" +#define ICON_FOLDER_UTF8 "\uE002" +#define ICON_BLANK_UTF8 "\uE003" +#define ICON_CUTTING_UTF8 "\uE004" +#define ICON_MOVE_FILE_UTF8 "\uE005" +#define ICON_MOVE_FOLDER_UTF8 "\uE006" +#define ICON_BAR_START_UTF8 "\uE007" +#define ICON_BAR_FILLED_UTF8 "\uE008" +#define ICON_BAR_EMPTY_UTF8 "\uE009" +#define ICON_BAR_CLOSE_UTF8 "\uE00A" +#define ICON_REC_UTF8 "\uE00B" +#define ICON_CLOCK_UTF8 "\uE00C" +#define ICON_TV_CRYPTED_UTF8 "\uE00D" +#define ICON_RADIO_UTF8 "\uE00E" +#define ICON_TV_UTF8 "\uE00F" +#define ICON_NEW_UTF8 "\uE010" +#define ICON_ARROW_UTF8 "\uE011" +#define ICON_RUNNING_UTF8 "\uE012" +#define ICON_VPS_UTF8 "\uE013" +#define ICON_CLOCK_UH_UTF8 "\uE014" +#define ICON_CLOCK_LH_UTF8 "\uE015" + +// Iconpatch-Variablen - Ende + +bool IsLangUtf8(void); diff -ruN vdr-1.7.36.orig/Makefile vdr-1.7.36/Makefile --- vdr-1.7.36.orig/Makefile 2013-01-27 12:54:57.743017655 +0100 +++ vdr-1.7.36/Makefile 2013-01-27 12:57:43.570018239 +0100 @@ -73,6 +73,8 @@ skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\ timers.o tools.o transfer.o vdr.o videodir.o +OBJS += iconpatch.o + DEFINES += $(CDEFINES) INCLUDES += $(CINCLUDES) diff -ruN vdr-1.7.36.orig/menu.c vdr-1.7.36/menu.c --- vdr-1.7.36.orig/menu.c 2013-01-27 12:54:57.741017655 +0100 +++ vdr-1.7.36/menu.c 2013-01-27 12:56:24.235017960 +0100 @@ -8,6 +8,7 @@ */ #include "menu.h" +#include "iconpatch.h" #include <ctype.h> #include <limits.h> #include <math.h> @@ -316,6 +317,14 @@ if (!channel->GroupSep()) { if (sortMode == csmProvider) buffer = cString::sprintf("%d\t%s - %s", channel->Number(), channel->Provider(), channel->Name()); + else if (Setup.WarEagleIcons) { + if (channel->Vpid() == 1 || channel->Vpid() == 0) + buffer = cString::sprintf("%d\t%s %-30s", channel->Number(), IsLangUtf8() ? ICON_RADIO_UTF8 : ICON_RADIO, channel->Name()); + else if (channel->Ca() == 0) + buffer = cString::sprintf("%d\t%s %-30s", channel->Number(), IsLangUtf8() ? ICON_TV_UTF8 : ICON_TV, channel->Name()); + else + buffer = cString::sprintf("%d\t%s %-30s", channel->Number(), IsLangUtf8() ? ICON_TV_CRYPTED_UTF8 : ICON_TV_CRYPTED, channel->Name()); + } else buffer = cString::sprintf("%d\t%s", channel->Number(), channel->Name()); } @@ -1044,8 +1053,8 @@ File++; else File = timer->File(); - SetText(cString::sprintf("%c\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s", - !(timer->HasFlags(tfActive)) ? ' ' : timer->FirstDay() ? '!' : timer->Recording() ? '#' : '>', + SetText(cString::sprintf("%s\t%d\t%s%s%s\t%02d:%02d\t%02d:%02d\t%s", + !(timer->HasFlags(tfActive)) ? " " : timer->FirstDay() ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_ARROW_UTF8 : ICON_ARROW : "!" : timer->Recording() ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_REC_UTF8 : ICON_REC : "#" : Setup.WarEagleIcons ? IsLangUtf8() ? ICON_CLOCK_UTF8 : ICON_CLOCK : ">", timer->Channel()->Number(), *name, *name && **name ? " " : "", @@ -1319,7 +1328,12 @@ return r; } -static const char *TimerMatchChars = " tT"; +static const char *TimerMatchChars[9] = +{ + " ", "t", "T", + ICON_BLANK, ICON_CLOCK_UH, ICON_CLOCK, + ICON_BLANK_UTF8, ICON_CLOCK_UH_UTF8, ICON_CLOCK_UTF8 +}; bool cMenuScheduleItem::Update(bool Force) { @@ -1328,17 +1342,17 @@ Timers.GetMatch(event, &timerMatch); if (Force || timerMatch != OldTimerMatch) { cString buffer; - char t = TimerMatchChars[timerMatch]; - char v = event->Vps() && (event->Vps() - event->StartTime()) ? 'V' : ' '; - char r = event->SeenWithin(30) && event->IsRunning() ? '*' : ' '; + const char *t = Setup.WarEagleIcons ? IsLangUtf8() ? TimerMatchChars[timerMatch+6] : TimerMatchChars[timerMatch+3] : TimerMatchChars[timerMatch]; + const char *v = event->Vps() && (event->Vps() - event->StartTime()) ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_VPS_UTF8 : ICON_VPS : "V" : " "; + const char *r = event->SeenWithin(30) && event->IsRunning() ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_RUNNING_UTF8 : ICON_RUNNING : "*" : " "; const char *csn = channel ? channel->ShortName(true) : NULL; cString eds = event->GetDateString(); if (channel && withDate) - buffer = cString::sprintf("%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 999), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title()); + buffer = cString::sprintf("%d\t%.*s\t%.*s\t%s\t%s%s%s\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title()); else if (channel) - buffer = cString::sprintf("%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 999), csn, *event->GetTimeString(), t, v, r, event->Title()); + buffer = cString::sprintf("%d\t%.*s\t%s\t%s%s%s\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, *event->GetTimeString(), t, v, r, event->Title()); else - buffer = cString::sprintf("%.*s\t%s\t%c%c%c\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title()); + buffer = cString::sprintf("%.*s\t%s\t%s%s%s\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title()); SetText(buffer); result = true; } @@ -2584,6 +2598,7 @@ Add(new cMenuEditStraItem(tr("Setup.OSD$Skin"), &skinIndex, numSkins, skinDescriptions)); if (themes.NumThemes()) Add(new cMenuEditStraItem(tr("Setup.OSD$Theme"), &themeIndex, themes.NumThemes(), themes.Descriptions())); + Add(new cMenuEditBoolItem(tr("Setup.OSD$WarEagle icons"), &data.WarEagleIcons)); Add(new cMenuEditPrcItem( tr("Setup.OSD$Left (%)"), &data.OSDLeftP, 0.0, 0.5)); Add(new cMenuEditPrcItem( tr("Setup.OSD$Top (%)"), &data.OSDTopP, 0.0, 0.5)); Add(new cMenuEditPrcItem( tr("Setup.OSD$Width (%)"), &data.OSDWidthP, 0.5, 1.0)); diff -ruN vdr-1.7.36.orig/recording.c vdr-1.7.36/recording.c --- vdr-1.7.36.orig/recording.c 2013-01-27 12:54:57.740017655 +0100 +++ vdr-1.7.36/recording.c 2013-01-27 12:56:24.236017960 +0100 @@ -8,6 +8,7 @@ */ #include "recording.h" +#include "iconpatch.h" #include <ctype.h> #include <dirent.h> #include <errno.h> @@ -881,7 +882,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) const { - char New = NewIndicator && IsNew() ? '*' : ' '; + const char *New = NewIndicator && IsNew() ? Setup.WarEagleIcons ? IsLangUtf8() ? ICON_NEW_UTF8 : ICON_NEW : "*" : " "; free(titleBuffer); titleBuffer = NULL; if (Level < 0 || Level == HierarchyLevels()) { ++++++ vdr-2.0.3-dynamite.patch ++++++ ++++ 810 lines (skipped) ++++++ vdr-2.0.4-MainMenuHooks-v1_0_1.patch ++++++ This is a "patch" for the Video Disk Recorder (VDR). * History 2010-10-15: Version 1.0.1 - return a cOsdObject instead of its subclass cOsdMenu (thanks to Joe_D@vdrportal) - version number defines in config.h now follow the ususal conventions: MAINMENUHOOKSVERSNUM is now a number, the newly added define MAINMENUHOOKSVERSION is a string (suggested by gnapheus@vdrportal) - patch is now based on VDR 1.6.0 - updated documentation 2007-02-26: Version 1.0 - Initial revision. * Authors: Tobias Grimm <vdr at e-tobi dot net> Martin Prochnow <nordlicht at martins-kabuff dot de> Frank Schmirler <vdrdev at schmirler dot de> Christian Wieninger <cwieninger at gmx dot de> * Description: This patch allows plugins to replace the VDR mainmenus "Schedule", "Channels", "Timers" and "Recordings" by a different implementation. The patch is based on a suggestion of Christian Wieninger back in 2006 (http://www.linuxtv.org/pipermail/vdr/2006-March/008234.html) It is meant to be an interim solution for VDR 1.4 until (maybe) VDR 1.5 introduces an official API for this purpose. * Installation Change into the VDR source directory, then issue patch -p1 < path/to/MainMenuHooks-v1_0_1.patch and recompile. * Notes for plugin authors The following code sample shows the required plugin code for replacing the original Schedule menu: bool cMyPlugin::Service(const char *Id, void *Data) { cOsdMenu **menu = (cOsdMenu**) Data; if (MySetup.replaceSchedule && strcmp(Id, "MainMenuHooksPatch-v1.0::osSchedule") == 0) { if (menu) *menu = (cOsdMenu*) MainMenuAction(); return true; } return false; } Since patch version 1.0.1 the service call may return a cOsdObject instead of a cOsdMenu. Use "#ifdef MAINMENUHOOKSVERSION" to detect version 1.0.1. A plugin can replace more than one menu at a time. Simply replace the call to MainMenuAction() in the sample above by appropriate code. Note that a plugin *should* offer a setup option which allows the user to enable or disable the replacement. "Disabled" would be a reasonable default setting. By testing for define MAINMENUHOOKSVERSNUM, a plugin can leave the setup option out at compiletime. In case there is an internal problem when trying to open the replacement menu, it is safe to return true even though Data is NULL. However an OSD message should indicate the problem to the user. Feel free to ship this patch along with your plugin. However if you think you need to modify the patch, we'd encourage you to contact the authors first or at least use a service id which differs in more than just the version number. diff -ru vdr.orig/menu.c vdr/menu.c --- vdr.orig/menu.c 2013-03-18 09:11:48.000000000 +0000 +++ vdr/menu.c 2013-03-27 17:29:58.767375783 +0000 @@ -3379,15 +3379,31 @@ // Initial submenus: + cOsdObject *menu = NULL; switch (State) { - case osSchedule: AddSubMenu(new cMenuSchedule); break; - case osChannels: AddSubMenu(new cMenuChannels); break; - case osTimers: AddSubMenu(new cMenuTimers); break; - case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, OpenSubMenus)); break; - case osSetup: AddSubMenu(new cMenuSetup); break; - case osCommands: AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break; + case osSchedule: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osSchedule", &menu)) + menu = new cMenuSchedule; + break; + case osChannels: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osChannels", &menu)) + menu = new cMenuChannels; + break; + case osTimers: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osTimers", &menu)) + menu = new cMenuTimers; + break; + case osRecordings: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osRecordings", &menu)) + menu = new cMenuRecordings(NULL, 0, OpenSubMenus); + break; + case osSetup: menu = new cMenuSetup; break; + case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break; default: break; } + if (menu) + if (menu->IsMenu()) + AddSubMenu((cOsdMenu *) menu); } cOsdObject *cMenuMain::PluginOsdObject(void) @@ -3495,13 +3511,34 @@ eOSState state = cOsdMenu::ProcessKey(Key); HadSubMenu |= HasSubMenu(); + cOsdObject *menu = NULL; switch (state) { - case osSchedule: return AddSubMenu(new cMenuSchedule); - case osChannels: return AddSubMenu(new cMenuChannels); - case osTimers: return AddSubMenu(new cMenuTimers); - case osRecordings: return AddSubMenu(new cMenuRecordings); - case osSetup: return AddSubMenu(new cMenuSetup); - case osCommands: return AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); + case osSchedule: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osSchedule", &menu)) + menu = new cMenuSchedule; + else + state = osContinue; + break; + case osChannels: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osChannels", &menu)) + menu = new cMenuChannels; + else + state = osContinue; + break; + case osTimers: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osTimers", &menu)) + menu = new cMenuTimers; + else + state = osContinue; + break; + case osRecordings: + if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osRecordings", &menu)) + menu = new cMenuRecordings; + else + state = osContinue; + break; + case osSetup: menu = new cMenuSetup; break; + case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break; case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) { cOsdItem *item = Get(Current()); if (item) { @@ -3553,6 +3590,12 @@ default: break; } } + if (menu) { + if (menu->IsMenu()) + return AddSubMenu((cOsdMenu *) menu); + pluginOsdObject = menu; + return osPlugin; + } if (!HasSubMenu() && Update(HadSubMenu)) Display(); if (Key != kNone) { diff -ru vdr.orig/config.h vdr/config.h --- vdr.orig/config.h 2013-03-16 15:12:14.000000000 +0000 +++ vdr/config.h 2013-03-27 17:50:05.204415063 +0000 @@ -36,6 +36,10 @@ // plugins to work with newer versions of the core VDR as long as no // VDR header files have changed. +// The MainMenuHook Patch's version number: +#define MAINMENUHOOKSVERSION "1.0.1" +#define MAINMENUHOOKSVERSNUM 10001 // Version * 10000 + Major * 100 + Minor + #define MAXPRIORITY 99 #define MINPRIORITY (-MAXPRIORITY) #define LIVEPRIORITY 0 // priority used when selecting a device for live viewing ++++++ vdr-2.0.6-wareagle-fix.patch ++++++ Index: b/recording.c =================================================================== --- a/recording.c +++ b/recording.c @@ -1040,7 +1040,7 @@ const char *cRecording::Title(char Delim Minutes % 60 ); } - titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%s%c%c%s", + titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%s%s%c%s", t->tm_mday, t->tm_mon + 1, t->tm_year % 100, ++++++ vdr-1.6.0.tar.bz2 -> vdr-2.0.6.tar.bz2 ++++++ ++++ 95716 lines of diff (skipped) ++++++ vdr-shutdown.sh ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:24.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:24.000000000 +0200 @@ -6,10 +6,12 @@ timer_fname="$4" # filename for next recording manual_shutdown="$5" # 1 if shutdown reqested by user +HALT_OPTIONS="-p" + test -f /etc/sysconfig/vdr && . /etc/sysconfig/vdr if [ "$VDR_SHUTDOWN" = "fast" ]; then -HALT_OPTIONS="-f" + HALT_OPTIONS+=" -f" fi # you need to add the following line to /etc/sudoers to make this script work ++++++ vdr.macros ++++++ --- /var/tmp/diff_new_pack.GMVz5z/_old 2014-04-22 17:09:24.000000000 +0200 +++ /var/tmp/diff_new_pack.GMVz5z/_new 2014-04-22 17:09:24.000000000 +0200 @@ -1,28 +1,29 @@ -%vdr_install_plugin() \ -for i in %*; do \ - install -d -m 755 %{buildroot}%{vdr_libdir} \ - install -m 755 libvdr-$i.so %{buildroot}%{vdr_libdir}/libvdr-$i.so.%{vdr_apiversion} \ -done \ +%vdrapi %(pkg-config --variable=apiversion vdr) + +%vdr_find_locale \ +echo '%%defattr (644, root, root, 755)' > vdrlocale.files \ +find %{buildroot}%{vdr_localedir} -type f -printf '%%P\\n' | while read f; do \ + echo "%%lang(${f%%%%/*}) %{vdr_localedir}/$f" \ +done >> vdrlocale.files \ +%{nil} + +%vdr_find_locale_name(n:) \ +echo '%%defattr (644, root, root, 755)' > vdrlocale.files \ +find %{buildroot}%{vdr_localedir} -type f -name %{-n*}.mo -printf '%%P\\n' | while read f; do \ + echo "%%lang(${f%%%%/*}) %{vdr_localedir}/$f" \ +done >> %{-n*}.files \ %{nil} -# for newer plugins, which automatically add the apiversion during build -%vdr_install_plugin_new() \ -for i in %*; do \ - install -d -m 755 %{buildroot}%{vdr_libdir} \ - install -m 755 libvdr-$i.so.%{vdr_apiversion} %{buildroot}%{vdr_libdir}/libvdr-$i.so.%{vdr_apiversion} \ -done \ +%vdr_dirs \ +%dir %{_libdir}/vdr \ +%dir %{_datadir}/vdr \ +%dir %{vdr_localedir} \ +%dir %{vdr_localedir}/* \ +%dir %{vdr_localedir}/*/LC_MESSAGES \ %{nil} -%vdr_install_plugin_locale \ -if [ -d locale ]; then \ - cd locale \ - install -d -m 755 %buildroot%{vdr_localedir} \ - for i in *_*; do \ - install -d -m 755 %buildroot%{vdr_localedir}/$i/LC_MESSAGES \ - install -m 644 $i/LC_MESSAGES/*.mo %buildroot%{vdr_localedir}/$i/LC_MESSAGES \ - done \ - cd .. \ -fi \ +%vdr_dirs_no_locale \ +%dir %{_libdir}/vdr \ %{nil} %vdr_make() \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit suse-module-tools for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2014-04-22 16:59:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old) and /work/SRC/openSUSE:Factory/.suse-module-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suse-module-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes 2014-04-11 14:40:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.suse-module-tools.new/suse-module-tools.changes 2014-04-22 16:59:56.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 15 14:32:55 UTC 2014 - mmarek(a)suse.cz + +- weak-modules2: Use lsinitrd to list the modules in an initrd, so + that initrds with early microcode work (bnc#873209, bnc#873113). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ weak-modules2 ++++++ --- /var/tmp/diff_new_pack.qMx5kZ/_old 2014-04-22 16:59:57.000000000 +0200 +++ /var/tmp/diff_new_pack.qMx5kZ/_new 2014-04-22 16:59:57.000000000 +0200 @@ -75,7 +75,7 @@ } filter_basenames() { - sed -rn 's:/?lib/modules/.*/([^/]*\.ko)$:\1:p' + sed -rn 's:.*\<lib/modules/.*/([^/]*\.ko)$:\1:p' } # Name of the symlink that makes a module available to a given kernel @@ -297,8 +297,7 @@ xz -cd "$file" } -# test if mkinitrd is needed for $krel. This should be decided by initrd itself -# actually +# test if mkinitrd is needed for $krel. # stdin - list of changed modules ("_kernel_" for the whole kernel) needs_mkinitrd() { local krel=$1 @@ -327,7 +326,7 @@ if [ ! -e /boot/initrd-$krel ]; then return 0 fi - local initrd_basenames=($( (uncomp /boot/initrd-$krel | cpio -t --quiet | filter_basenames; INITRD_MODULES=; . /etc/sysconfig/kernel &>/dev/null; printf '%s.ko\n' $INITRD_MODULES) | sort -u)) + local initrd_basenames=($( (lsinitrd /boot/initrd-$krel | filter_basenames; INITRD_MODULES=; . /etc/sysconfig/kernel &>/dev/null; printf '%s.ko\n' $INITRD_MODULES) | sort -u)) local i=($(join <(printf '%s\n' "${changed_basenames[@]}") \ <(printf '%s\n' "${initrd_basenames[@]}") )) log "changed initrd modules for kernel $krel: ${i[@]-none}" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mdadm for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package mdadm for openSUSE:Factory checked in at 2014-04-22 16:59:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mdadm (Old) and /work/SRC/openSUSE:Factory/.mdadm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mdadm" Changes: -------- --- /work/SRC/openSUSE:Factory/mdadm/mdadm.changes 2014-01-30 12:52:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mdadm.new/mdadm.changes 2014-04-22 16:59:53.000000000 +0200 @@ -1,0 +2,35 @@ +Tue Apr 8 07:38:42 UTC 2014 - nfbrown(a)suse.com + +- 0001-systemd-various-fixes-for-boot-with-container-arrays.patch + various fixes to improve boot-from-DDF or IMSM + (bnc#866660) + +------------------------------------------------------------------- +Wed Apr 2 04:41:53 UTC 2014 - nfbrown(a)suse.com + +- 0001-DDF-mark-missing-on-assembly-device-properly.patch +- 0002-DDF-guard-against-pdnum-being-negative.patch +- 0003-DDF-fix-possible-mdmon-crash-when-updating-metadata.patch +- 0004-DDF-Don-t-fail-compare_super_ddf-due-to-re-configure.patch + More upstream DDF fixes (bnc#866660) + +------------------------------------------------------------------- +Wed Mar 26 04:00:51 UTC 2014 - nfbrown(a)suse.com + +- 0001-mdmon-.service-Change-type-of-process-start-up-to-fo.patch +- 0003-Work-around-architectures-having-statfs.f_type-defin.patch +- 0004-DDF-report-seq-counter-as-events.patch +- 0005-DDF-when-first-activating-an-array-record-any-missin.patch + Two fixes for DDF (bnc#866660) and a couple of other upstream fixes + just for good measure. + +------------------------------------------------------------------- +Tue Mar 4 22:48:20 UTC 2014 - nfbrown(a)suse.com + +- 0001-Assemble-allow-load_devices-to-change-the-st-which-i.patch + 0002-Assemble-re-arrange-freeing-of-tst-in-load_devices.patch + 0003-Assemble-change-load_devices-to-return-most_recent-s.patch + Allow RAID5 to be assembled even when firs device listed recently + failed (bnc#865221) + +------------------------------------------------------------------- Old: ---- mdadm.shutdown New: ---- 0001-Assemble-allow-load_devices-to-change-the-st-which-i.patch 0001-DDF-mark-missing-on-assembly-device-properly.patch 0001-mdmon-.service-Change-type-of-process-start-up-to-fo.patch 0001-systemd-various-fixes-for-boot-with-container-arrays.patch 0002-Assemble-re-arrange-freeing-of-tst-in-load_devices.patch 0002-DDF-guard-against-pdnum-being-negative.patch 0003-Assemble-change-load_devices-to-return-most_recent-s.patch 0003-DDF-fix-possible-mdmon-crash-when-updating-metadata.patch 0003-Work-around-architectures-having-statfs.f_type-defin.patch 0004-DDF-Don-t-fail-compare_super_ddf-due-to-re-configure.patch 0004-DDF-report-seq-counter-as-events.patch 0005-DDF-when-first-activating-an-array-record-any-missin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.54UjYA/_old 2014-04-22 16:59:54.000000000 +0200 +++ /var/tmp/diff_new_pack.54UjYA/_new 2014-04-22 16:59:54.000000000 +0200 @@ -40,7 +40,6 @@ Source5: mkinitrd-setup.sh Source6: mkinitrd-boot.sh Source7: mdadm.cron -Source8: mdadm.shutdown Source9: systemd-mdadm-last-resort@.timer Source10: systemd-mdadm-last-resort@.service # PATCH-FIX-UPSTREAM config-set-auto_seen-after-processing-the-auto-line.patch upstream-bugfix nfbrown(a)suse.de @@ -99,6 +98,30 @@ Patch27: systemd-mdmon-set-IMSM_NO_PLATFORM-1.patch # PATCH-FIX-UPSTREAM mdmon-.service-remove-over-ride-of-Standard-IO.patch nfbrown(a)suse.de Patch28: mdmon-.service-remove-over-ride-of-Standard-IO.patch +# PATCH-FIX-UPSTREAM 0001-Assemble-allow-load_devices-to-change-the-st-which-i.patch bnc#865221 nfbrown(a)suse.de +Patch32: 0001-Assemble-allow-load_devices-to-change-the-st-which-i.patch +# PATCH-FIX-UPSTREAM 0002-Assemble-re-arrange-freeing-of-tst-in-load_devices.patch bnc#865221 nfbrown(a)suse.de +Patch33: 0002-Assemble-re-arrange-freeing-of-tst-in-load_devices.patch +# PATCH-FIX-UPSTREAM 0003-Assemble-change-load_devices-to-return-most_recent-s.patch bnc#865221 nfbrown(a)suse.de +Patch34: 0003-Assemble-change-load_devices-to-return-most_recent-s.patch +# PATCH-FIX-UPSTREAM 0001-mdmon-.service-Change-type-of-process-start-up-to-fo.patch nfbrown(a)suse.de +Patch35: 0001-mdmon-.service-Change-type-of-process-start-up-to-fo.patch +# PATCH-FIX-UPSTREAM 0003-Work-around-architectures-having-statfs.f_type-defin.patch nfbrown(a)suse.de +Patch36: 0003-Work-around-architectures-having-statfs.f_type-defin.patch +# PATCH-FIX-UPSTREAM 0004-DDF-report-seq-counter-as-events.patch bnc#866660 nfbrown(a)suse.de +Patch37: 0004-DDF-report-seq-counter-as-events.patch +# PATCH-FIX-UPSTREAM 0005-DDF-when-first-activating-an-array-record-any-missin.patch bnc#866660 nfbrown(a)suse.de +Patch38: 0005-DDF-when-first-activating-an-array-record-any-missin.patch +# PATCH-FIX-UPSTREAM 0001-DDF-mark-missing-on-assembly-device-properly.patch bnc#866660 nfbrown(a)suse.de +Patch39: 0001-DDF-mark-missing-on-assembly-device-properly.patch +# PATCH-FIX-UPSTREAM 0002-DDF-guard-against-pdnum-being-negative.patch bnc#866660 nfbrown(a)suse.de +Patch40: 0002-DDF-guard-against-pdnum-being-negative.patch +# PATCH-FIX-UPSTREAM 0003-DDF-fix-possible-mdmon-crash-when-updating-metadata.patch bnc#866660 nfbrown(a)suse.de +Patch41: 0003-DDF-fix-possible-mdmon-crash-when-updating-metadata.patch +# PATCH-FIX-UPSTREAM 0004-DDF-Don-t-fail-compare_super_ddf-due-to-re-configure.patch bnc#866660 nfbrown(a)suse.de +Patch42: 0004-DDF-Don-t-fail-compare_super_ddf-due-to-re-configure.patch +# PATCH-FIX-UPSTREAM 0001-systemd-various-fixes-for-boot-with-container-arrays.patch bnc#866660 nfbrown(a)suse.de +Patch43: 0001-systemd-various-fixes-for-boot-with-container-arrays.patch %define _udevdir %(pkg-config --variable=udevdir udev) %define _systemdshutdowndir %{_unitdir}/../system-shutdown @@ -138,6 +161,18 @@ %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 %build make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" SUSE=yes @@ -157,7 +192,6 @@ install -m 755 %{S:7} %{buildroot}/etc/cron.daily/mdadm install -m 644 %{S:2} %{buildroot}%{_var}/adm/fillup-templates/ install -d %{buildroot}%{_systemdshutdowndir} -install -m 755 %{S:8} %{buildroot}%{_systemdshutdowndir}/mdadm.shutdown install -m 644 %{S:9} %{buildroot}%{_unitdir}/mdadm-last-resort@.timer install -m 644 %{S:10} %{buildroot}%{_unitdir}/mdadm-last-resort@.service ++++++ 0001-Assemble-allow-load_devices-to-change-the-st-which-i.patch ++++++ >From df842e69a3cb7316a06ba45f8f04d7b9beb0170f Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Tue, 25 Feb 2014 14:54:34 +1100 Subject: [PATCH 1/3] Assemble: allow load_devices to change the 'st' which is passed in. The given 'st' might not be best. Making this interface change will allow load_devices to return a better 'st'. Signed-off-by: NeilBrown <neilb(a)suse.de> --- Assemble.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- mdadm-3.3.orig/Assemble.c +++ mdadm-3.3/Assemble.c @@ -551,7 +551,7 @@ struct devs { }; static int load_devices(struct devs *devices, char *devmap, - struct mddev_ident *ident, struct supertype *st, + struct mddev_ident *ident, struct supertype **stp, struct mddev_dev *devlist, struct context *c, struct mdinfo *content, int mdfd, char *mddev, @@ -567,6 +567,7 @@ static int load_devices(struct devs *dev int most_recent = -1; int bestcnt = 0; int *best = *bestp; + struct supertype *st = *stp; for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) { char *devname = tmpdev->devname; @@ -610,6 +611,7 @@ static int load_devices(struct devs *dev close(mdfd); free(devices); free(devmap); + *stp = st; return -1; } tst->ss->getinfo_super(tst, content, devmap + devcnt * content->array.raid_disks); @@ -636,6 +638,7 @@ static int load_devices(struct devs *dev close(dfd); free(devices); free(devmap); + *stp = st; return -1; } if (strcmp(c->update, "uuid")==0 && @@ -675,6 +678,7 @@ static int load_devices(struct devs *dev close(mdfd); free(devices); free(devmap); + *stp = st; return -1; } tst->ss->getinfo_super(tst, content, devmap + devcnt * content->array.raid_disks); @@ -759,6 +763,7 @@ static int load_devices(struct devs *dev close(mdfd); free(devices); free(devmap); + *stp = st; return -1; } if (best[i] == -1 @@ -772,6 +777,7 @@ static int load_devices(struct devs *dev *most_recentp = most_recent; *bestcntp = bestcnt; *bestp = best; + *stp = st; return devcnt; } @@ -1432,7 +1438,7 @@ try_again: /* Ok, no bad inconsistancy, we can try updating etc */ devices = xcalloc(num_devs, sizeof(*devices)); devmap = xcalloc(num_devs, content->array.raid_disks); - devcnt = load_devices(devices, devmap, ident, st, devlist, + devcnt = load_devices(devices, devmap, ident, &st, devlist, c, content, mdfd, mddev, &most_recent, &bestcnt, &best, inargv); if (devcnt < 0) ++++++ 0001-DDF-mark-missing-on-assembly-device-properly.patch ++++++ >From e5a03804dc27e662be94290c62760dbc544c0211 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Tue, 1 Apr 2014 16:15:06 +1100 Subject: [PATCH 1/4] DDF: mark missing-on-assembly device properly. As well as removing from the array we really should mark it is 'failed', and mark the array as degraded. Signed-off-by: NeilBrown <neilb(a)suse.de> --- super-ddf.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) --- mdadm-3.3.orig/super-ddf.c +++ mdadm-3.3/super-ddf.c @@ -4117,7 +4117,7 @@ static int ddf_open_new(struct supertype return 0; } -static void handle_missing(struct ddf_super *ddf, int inst) +static void handle_missing(struct ddf_super *ddf, struct active_array *a, int inst) { /* This member array is being activated. If any devices * are missing they must now be marked as failed. @@ -4126,7 +4126,9 @@ static void handle_missing(struct ddf_su unsigned int n_bvd; struct vcl *vcl; struct dl *dl; + int pd; int n; + int state; for (n = 0; ; n++) { vc = find_vdcr(ddf, inst, n, &n_bvd, &vcl); @@ -4138,7 +4140,30 @@ static void handle_missing(struct ddf_su if (dl) /* Found this disk, so not missing */ continue; - vc->phys_refnum[n_bvd] = cpu_to_be32(0); + + /* Mark the device as failed/missing. */ + pd = find_phys(ddf, vc->phys_refnum[n_bvd]); + if (pd >= 0 && be16_and(ddf->phys->entries[pd].state, + cpu_to_be16(DDF_Online))) { + be16_clear(ddf->phys->entries[pd].state, + cpu_to_be16(DDF_Online)); + be16_set(ddf->phys->entries[pd].state, + cpu_to_be16(DDF_Failed|DDF_Missing)); + vc->phys_refnum[n_bvd] = cpu_to_be32(0); + ddf_set_updates_pending(ddf); + } + + /* Mark the array as Degraded */ + state = get_svd_state(ddf, vcl); + if (ddf->virt->entries[inst].state != + ((ddf->virt->entries[inst].state & ~DDF_state_mask) + | state)) { + ddf->virt->entries[inst].state = + (ddf->virt->entries[inst].state & ~DDF_state_mask) + | state; + a->check_degraded = 1; + ddf_set_updates_pending(ddf); + } } } @@ -4157,7 +4182,7 @@ static int ddf_set_array_state(struct ac int inst = a->info.container_member; int old = ddf->virt->entries[inst].state; if (consistent == 2) { - handle_missing(ddf, inst); + handle_missing(ddf, a, inst); /* Should check if a recovery should be started FIXME */ consistent = 1; if (!is_resync_complete(&a->info)) ++++++ 0001-mdmon-.service-Change-type-of-process-start-up-to-fo.patch ++++++ >From 2167de78aab599e7a7a8d057ef04bf18527bc129 Mon Sep 17 00:00:00 2001 From: Pawel Baldysiak <pawel.baldysiak(a)intel.com> Date: Thu, 6 Mar 2014 15:51:44 +0100 Subject: [PATCH 1/6] mdmon@.service: Change type of process start-up to 'forking'. Mdadm does not wait enough time when mdmon is started by systemd. It causes various problems with behaviour of a RAID volume with external metadata. For example: mdmon does not update a value of checkpoint during migration and second RAID5 volume is read-only after reboot done during container reshape (both problems occur with IMSM matadata). If a type of process start-up is changed to 'forking', systemctl will wait until mdmon (parent) process exits after calling fork. This way mdmon will always be fully initialized after start_mdmon and these problems will not occur. In this case it is recommended to add a path to PIDFile, so that systemd does not have to guess a PID of the mdmon process. Signed-off-by: Pawel Baldysiak <pawel.baldysiak(a)intel.com> Reviewed-by: Artur Paszkiewicz <artur.paszkiewicz(a)intel.com> Reviewed-by: Lukasz Dorau <lukasz.dorau(a)intel.com> Signed-off-by: NeilBrown <neilb(a)suse.de> --- systemd/mdmon@.service | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/systemd/mdmon@.service b/systemd/mdmon@.service index 5520cd03137c..304b26e890c7 100644 --- a/systemd/mdmon@.service +++ b/systemd/mdmon@.service @@ -14,5 +14,7 @@ Before=initrd-switch-root.target # mdmon should never complain due to lack of a platform, # that is mdadm's job if at all. Environment=IMSM_NO_PLATFORM=1 -ExecStart=/sbin/mdmon --foreground %I +ExecStart=/sbin/mdmon %I +Type=forking +PIDFile=/run/mdadm/%I.pid KillMode=none -- 1.8.3.1.487.g3e7a5b4 ++++++ 0001-systemd-various-fixes-for-boot-with-container-arrays.patch ++++++ >From 8d1d32bb33da1bd08a398d26f364b84e69ac7b41 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Tue, 8 Apr 2014 17:22:18 +1000 Subject: [PATCH] systemd: various fixes for boot with container-arrays. 1/ Add systemd shutdown script to ensure DDF and IMSM are clean before we actually shutdown 2/ Get udev to tell systemd to run the mdmon(a)mdXXX.service units when a member array appears. If we boot off a member array (with dracut at least), the mdmon started in the initramfs will lose track of /sys etc, so we need to restart it. systemd will try to forget about it too (but not actually kill it because we said not to do this). Having udev tell it to start it will allow a new mdmon to run which can see /sys, and systemd will know about it. 3/ Always use --offroot and --takeover when starting mdmon with systemd --offroot is needed else shutdown will hang. --takeover is needed incase an mdmon was started earlier (e.g. in initramfs). Neither hurt if they aren't actually needed. Signed-off-by: NeilBrown <neilb(a)suse.de> --- Makefile | 1 + systemd/mdadm.shutdown | 4 ++++ systemd/mdmon@.service | 12 ++++++++++-- udev-md-raid-arrays.rules | 4 ++++ 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 systemd/mdadm.shutdown --- mdadm-3.3.orig/Makefile +++ mdadm-3.3/Makefile @@ -286,6 +286,7 @@ install-udev: udev-md-raid-arrays.rules install-systemd: systemd/mdmon@.service $(INSTALL) -D -m 644 systemd/mdmon@.service $(DESTDIR)$(SYSTEMD_DIR)/mdmon@.service $(INSTALL) -D -m 644 systemd/mdmonitor.service $(DESTDIR)$(SYSTEMD_DIR)/mdmonitor.service + $(INSTALL) -D -m 755 systemd/mdadm.shutdown $(DESTDIR)$(SYSTEMD_DIR)-shutdown/mdadm.shutdown [ -f /etc/SuSE-release -o -n "$(SUSE)" ] && $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(SYSTEMD_DIR)/../scripts/mdadm_env.sh || true uninstall: --- /dev/null +++ mdadm-3.3/systemd/mdadm.shutdown @@ -0,0 +1,4 @@ +#!/bin/sh +# We need to ensure all md arrays with external metadata +# (e.g. IMSM, DDF) are clean before completing the shutdown. +/sbin/mdadm --wait-clean --scan --- mdadm-3.3.orig/systemd/mdmon@.service +++ mdadm-3.3/systemd/mdmon@.service @@ -14,7 +14,15 @@ Before=initrd-switch-root.target # mdmon should never complain due to lack of a platform, # that is mdadm's job if at all. Environment=IMSM_NO_PLATFORM=1 -ExecStart=/sbin/mdmon %I +# The mdmon starting in the initramfs (with dracut at least) +# cannot see sysfs after root is mounted, so we will have to +# 'takeover'. As the '--offroot --takeover' don't hurt when +# not necessary, are are useful with root-on-md in dracut, +# have them always present. +ExecStart=/sbin/mdmon --offroot --takeover %I Type=forking -PIDFile=/run/mdadm/%I.pid +# Don't set the PIDFile. It isn't necessary (systemd can work +# it out) and systemd will remove it when transitioning from +# initramfs to rootfs. +#PIDFile=/run/mdadm/%I.pid KillMode=none --- mdadm-3.3.orig/udev-md-raid-arrays.rules +++ mdadm-3.3/udev-md-raid-arrays.rules @@ -34,4 +34,8 @@ ENV{ID_FS_USAGE}=="filesystem|other", EN ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service" +# Tell systemd to run mdmon for our container, if we need it. +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" +ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon(a)%c.service" + LABEL="md_end" ++++++ 0002-Assemble-re-arrange-freeing-of-tst-in-load_devices.patch ++++++ >From 9ee314dab91dc8479d2e981d0849ce777f7ea492 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Tue, 25 Feb 2014 14:59:12 +1100 Subject: [PATCH 2/3] Assemble: re-arrange freeing of 'tst' in load_devices(). When we return in error, we need to free(tst), and ->free_super(tst); Sometimes we didn't. Also the final ->free_super(tst) should be followed by free(tst) but wasn't. Move that file free forward in the code a bit as we will want to use the tst there in the next patch. Signed-off-by: NeilBrown <neilb(a)suse.de> --- Assemble.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) --- mdadm-3.3.orig/Assemble.c +++ mdadm-3.3/Assemble.c @@ -572,6 +572,7 @@ static int load_devices(struct devs *dev for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) { char *devname = tmpdev->devname; struct stat stb; + struct supertype *tst; int i; if (tmpdev->used != 1) @@ -582,7 +583,6 @@ static int load_devices(struct devs *dev int dfd; /* prepare useful information in info structures */ struct stat stb2; - struct supertype *tst; int err; fstat(mdfd, &stb2); @@ -611,6 +611,8 @@ static int load_devices(struct devs *dev close(mdfd); free(devices); free(devmap); + tst->ss->free_super(tst); + free(tst); *stp = st; return -1; } @@ -660,15 +662,13 @@ static int load_devices(struct devs *dev else bitmap_done = 1; } - tst->ss->free_super(tst); } else #endif { - struct supertype *tst = dup_super(st); - int dfd; - dfd = dev_open(devname, - tmpdev->disposition == 'I' - ? O_RDWR : (O_RDWR|O_EXCL)); + int dfd = dev_open(devname, + tmpdev->disposition == 'I' + ? O_RDWR : (O_RDWR|O_EXCL)); + tst = dup_super(st); if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) { pr_err("cannot re-read metadata from %s - aborting\n", @@ -678,11 +678,12 @@ static int load_devices(struct devs *dev close(mdfd); free(devices); free(devmap); + tst->ss->free_super(tst); + free(tst); *stp = st; return -1; } tst->ss->getinfo_super(tst, content, devmap + devcnt * content->array.raid_disks); - tst->ss->free_super(tst); close(dfd); } @@ -705,6 +706,8 @@ static int load_devices(struct devs *dev > devices[most_recent].i.events) most_recent = devcnt; } + tst->ss->free_super(tst); + free(tst); if (content->array.level == LEVEL_MULTIPATH) /* with multipath, the raid_disk from the superblock is meaningless */ ++++++ 0002-DDF-guard-against-pdnum-being-negative.patch ++++++ >From a44e993e37a76561fa30e932b93d85fab9bcc272 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Wed, 2 Apr 2014 13:34:10 +1100 Subject: [PATCH 2/4] DDF: guard against ->pdnum being negative. It is conceivable that ->pdnum could be -1, though only if the metadata is corrupt. We should be careful not to use it if it is. Also remove an assignment for pdnum to ->container_member. This is never used and cannot possibly mean anything. Signed-off-by: NeilBrown <neilb(a)suse.de> --- super-ddf.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) --- mdadm-3.3.orig/super-ddf.c +++ mdadm-3.3/super-ddf.c @@ -2465,7 +2465,11 @@ static struct extent *get_extents(struct struct extent *rv; int n = 0; unsigned int i; - __u16 state = be16_to_cpu(ddf->phys->entries[dl->pdnum].state); + __u16 state; + + if (dl->pdnum < 0) + return NULL; + state = be16_to_cpu(ddf->phys->entries[dl->pdnum].state); if ((state & (DDF_Online|DDF_Failed|DDF_Missing)) != DDF_Online) return NULL; @@ -2900,7 +2904,7 @@ static int remove_from_super_ddf(struct if (dl->major == dk->major && dl->minor == dk->minor) break; - if (!dl) + if (!dl || dl->pdnum < 0) return -1; if (st->update_tail) { @@ -4096,7 +4100,7 @@ static int ddf_open_new(struct supertype if (dl->major == dev->disk.major && dl->minor == dev->disk.minor) break; - if (!dl) { + if (!dl || dl->pdnum < 0) { pr_err("%s: device %d/%d of subarray %d not found in meta data\n", __func__, dev->disk.major, dev->disk.minor, n); return -1; @@ -4728,6 +4732,9 @@ static void ddf_process_update(struct su for (dl = ddf->dlist; dl; dl = dl->next) { unsigned int vn = 0; int in_degraded = 0; + + if (dl->pdnum < 0) + continue; for (vcl = ddf->conflist; vcl ; vcl = vcl->next) { unsigned int dn, ibvd; const struct vd_config *conf; @@ -4991,7 +4998,11 @@ static struct mdinfo *ddf_activate_spare int is_dedicated = 0; struct extent *ex; unsigned int j; - be16 state = ddf->phys->entries[dl->pdnum].state; + be16 state; + + if (dl->pdnum < 0) + continue; + state = ddf->phys->entries[dl->pdnum].state; if (be16_and(state, cpu_to_be16(DDF_Failed|DDF_Missing)) || !be16_and(state, @@ -5082,7 +5093,6 @@ static struct mdinfo *ddf_activate_spare di->recovery_start = 0; di->data_offset = pos; di->component_size = a->info.component_size; - di->container_member = dl->pdnum; di->next = rv; rv = di; dprintf("%x:%x (%08x) to be %d at %llu\n", @@ -5140,7 +5150,7 @@ static struct mdinfo *ddf_activate_spare if (dl->major == di->disk.major && dl->minor == di->disk.minor) break; - if (!dl) { + if (!dl || dl->pdnum < 0) { pr_err("%s: BUG: can't find disk %d (%d/%d)\n", __func__, di->disk.raid_disk, di->disk.major, di->disk.minor); ++++++ 0003-Assemble-change-load_devices-to-return-most_recent-s.patch ++++++ >From 56bbc588f7f0f3bdd3ec23f02109b427c1d3b8f1 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Tue, 25 Feb 2014 15:04:16 +1100 Subject: [PATCH 3/3] Assemble: change load_devices to return most_recent 'st' value. This means that st->ss->getinfo_super(st, content, NULL); clean = content->array.state & 1; will get an up-to-date value for 'clean'. This fix allows tests/03r5assem-failed to work. Signed-off-by: NeilBrown <neilb(a)suse.de> --- Assemble.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- mdadm-3.3.orig/Assemble.c +++ mdadm-3.3/Assemble.c @@ -703,8 +703,12 @@ static int load_devices(struct devs *dev if (devices[devcnt].i.disk.state == 6) { if (most_recent < 0 || devices[devcnt].i.events - > devices[most_recent].i.events) + > devices[most_recent].i.events) { + struct supertype *tmp = tst; + tst = st; + st = tmp; most_recent = devcnt; + } } tst->ss->free_super(tst); free(tst); ++++++ 0003-DDF-fix-possible-mdmon-crash-when-updating-metadata.patch ++++++ >From 188d31ed2b6dc195a4be1f5620ce2e5185d4e789 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Wed, 2 Apr 2014 15:14:43 +1100 Subject: [PATCH 3/4] DDF: fix possible mdmon crash when updating metadata. Testing 'c' and then using 'vdc' assumes that the two are in sync, but sometimes they aren't. Testing 'vdc' is safer. This avoids a crash in some cases when failing/removing/added devices to a DDF. Signed-off-by: NeilBrown <neilb(a)suse.de> --- super-ddf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- mdadm-3.3.orig/super-ddf.c +++ mdadm-3.3/super-ddf.c @@ -3000,7 +3000,7 @@ static int __write_ddf_structure(struct (const struct vd_config **)&vdc, &dummy); } - if (c) { + if (vdc) { dprintf("writing conf record %i on disk %08x for %s/%u\n", i, be32_to_cpu(d->disk.refnum), guid_str(vdc->guid), ++++++ 0003-Work-around-architectures-having-statfs.f_type-defin.patch ++++++ >From 76d0f1886fdef89891d617df7e7f3fde89a38e1a Mon Sep 17 00:00:00 2001 From: Jes Sorensen <Jes.Sorensen(a)redhat.com> Date: Wed, 19 Mar 2014 14:26:02 +0100 Subject: [PATCH 3/6] Work around architectures having statfs.f_type defined as long Having RAMFS_MAGIC defined as 0x858458f6 causing problems when trying to compare it directly against statfs.f_type being cast from long to unsigned long. This hack is extremly ugly, but it should at least do the right thing for every situation. Thanks to Arnd Bergmann for suggesting the fix. Signed-off-by: Jes Sorensen <Jes.Sorensen(a)redhat.com> Signed-off-by: NeilBrown <neilb(a)suse.de> --- util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- mdadm-3.3.orig/util.c +++ mdadm-3.3/util.c @@ -1948,9 +1948,13 @@ int in_initrd(void) { /* This is based on similar function in systemd. */ struct statfs s; + /* statfs.f_type is signed long on s390x and MIPS, causing all + sorts of sign extension problems with RAMFS_MAGIC being + defined as 0x858458f6 */ return statfs("/", &s) >= 0 && ((unsigned long)s.f_type == TMPFS_MAGIC || - (unsigned long)s.f_type == RAMFS_MAGIC); + ((unsigned long)s.f_type & 0xFFFFFFFFUL) == + ((unsigned long)RAMFS_MAGIC & 0xFFFFFFFFUL)); } void reopen_mddev(int mdfd) ++++++ 0004-DDF-Don-t-fail-compare_super_ddf-due-to-re-configure.patch ++++++ >From f43f5b32991c7f5a188940b00989c27f87feee81 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Wed, 2 Apr 2014 15:26:35 +1100 Subject: [PATCH 4/4] DDF: Don't fail compare_super_ddf due to re-configure changes. It is possible that one device has seem some reconfig but the other hasn't. In that case they are still the "same" DDF, even though one might be older. Such age will be detected by 'seq' differences. If A is new and B is old, then it is import that mdadm -I B mdadm -I A doesn't get confused because A has the same uuid as B, but compare_super fails. So: if the seq numbers are different, then just accept as two different superblocks. If they are the same, then look to copy data from new to old. Signed-off-by: NeilBrown <neilb(a)suse.de> --- super-ddf.c | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) --- mdadm-3.3.orig/super-ddf.c +++ mdadm-3.3/super-ddf.c @@ -3937,47 +3937,25 @@ static int compare_super_ddf(struct supe if (memcmp(first->anchor.guid, second->anchor.guid, DDF_GUID_LEN) != 0) return 2; - if (first->max_part != second->max_part || - !be16_eq(first->phys->used_pdes, second->phys->used_pdes) || - !be16_eq(first->virt->populated_vdes, - second->virt->populated_vdes)) { - dprintf("%s: PD/VD number mismatch\n", __func__); - return 3; - } + /* It is only OK to compare info in the anchor. Anything else + * could be changing due to a reconfig so must be ignored. + * guid really should be enough anyway. + */ - max_pds = be16_to_cpu(first->phys->used_pdes); - for (dl2 = second->dlist; dl2; dl2 = dl2->next) { - for (pd = 0; pd < max_pds; pd++) - if (be32_eq(first->phys->entries[pd].refnum, - dl2->disk.refnum)) - break; - if (pd == max_pds) { - dprintf("%s: no match for disk %08x\n", __func__, - be32_to_cpu(dl2->disk.refnum)); - return 3; - } + if (!be32_eq(first->active->seq, second->active->seq)) { + dprintf("%s: sequence number mismatch %u<->%u\n", __func__, + be32_to_cpu(first->active->seq), + be32_to_cpu(second->active->seq)); + return 0; } - max_vds = be16_to_cpu(first->active->max_vd_entries); - for (vl2 = second->conflist; vl2; vl2 = vl2->next) { - if (!be32_eq(vl2->conf.magic, DDF_VD_CONF_MAGIC)) - continue; - for (vd = 0; vd < max_vds; vd++) - if (!memcmp(first->virt->entries[vd].guid, - vl2->conf.guid, DDF_GUID_LEN)) - break; - if (vd == max_vds) { - dprintf("%s: no match for VD config\n", __func__); - return 3; - } - } - /* FIXME should I look at anything else? */ - /* At this point we are fairly sure that the meta data matches. But the new disk may contain additional local data. Add it to the super block. */ + max_vds = be16_to_cpu(first->active->max_vd_entries); + max_pds = be16_to_cpu(first->phys->used_pdes); for (vl2 = second->conflist; vl2; vl2 = vl2->next) { for (vl1 = first->conflist; vl1; vl1 = vl1->next) if (!memcmp(vl1->conf.guid, vl2->conf.guid, ++++++ 0004-DDF-report-seq-counter-as-events.patch ++++++ >From eba2859f50bc0de6da7938a9ec6cfe4ceef43874 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Wed, 26 Mar 2014 14:19:43 +1100 Subject: [PATCH 4/6] DDF: report seq counter as events. Also don't treat two devices with different seq numbers as completely unrelated. This allows split-brain detection to work properly for ddf. Signed-off-by: NeilBrown <neilb(a)suse.de> --- super-ddf.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) --- mdadm-3.3.orig/super-ddf.c +++ mdadm-3.3/super-ddf.c @@ -1929,6 +1929,8 @@ static void getinfo_super_ddf(struct sup info->disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE); else info->disk.state = 1 << MD_DISK_FAULTY; + + info->events = be32_to_cpu(ddf->active->seq); } else { info->disk.number = -1; info->disk.raid_disk = -1; @@ -2029,6 +2031,7 @@ static void getinfo_super_ddf_bvd(struct (be16_to_cpu(ddf->phys->entries[info->disk.number].state) & DDF_Online) && !(be16_to_cpu(ddf->phys->entries[info->disk.number].state) & DDF_Failed)) info->disk.state = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE); + info->events = be32_to_cpu(ddf->active->seq); } info->container_member = ddf->currentconf->vcnum; @@ -3841,7 +3844,7 @@ static struct mdinfo *container_content_ dev->disk.state = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE); dev->recovery_start = MaxSector; - dev->events = be32_to_cpu(ddf->primary.seq); + dev->events = be32_to_cpu(ddf->active->seq); dev->data_offset = be64_to_cpu(LBA_OFFSET(ddf, bvd)[iphys]); dev->component_size = be64_to_cpu(bvd->blocks); @@ -3928,12 +3931,6 @@ static int compare_super_ddf(struct supe if (memcmp(first->anchor.guid, second->anchor.guid, DDF_GUID_LEN) != 0) return 2; - if (!be32_eq(first->active->seq, second->active->seq)) { - dprintf("%s: sequence number mismatch %u<->%u\n", __func__, - be32_to_cpu(first->active->seq), - be32_to_cpu(second->active->seq)); - return 3; - } if (first->max_part != second->max_part || !be16_eq(first->phys->used_pdes, second->phys->used_pdes) || !be16_eq(first->virt->populated_vdes, ++++++ 0005-DDF-when-first-activating-an-array-record-any-missin.patch ++++++ >From 5a46fcd7f5b1bd1bf190784f112a15f383262af5 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Wed, 26 Mar 2014 14:26:53 +1100 Subject: [PATCH 5/6] DDF: when first activating an array, record any missing devices. We must remember they are missing so that if they re-appear we don't get confused. Signed-off-by: NeilBrown <neilb(a)suse.de> --- super-ddf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) --- mdadm-3.3.orig/super-ddf.c +++ mdadm-3.3/super-ddf.c @@ -511,6 +511,8 @@ static void pr_state(const struct ddf_su static void _ddf_set_updates_pending(struct ddf_super *ddf, const char *func) { + if (ddf->updates_pending) + return; ddf->updates_pending = 1; ddf->active->seq = cpu_to_be32((be32_to_cpu(ddf->active->seq)+1)); pr_state(ddf, func); @@ -4115,6 +4117,31 @@ static int ddf_open_new(struct supertype return 0; } +static void handle_missing(struct ddf_super *ddf, int inst) +{ + /* This member array is being activated. If any devices + * are missing they must now be marked as failed. + */ + struct vd_config *vc; + unsigned int n_bvd; + struct vcl *vcl; + struct dl *dl; + int n; + + for (n = 0; ; n++) { + vc = find_vdcr(ddf, inst, n, &n_bvd, &vcl); + if (!vc) + break; + for (dl = ddf->dlist; dl; dl = dl->next) + if (be32_eq(dl->disk.refnum, vc->phys_refnum[n_bvd])) + break; + if (dl) + /* Found this disk, so not missing */ + continue; + vc->phys_refnum[n_bvd] = cpu_to_be32(0); + } +} + /* * The array 'a' is to be marked clean in the metadata. * If '->resync_start' is not ~(unsigned long long)0, then the array is only @@ -4130,6 +4157,7 @@ static int ddf_set_array_state(struct ac int inst = a->info.container_member; int old = ddf->virt->entries[inst].state; if (consistent == 2) { + handle_missing(ddf, inst); /* Should check if a recovery should be started FIXME */ consistent = 1; if (!is_resync_complete(&a->info)) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdump for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2014-04-22 16:59:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdump" Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2014-03-31 20:43:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2014-04-22 16:59:51.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 15 06:26:08 UTC 2014 - ptesarik(a)suse.cz + +- kdump-0.8.10-dracut-xz-opt.patch: Use fast xz compression with + dracut (bnc#870549). + +------------------------------------------------------------------- New: ---- kdump-0.8.10-dracut-xz-opt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump.spec ++++++ --- /var/tmp/diff_new_pack.DUJcED/_old 2014-04-22 16:59:52.000000000 +0200 +++ /var/tmp/diff_new_pack.DUJcED/_new 2014-04-22 16:59:52.000000000 +0200 @@ -59,6 +59,7 @@ Source: %{name}-%{version}.tar.bz2 Source2: %{name}-%{version}-rpmlintrc Source3: kdump.service +Patch1: %{name}-%{version}-dracut-xz-opt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) Provides: kdump-helpers = %{version} @@ -96,6 +97,7 @@ %prep %setup +%patch1 -p1 %build export CFLAGS="%optflags" ++++++ kdump-0.8.10-dracut-xz-opt.patch ++++++ From: Petr Tesarik <ptesarik(a)suse.cz> Subject: Use fast xz compression with dracut References: bnc#870549 Patch-mainline: queued for v0.8.11 Signed-off-by: Petr Tesarik <ptesarik(a)suse.cz> --- init/mkdumprd | 1 + 1 file changed, 1 insertion(+) --- a/init/mkdumprd +++ b/init/mkdumprd @@ -124,6 +124,7 @@ function run_dracut() . /lib/kdump/setup-kdump.functions DRACUT_ARGS="--force --hostonly --omit 'systemd plymouth resume usrmount'" + DRACUT_ARGS="$DRACUT_ARGS --compress='xz -0 --check=crc32'" # add mount points kdump_get_mountpoints || return 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit man-pages for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package man-pages for openSUSE:Factory checked in at 2014-04-22 15:47:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man-pages (Old) and /work/SRC/openSUSE:Factory/.man-pages.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "man-pages" Changes: -------- --- /work/SRC/openSUSE:Factory/man-pages/man-pages.changes 2014-04-17 14:08:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man-pages.new/man-pages.changes 2014-04-22 15:47:11.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 22 07:15:29 UTC 2014 - pgajdos(a)suse.com + +- update to version 3.65: + * new and rewritten pages: + inet_net_pton.3 + * newly documented interfaces in existing pages + fallocate.2: Document FALLOC_FL_COLLAPSE_RANGE + prctl.2: Document PR_SET_THP_DISABLE and PR_GET_THP_DISABLE + proc.5: Document /proc/[pid]/stack + Document /proc/[pid]/clear_refs +- dropped proc.5.patch (upstreamed) + +------------------------------------------------------------------- Old: ---- man-pages-3.64.tar.xz man-pages-proc.5.patch New: ---- man-pages-3.65.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages.spec ++++++ --- /var/tmp/diff_new_pack.4UBli1/_old 2014-04-22 15:47:12.000000000 +0200 +++ /var/tmp/diff_new_pack.4UBli1/_new 2014-04-22 15:47:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: man-pages -Version: 3.64 +Version: 3.65 Release: 0 Summary: Linux Manual Pages License: BSD-3-Clause and GPL-2.0+ and MIT @@ -29,7 +29,6 @@ Source1: man-pages-addons.tar.bz2 Patch0: man-pages.eal3.diff Patch3: %{name}_gai.conf-reference.patch -Patch4: %{name}-proc.5.patch Patch5: %{name}-tty_ioctl.patch BuildRequires: fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,7 +48,6 @@ %setup -q -a1 %patch0 -p2 %patch3 -%patch4 %patch5 -p1 find -name "*.orig" | xargs rm -fv ++++++ man-pages-3.64.tar.xz -> man-pages-3.65.tar.xz ++++++ ++++ 14679 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 otrs for openSUSE:13.1:Update
by root＠hilbert.suse.de 22 Apr '14

22 Apr '14

Hello community, here is the log from the commit of package otrs for openSUSE:13.1:Update checked in at 2014-04-22 15:33:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/otrs (Old) and /work/SRC/openSUSE:13.1:Update/.otrs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "otrs" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.si4lHh/_old 2014-04-22 15:33:36.000000000 +0200 +++ /var/tmp/diff_new_pack.si4lHh/_new 2014-04-22 15:33:36.000000000 +0200 @@ -1 +1 @@ -<link package='otrs.2624' cicount='copy' /> +<link package='otrs.2716' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0