May 2017 - openSUSE Commits - openSUSE Mailing Lists

commit screenshot-tool for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package screenshot-tool for openSUSE:Factory checked in at 2017-05-02 08:55:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/screenshot-tool (Old) and /work/SRC/openSUSE:Factory/.screenshot-tool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "screenshot-tool" Tue May 2 08:55:02 2017 rev:4 rq:492373 version:0.1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/screenshot-tool/screenshot-tool.changes 2017-02-13 07:52:04.428936424 +0100 +++ /work/SRC/openSUSE:Factory/.screenshot-tool.new/screenshot-tool.changes 2017-05-02 08:55:20.986456647 +0200 @@ -1,0 +2,24 @@ +Mon May 1 15:40:07 UTC 2017 - avvissu(a)yandex.by + +- Update to 0.1.3.1 + +------------------------------------------------------------------- +Sat Apr 22 11:33:41 UTC 2017 - avvissu(a)yandex.by + +- Update to 0.1.3: + * Update and rename INSTALL to README.md (#18) + * Also adds missing libcanberra dep + * Launchpad automatic translations update. + * Fix bug #1670010 + * Ensure screenshots are saved to correct directory when + launched from Slingshot. + * Implement non-interactive mode (fix bug 1665708) + * AppData: remove spurious Unicode characters and fix + indentation + * Hide main window behind save dialog when app is launched from + command + * Show main window after window not found error + * Replace colons with dots in screenshot's filename (lp#1663734) + * Play shutter sound when screenshot is taken + +------------------------------------------------------------------- Old: ---- screenshot-tool-0.1.2.tar.xz New: ---- screenshot-tool-0.1.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screenshot-tool.spec ++++++ --- /var/tmp/diff_new_pack.8dxMNx/_old 2017-05-02 08:55:21.722352881 +0200 +++ /var/tmp/diff_new_pack.8dxMNx/_new 2017-05-02 08:55:21.726352316 +0200 @@ -18,7 +18,7 @@ %define _name screenshot Name: screenshot-tool -Version: 0.1.2 +Version: 0.1.3.1 Release: 0 Summary: A simple screen capture tool License: GPL-3.0 @@ -36,6 +36,7 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(granite) BuildRequires: pkgconfig(gtk+-3.0) >= 3.12 +BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(vapigen) >= 0.28.0 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ screenshot-tool-0.1.2.tar.xz -> screenshot-tool-0.1.3.1.tar.xz ++++++ ++++ 28241 lines of diff (skipped)

1 0

commit krita for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package krita for openSUSE:Factory checked in at 2017-05-02 08:55:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krita (Old) and /work/SRC/openSUSE:Factory/.krita.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "krita" Tue May 2 08:55:00 2017 rev:9 rq:492307 version:3.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/krita/krita.changes 2017-02-07 12:06:38.370695958 +0100 +++ /work/SRC/openSUSE:Factory/.krita.new/krita.changes 2017-05-02 08:55:14.247406909 +0200 @@ -1,0 +2,12 @@ +Mon May 1 12:03:56 UTC 2017 - fabian(a)ritter-vogt.de + +- Update to version 3.1.3: + * New features: + + implement context menu actions for default tool (cut, copy, paste, object ordering) + + added option to allow multiple instances of krita (BUG 377199) + + scale around pivot point added + * Too many bugfixes to list here, see: + https://krita.org/en/release-notes-for-3-1-3/ +- Add _constraints: Needs at least 4 GiB RAM + +------------------------------------------------------------------- Old: ---- krita-3.1.2.1.tar.gz New: ---- _constraints krita-3.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krita.spec ++++++ --- /var/tmp/diff_new_pack.70W4FK/_old 2017-05-02 08:55:20.686498945 +0200 +++ /var/tmp/diff_new_pack.70W4FK/_new 2017-05-02 08:55:20.690498381 +0200 @@ -19,13 +19,13 @@ %bcond_without lang Name: krita -Version: 3.1.2.1 +Version: 3.1.3 Release: 0 Summary: Digital Painting Application License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Graphics/Bitmap Editors Url: http://www.krita.org/ -Source0: http://download.kde.org/stable/krita/3.1.2/krita-%{version}.tar.gz +Source0: http://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.gz Source99: %{name}.changes BuildRequires: Mesa-devel BuildRequires: OpenColorIO-devel ++++++ _constraints ++++++ <constraints> <hardware> <memory> <size unit="G">4</size> </memory> </hardware> </constraints> ++++++ krita-3.1.2.1.tar.gz -> krita-3.1.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/krita/krita-3.1.2.1.tar.gz /work/SRC/openSUSE:Factory/.krita.new/krita-3.1.3.tar.gz differ: char 5, line 1

1 0

commit monitoring-plugins-sar-perf for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package monitoring-plugins-sar-perf for openSUSE:Factory checked in at 2017-05-02 08:54:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-sar-perf (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins-sar-perf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "monitoring-plugins-sar-perf" Tue May 2 08:54:58 2017 rev:2 rq:492303 version:0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/monitoring-plugins-sar-perf/monitoring-plugins-sar-perf.changes 2016-02-11 12:37:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins-sar-perf.new/monitoring-plugins-sar-perf.changes 2017-05-02 08:54:59.653464773 +0200 @@ -1,0 +2,5 @@ +Mon Apr 24 12:33:08 CEST 2017 - ro(a)suse.de + +- use -x for iostat and add utilization monitoring + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monitoring-plugins-sar-perf.spec ++++++ --- /var/tmp/diff_new_pack.ORwkju/_old 2017-05-02 08:55:00.485347471 +0200 +++ /var/tmp/diff_new_pack.ORwkju/_new 2017-05-02 08:55:00.485347471 +0200 @@ -1,8 +1,7 @@ # # spec file for package monitoring-plugins-sar-perf # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +18,11 @@ Name: monitoring-plugins-sar-perf Summary: Get performance data from sar -Version: 0.1 -Release: 100 -Url: https://github.com/nickanderson/check-sar-perf License: BSD-2-Clause Group: System/Monitoring +Version: 0.1 +Release: 0 +Url: https://github.com/nickanderson/check-sar-perf Source0: nickanderson-check-sar-perf-4878d0c.tar.gz Source1: check_iostat Source2: usr.lib.nagios.plugins.check_iostat @@ -35,7 +34,8 @@ %endif Provides: nagios-plugins-sar-perf = %{version}-%{release} Obsoletes: nagios-plugins-sar-perf < %{version}-%{release} -Requires: python sysstat +Requires: python +Requires: sysstat BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ check_iostat ++++++ --- /var/tmp/diff_new_pack.ORwkju/_old 2017-05-02 08:55:00.525341831 +0200 +++ /var/tmp/diff_new_pack.ORwkju/_new 2017-05-02 08:55:00.529341268 +0200 @@ -40,6 +40,8 @@ print "\t-w <tps>,<read>,<wrtn>\tSets the WARNING level for tps, KB_read/s and KB_written/s, respectively\n"; print "\t-C <percent>\t Sets the CRITICAL level for iowait\n"; print "\t-W <percent>\t Sets the WARNING level for iowait\n"; + print "\t-X <percent>\t Sets the CRITICAL level for utilization\n"; + print "\t-Y <percent>\t Sets the WARNING level for utilization\n"; print "\t\t\t(if no level is set for iowait, no warning is set for this value)\n"; exit 1; } @@ -51,13 +53,15 @@ # Getting parameters: my %opts; -getopts('d:w:c:W:C:hv', \%opts); +getopts('d:w:c:W:C:X:Y:hv', \%opts); my $disk = $opts{'d'}; my $warning = $opts{'w'}; my $critical = $opts{'c'}; my $warning_iowait = $opts{'W'}; my $critical_iowait = $opts{'C'}; +my $warning_util = $opts{'X'}; +my $critical_util = $opts{'Y'}; VERSION_MESSAGE() if $opts{'v'}; HELP_MESSAGE() if $opts{'h'}; @@ -89,16 +93,21 @@ } if ($warning_iowait && $critical_iowait && $warning_iowait > $critical_iowait) { - warn "ERROR: critical iowait level must be higher that warning level\n"; + warn "ERROR: critical iowait level must be higher than warning level\n"; HELP_MESSAGE(); } -my ($tps,$kbread,$kbwritten,$iowait); +if ($warning_util && $critical_util && $warning_util > $critical_util) { + warn "ERROR: critical utilization level must be higher than warning level\n"; + HELP_MESSAGE(); +} + +my ($tps,$rps,$wps,$kbread,$kbwritten,$iowait,$util); my $seen_usage = 0; my $seen_disk = 0; # Doing the actual check: -open (IOSTAT,"-|","$iostat -k $disk 5 2"); +open (IOSTAT,"-|","$iostat -kx $disk 5 2"); while (<IOSTAT>) { chomp(); if (/^[0-9\.\ \t]+$/) { @@ -112,7 +121,8 @@ $seen_disk++; next if $seen_disk < 2; my (@stats) = split ('\s+', $_); - ($tps,$kbread,$kbwritten) = @stats[1,2,3]; + ($rps,$wps,$kbread,$kbwritten,$util) = @stats[1,2,5,6,13]; + $tps = $rps + $wps; last; } } @@ -132,6 +142,11 @@ $status = 1; } +if ($warning_util && $util >= $warning_util) { + $msg = "WARNING"; + $status = 1; +} + if ($tps >= $crit_tps || $kbread >= $crit_read || $kbwritten >= $crit_written) { $msg = "CRITICAL"; $status = 2; @@ -142,9 +157,13 @@ $status = 2; } +if ($critical_util && $iowait >= $critical_util) { + $msg = "CRITICAL"; + $status = 2; +} # Printing the results: -print "$msg - I/O stats tps=$tps KB_read/s=$kbread KB_written/s=$kbwritten iowait=$iowait | 'tps'=$tps; 'KB_read/s'=$kbread; 'KB_written/s'=$kbwritten; 'iowait'=$iowait\n"; +print "$msg - I/O stats tps=$tps KB_read/s=$kbread KB_written/s=$kbwritten iowait=$iowait util=$util | 'tps'=$tps; 'KB_read/s'=$kbread; 'KB_written/s'=$kbwritten; 'iowait'=$iowait; 'util'=$util\n"; # Bye! exit $status;

1 0

commit vhostmd for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package vhostmd for openSUSE:Factory checked in at 2017-05-02 08:54:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vhostmd (Old) and /work/SRC/openSUSE:Factory/.vhostmd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vhostmd" Tue May 2 08:54:55 2017 rev:24 rq:492273 version:0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/vhostmd/vhostmd.changes 2017-04-30 21:24:43.457708373 +0200 +++ /work/SRC/openSUSE:Factory/.vhostmd.new/vhostmd.changes 2017-05-02 08:54:56.297937930 +0200 @@ -1,0 +2,8 @@ +Sat Apr 29 15:58:03 UTC 2017 - jengelh(a)inai.de + +- Fix RPM group for libmetrics0 +- Replace old RPM shell vars in %install +- Author lists do not belong into the description +- Use macros in file list to compact paths + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vhostmd.spec ++++++ --- /var/tmp/diff_new_pack.5aRIic/_old 2017-05-02 08:54:57.133820064 +0200 +++ /var/tmp/diff_new_pack.5aRIic/_new 2017-05-02 08:54:57.137819500 +0200 @@ -24,7 +24,20 @@ %endif Name: vhostmd +Version: 0.4 +Release: 0 +Summary: Virtual Host Metrics Daemon (vhostmd) +License: LGPL-2.1+ +Group: System/Daemons Url: https://github.com/vhostmd/vhostmd +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: vhostmd-%{version}.tar.bz2 +Patch0: vhostmd-conf.patch +Patch1: manpage.patch +Patch2: value-newline.patch +Patch3: libmetrics-link.patch +Patch4: modernize-build-files.patch +Patch5: add-systemd-service.patch BuildRequires: libtool BuildRequires: libvirt-devel BuildRequires: libxml2 @@ -35,32 +48,12 @@ %if %{with_xen} BuildRequires: xen-devel %endif -Summary: Virtual Host Metrics Daemon (vhostmd) -License: LGPL-2.1+ -Group: System/Daemons -Version: 0.4 -Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils -Source0: vhostmd-%{version}.tar.bz2 -Patch0: vhostmd-conf.patch -Patch1: manpage.patch -Patch2: value-newline.patch -Patch3: libmetrics-link.patch -Patch4: modernize-build-files.patch -Patch5: add-systemd-service.patch %description vhostmd provides a "metrics communication channel" between a host and its hosted virtual machines, allowing limited introspection of host -resource usage from within virtual machines - - - -Authors: --------- - Jim Fehlig <jfehlig(a)suse.com> - Pat Campbell +resource usage from within virtual machines. %package -n vm-dump-metrics Summary: Virtual Host Metrics Daemon (vhostmd) @@ -69,30 +62,16 @@ %description -n vm-dump-metrics vhostmd provides a "metrics communication channel" between a host and its hosted virtual machines, allowing limited introspection of host -resource usage from within virtual machines - - - -Authors: --------- - Jim Fehlig <jfehlig(a)suse.com> - Pat Campbell +resource usage from within virtual machines. %package -n libmetrics0 Summary: Virtual Host Metrics Daemon (vhostmd) -Group: Development/Libraries/C and C++ +Group: System/Libraries %description -n libmetrics0 vhostmd provides a "metrics communication channel" between a host and its hosted virtual machines, allowing limited introspection of host -resource usage from within virtual machines - - - -Authors: --------- - Jim Fehlig <jfehlig(a)suse.com> - Pat Campbell +resource usage from within virtual machines. %package -n libmetrics-devel Summary: Virtual Host Metrics Daemon (vhostmd) @@ -102,14 +81,7 @@ %description -n libmetrics-devel vhostmd provides a "metrics communication channel" between a host and its hosted virtual machines, allowing limited introspection of host -resource usage from within virtual machines - - - -Authors: --------- - Jim Fehlig <jfehlig(a)suse.com> - Pat Campbell +resource usage from within virtual machines. %prep %setup @@ -133,10 +105,9 @@ make %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcvhostmd +%make_install +rm -f %{buildroot}/%{_libdir}/*.la %{buildroot}/%{_libdir}/*.a +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvhostmd %pre %service_add_pre vhostmd.service @@ -150,36 +121,33 @@ %postun %service_del_postun vhostmd.service -%post -n libmetrics0 -sbin/ldconfig - -%postun -n libmetrics0 -sbin/ldconfig +%post -n libmetrics0 -p /sbin/ldconfig +%postun -n libmetrics0 -p /sbin/ldconfig %files %defattr(-,root,root) %dir /etc/vhostmd -%dir /usr/share/vhostmd -%dir /usr/share/vhostmd/scripts -%dir /usr/share/doc/vhostmd -/usr/sbin/vhostmd -/usr/sbin/rcvhostmd -/usr/share/vhostmd/scripts/pagerate.pl +%dir %{_datadir}/vhostmd +%dir %{_datadir}/vhostmd/scripts +%dir %{_datadir}/doc/vhostmd +%{_sbindir}/vhostmd +%{_sbindir}/rcvhostmd +%{_datadir}/vhostmd/scripts/pagerate.pl %config(noreplace) /etc/vhostmd/vhostmd.conf %config /etc/vhostmd/vhostmd.dtd %config /etc/vhostmd/metric.dtd %{_unitdir}/vhostmd.service -/usr/share/doc/vhostmd/vhostmd.dtd -/usr/share/doc/vhostmd/metric.dtd -/usr/share/doc/vhostmd/vhostmd.xml -/usr/share/doc/vhostmd/mdisk.xml -/usr/share/doc/vhostmd/README -/usr/share/man/man8/vhostmd.8.gz +%{_datadir}/doc/vhostmd/vhostmd.dtd +%{_datadir}/doc/vhostmd/metric.dtd +%{_datadir}/doc/vhostmd/vhostmd.xml +%{_datadir}/doc/vhostmd/mdisk.xml +%{_datadir}/doc/vhostmd/README +%{_datadir}/man/man8/vhostmd.8.gz %files -n vm-dump-metrics %defattr(-,root,root) -/usr/sbin/vm-dump-metrics -/usr/share/man/man1/vm-dump-metrics.1.gz +%{_sbindir}/vm-dump-metrics +%{_datadir}/man/man1/vm-dump-metrics.1.gz %files -n libmetrics0 %defattr(-,root,root) @@ -188,7 +156,7 @@ %files -n libmetrics-devel %defattr(-,root,root) %{_libdir}/libmetrics.so -%dir /usr/include/vhostmd -/usr/include/vhostmd/libmetrics.h +%dir %{_includedir}/vhostmd +%{_includedir}/vhostmd/libmetrics.h %changelog

1 0

commit nrpe for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package nrpe for openSUSE:Factory checked in at 2017-05-02 08:54:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nrpe (Old) and /work/SRC/openSUSE:Factory/.nrpe.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nrpe" Tue May 2 08:54:53 2017 rev:3 rq:492268 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nrpe/nrpe.changes 2017-02-07 12:03:29.349437850 +0100 +++ /work/SRC/openSUSE:Factory/.nrpe.new/nrpe.changes 2017-05-02 08:54:54.394206371 +0200 @@ -1,0 +2,53 @@ +Fri Apr 21 15:26:52 CEST 2017 - ro(a)suse.de + +- require inet-daemon only if suse_version is set +- call centos macros for systemd +- drop Requires=var-run.mount line from service file on centos + +------------------------------------------------------------------- +Fri Apr 21 12:03:22 CEST 2017 - ro(a)suse.de + +- fix buildrequires for centos: + - tcpd-devel is tcp_wrappers-devel + - kerberos is krb5-devel + +------------------------------------------------------------------- +Mon Apr 17 17:14:00 UTC 2017 - lars(a)linux-schulserver.de + +-update to 3.1.0: + ENHANCEMENTS + - Added option to nrpe.cfg.in that can override hard-coded NASTY_METACHARS (John Frickson) + - While processing 'include_dir' statement, sort the files (Philippe Kueck / John Frickson) + - nrpe can now write to a log file using 'log_file=' in nrpe.cfg (John Frickson) + - check_nrpe can now write to a log file using '--log-file=' or '-g' options (John Frickson) + FIXES + - Added missing debugging syslog entries, and changed printf()'s to syslog()'s. (Jobst Schmalenbach) + - Fix help output for ssl option (configure) (Ruben Kerkhof) + - Fixes to README.SSL.md and SECURITY.md (Elan Ruusamäe) + - Changed the 'check_load' command in nrpe.cfg.in (minusdavid) + - Minor change to logging in check_nrpe (John Frickson) + - Removed function `b64_decode` which wasn't being used (John Frickson) + - check_nrpe ignores -a option when -f option is specified (John Frickson) + - Added missing LICENSE file (John Frickson) + - Off-by-one BO in my_system() (John Frickson) + - Add SOURCE_DATE_EPOCH specification support for reproducible builds. (Bas Couwenberg) + - nrpe 3.0.1 allows TLSv1 and TLSv1.1 when I configure for TLSv1.2+ (John Frickson) + - "Remote %s accepted a Version %s Packet", please add to debug (John Frickson) + - nrpe 3.0.1 segfaults when key and/or cert are broken symlinks (John Frickson) + - Fixed a couple of typos in docs/NRPE.* files (Ludmil Meltchev) + - Changed release date to ISO format (yyyy-mm-dd) (John Frickson) + - Fix systemd unit description (Bas Couwenberg) + - Add reload command to systemd service file (Bas Couwenberg) + - fix file not found error when updating version (Sven Nierlein) + - Spelling fixes (Josh Soref) + - Return UNKNOWN when check_nrpe cannot communicate with nrpe and -u set (John Frickson) + - xinetd.d parameter causes many messages in log file (John Frickson) + - Fixes for openssl 1.1.x (Stephen Smoogen / John Frickson) + - PATH and other environment variables not set with numeric nrpe_user (John Frickson) +- remove upstreamed patches: + + nrpe-more_random.patch + + nrpe-drop_privileges_before_writing_pidfile.patch + + nrpe-3.0-Makefile_use_DESTDIR.patch +- refreshed other patches + +------------------------------------------------------------------- Old: ---- nrpe-3.0-Makefile_use_DESTDIR.patch nrpe-3.0.tar.bz2 nrpe-drop_privileges_before_writing_pidfile.patch nrpe-more_random.patch New: ---- nrpe-3.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nrpe.spec ++++++ --- /var/tmp/diff_new_pack.QKze9n/_old 2017-05-02 08:54:55.474054104 +0200 +++ /var/tmp/diff_new_pack.QKze9n/_new 2017-05-02 08:54:55.478053540 +0200 @@ -1,8 +1,7 @@ # # spec file for package nrpe # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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 +23,14 @@ %define _rundir %{_localstatedir}/run %endif -%if 0%{?suse_version} >= 1210 +%if 0%{?suse_version} >= 1210 || 0%{?centos_version} >= 600 %bcond_without systemd %else %bcond_with systemd %endif - Name: nrpe -Version: 3.0 +Version: 3.1.0 Release: 0 Summary: Nagios Remote Plug-In Executor License: GPL-2.0+ @@ -51,25 +49,23 @@ Source11: README.SUSE.systemd-addon # apparmor profile Source12: usr.sbin.nrpe -# PATCH-FIX-UPSTREAM produce more randomness and do not reduce entropy on Linux kernels -Patch1: nrpe-more_random.patch # PATCH-FIX-UPSTREAM improve help output of nrpe and check_nrpe Patch2: nrpe-improved_help.patch -# PATCH-FIX-UPSTREAM drop privileges before writing the pidfile for more safety -Patch3: nrpe-drop_privileges_before_writing_pidfile.patch # PATCH-FIX-openSUSE fix pathnames for nrpe_check_control command Patch4: nrpe_check_control.patch # PATCH-FIX-UPSTREAM using implicit definitions of functions Patch5: nrpe-implicit_declaration.patch -# PATCH-FIX-UPSTREAM allow variable DESTDIR during install -Patch6: nrpe-3.0-Makefile_use_DESTDIR.patch +%if 0%{?suse_version} PreReq: %fillup_prereq PreReq: %insserv_prereq +%endif PreReq: /bin/logger PreReq: coreutils PreReq: grep +%if 0%{?suse_version} PreReq: netcfg PreReq: pwdutils +%endif PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1130 @@ -81,9 +77,13 @@ # BuildRequires: monitoring-plugins-common BuildRequires: nagios-rpm-macros +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +BuildRequires: tcp_wrappers-devel +%else BuildRequires: tcpd-devel +%endif # -%if 0%{?suse_version} > 1000 +%if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: krb5-devel %else BuildRequires: heimdal-devel @@ -103,7 +103,9 @@ Recommends: monitoring-plugins-disk Recommends: monitoring-plugins-procs %else +%if 0%{?suse_version} Requires: inet-daemon +%endif Requires: monitoring-plugins %endif # @@ -159,16 +161,12 @@ %prep %setup -q -%patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 cp -a %{SOURCE10} . cp -a %{SOURCE12} . %if 0%{?suse_version} >= 1210 -sed -e '/Have a lot of fun/d' README.SUSE cat %{SOURCE11} >> README.SUSE %endif chmod -x contrib/README.nrpe_check_control @@ -274,7 +272,11 @@ # install systemd specific files install -Dm644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service install -Dm644 %{SOURCE7} %{buildroot}%{_unitdir}/%{name}@.service +%if 0%{?centos_version} +sed -i -e "/User=/s/$User=$.*/\1%{nagios_user}/" -e "/Group=/s/$Group=$.*/\1%{nagios_group}/" -e "/Requires=var-run.mount/d" %{buildroot}%{_unitdir}/%{name}.service +%else sed -i -e "/User=/s/$User=$.*/\1%{nagios_user}/" -e "/Group=/s/$Group=$.*/\1%{nagios_group}/" %{buildroot}%{_unitdir}/%{name}.service +%endif sed -i -e "/User=/s/$User=$.*/\1%{nagios_user}/" -e "/Group=/s/$Group=$.*/\1%{nagios_group}/" %{buildroot}%{_unitdir}/%{name}@.service install -Dm644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}.socket install -d -m 0755 %{buildroot}/%{_tmpfilesdir} @@ -301,23 +303,37 @@ echo "nrpe %nrpeport/tcp # Nagios nrpe" >> etc/services fi %if %{with systemd} +%if 0%{?centos_version} +#systemd_pre nrpe.service nrpe@.service nrpe.socket +%else %service_add_pre nrpe.service nrpe@.service nrpe.socket %endif +%endif %preun %stop_on_removal %{name} %if %{with systemd} +%if 0%{?centos_version} +%systemd_preun nrpe.service nrpe@.service nrpe.socket +%else %service_del_preun nrpe.service nrpe@.service nrpe.socket %endif +%endif %post +%if 0%{?suse_version} %if 0%{?suse_version} <= 1230 %{fillup_and_insserv -fy %{name}} %else %fillup_only %{name} %endif +%endif %if %{with systemd} +%if 0%{?centos_version} +%systemd_post nrpe.service nrpe@.service nrpe.socket +%else %service_add_post nrpe.service nrpe@.service nrpe.socket +%endif %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf %endif @@ -365,10 +381,16 @@ %postun %restart_on_update nrpe +%if 0%{?suse_version} %insserv_cleanup +%endif %if %{with systemd} +%if 0%{?centos_version} +%systemd_postun_with_restart nrpe.service nrpe@.service nrpe.socket +%else %service_del_postun nrpe.service nrpe@.service nrpe.socket %endif +%endif %files %defattr(-,root,root) ++++++ nrpe-3.0.tar.bz2 -> nrpe-3.1.0.tar.bz2 ++++++ ++++ 5109 lines of diff (skipped) ++++++ nrpe-implicit_declaration.patch ++++++ --- /var/tmp/diff_new_pack.QKze9n/_old 2017-05-02 08:54:55.861999401 +0200 +++ /var/tmp/diff_new_pack.QKze9n/_new 2017-05-02 08:54:55.861999401 +0200 @@ -1,7 +1,7 @@ -Index: nrpe-3.0/contrib/nrpe_check_control.c +Index: nrpe-3.1.0/contrib/nrpe_check_control.c =================================================================== ---- nrpe-3.0.orig/contrib/nrpe_check_control.c -+++ nrpe-3.0/contrib/nrpe_check_control.c +--- nrpe-3.1.0.orig/contrib/nrpe_check_control.c ++++ nrpe-3.1.0/contrib/nrpe_check_control.c @@ -1,4 +1,5 @@ #include <stdio.h> +#include <stdlib.h> ++++++ nrpe-improved_help.patch ++++++ --- /var/tmp/diff_new_pack.QKze9n/_old 2017-05-02 08:54:55.873997709 +0200 +++ /var/tmp/diff_new_pack.QKze9n/_new 2017-05-02 08:54:55.873997709 +0200 @@ -1,8 +1,8 @@ -Index: nrpe-3.0/src/check_nrpe.c +Index: nrpe-3.1.0/src/check_nrpe.c =================================================================== ---- nrpe-3.0.orig/src/check_nrpe.c -+++ nrpe-3.0/src/check_nrpe.c -@@ -646,7 +646,7 @@ void usage(int result) +--- nrpe-3.1.0.orig/src/check_nrpe.c ++++ nrpe-3.1.0/src/check_nrpe.c +@@ -668,7 +668,7 @@ void usage(int result) " [-P <size>] [-S <ssl version>] [-L <cipherlist>] [-C <clientcert>]\n" " [-K <key>] [-A <ca-certificate>] [-s <logopts>] [-b <bindaddr>]\n" " [-f <cfg-file>] [-p <port>] [-t <interval>:<state>]\n" @@ -11,7 +11,7 @@ printf("\n"); printf("Options:\n"); printf(" <host> = The address of the host running the NRPE daemon\n"); -@@ -684,6 +684,9 @@ void usage(int result) +@@ -710,6 +710,9 @@ void usage(int result) printf(" [arglist] = Optional arguments that should be passed to the command,\n"); printf(" separated by a space. If provided, this must be the last\n"); printf(" option supplied on the command line.\n"); @@ -21,11 +21,11 @@ printf("\n"); printf(" NEW TIMEOUT SYNTAX\n"); printf(" -t <interval>:<state>\n"); -Index: nrpe-3.0/src/nrpe.c +Index: nrpe-3.1.0/src/nrpe.c =================================================================== ---- nrpe-3.0.orig/src/nrpe.c -+++ nrpe-3.0/src/nrpe.c -@@ -460,13 +460,15 @@ void usage(int result) +--- nrpe-3.1.0.orig/src/nrpe.c ++++ nrpe-3.1.0/src/nrpe.c +@@ -528,13 +528,15 @@ void usage(int result) printf("Usage: nrpe [-n] -c <config_file> [-4|-6] <mode>\n"); printf("\n"); printf("Options:\n"); ++++++ nrpe_check_control.patch ++++++ --- /var/tmp/diff_new_pack.QKze9n/_old 2017-05-02 08:54:55.961985302 +0200 +++ /var/tmp/diff_new_pack.QKze9n/_new 2017-05-02 08:54:55.965984738 +0200 @@ -1,7 +1,7 @@ -Index: nrpe-3.0/contrib/nrpe_check_control.c +Index: nrpe-3.1.0/contrib/nrpe_check_control.c =================================================================== ---- nrpe-3.0.orig/contrib/nrpe_check_control.c -+++ nrpe-3.0/contrib/nrpe_check_control.c +--- nrpe-3.1.0.orig/contrib/nrpe_check_control.c ++++ nrpe-3.1.0/contrib/nrpe_check_control.c @@ -5,8 +5,8 @@ #define MAX_CHARS 1024 #define SERVICE_COUNT 12

1 0

commit qt5ct for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package qt5ct for openSUSE:Factory checked in at 2017-05-02 08:54:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt5ct (Old) and /work/SRC/openSUSE:Factory/.qt5ct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt5ct" Tue May 2 08:54:51 2017 rev:10 rq:492227 version:0.31 Changes: -------- --- /work/SRC/openSUSE:Factory/qt5ct/qt5ct.changes 2017-04-17 10:27:36.775153953 +0200 +++ /work/SRC/openSUSE:Factory/.qt5ct.new/qt5ct.changes 2017-05-02 08:54:52.850424057 +0200 @@ -1,0 +2,6 @@ +Sun Apr 30 08:34:09 UTC 2017 - lnussel(a)suse.de + +- Don't set QT_QPA_PLATFORMTHEME when running a KDE session to avoid + overriding the settings defined there (boo#920792). + +------------------------------------------------------------------- New: ---- qt5ct.csh qt5ct.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt5ct.spec ++++++ --- /var/tmp/diff_new_pack.lDylLw/_old 2017-05-02 08:54:53.638312958 +0200 +++ /var/tmp/diff_new_pack.lDylLw/_new 2017-05-02 08:54:53.638312958 +0200 @@ -24,6 +24,8 @@ Group: Development/Libraries/X11 Url: https://sourceforge.net/projects/qt5ct Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 +Source1: qt5ct.sh +Source2: qt5ct.csh BuildRequires: gcc-c++ BuildRequires: libQt5Gui-private-headers-devel >= 5.4.0 BuildRequires: libQt5PlatformSupport-private-headers-devel >= 5.4.0 @@ -43,8 +45,6 @@ %prep %setup -q -echo "export QT_QPA_PLATFORMTHEME='%{name}'" > %{name}.sh -echo "setenv QT_QPA_PLATFORMTHEME '%{name}'" > %{name}.csh %build %qmake5 @@ -52,8 +52,8 @@ %install %qmake5_install -install -Dpm 0644 %{name}.sh %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh -install -Dpm 0644 %{name}.csh %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh +install -Dpm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh +install -Dpm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh %files %defattr(-,root,root) ++++++ qt5ct.csh ++++++ if ( $?XDG_CURRENT_DESKTOP ) then if ( $XDG_CURRENT_DESKTOP != "KDE" ) then setenv QT_QPA_PLATFORMTHEME 'qt5ct' endif else setenv QT_QPA_PLATFORMTHEME 'qt5ct' endif ++++++ qt5ct.sh ++++++ if [ "$XDG_CURRENT_DESKTOP" != "KDE" ]; then export QT_QPA_PLATFORMTHEME='qt5ct' fi

1 0

commit kye for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package kye for openSUSE:Factory checked in at 2017-05-02 08:54:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kye (Old) and /work/SRC/openSUSE:Factory/.kye.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kye" Tue May 2 08:54:48 2017 rev:16 rq:492217 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kye/kye.changes 2015-10-12 10:02:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kye.new/kye.changes 2017-05-02 08:54:49.794854917 +0200 @@ -1,0 +2,5 @@ +Sun Apr 30 04:54:06 UTC 2017 - bwiedemann(a)suse.com + +- Use various tar options to make build fully reproducible + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kye.spec ++++++ --- /var/tmp/diff_new_pack.Eaa35s/_old 2017-05-02 08:54:50.586743254 +0200 +++ /var/tmp/diff_new_pack.Eaa35s/_new 2017-05-02 08:54:50.590742690 +0200 @@ -68,7 +68,7 @@ pushd t/; tar -xzf ../images.tar.gz; perl -i -pe 's{<style>}{<style type="text/css">}gs' *.svg; -tar -czf ../images.tar.gz *; +tar --use-compress-program="gzip -n9" --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 --mtime=1990-01-01 -cf ../images.tar.gz *; popd; %install

1 0

commit python-html2text for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package python-html2text for openSUSE:Factory checked in at 2017-05-02 08:54:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-html2text (Old) and /work/SRC/openSUSE:Factory/.python-html2text.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-html2text" Tue May 2 08:54:46 2017 rev:17 rq:491649 version:2016.9.19 Changes: -------- --- /work/SRC/openSUSE:Factory/python-html2text/python-html2text.changes 2016-03-16 10:34:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-html2text.new/python-html2text.changes 2017-05-02 08:54:48.643017336 +0200 @@ -1,0 +2,34 @@ +Thu Apr 27 16:33:29 UTC 2017 - toddrme2178(a)gmail.com + +- Implement update-alternatives to avoid conflict with html2text + package. + +------------------------------------------------------------------- +Wed Apr 12 19:18:13 UTC 2017 - toddrme2178(a)gmail.com + +- update to version 2016.9.19: + * Default image alt text option created and set to a default of + empty string "" to maintain backward compatibility + * Fix #136: --default-image-alt now takes a string as argument + * Fix #113: Stop changing quiet levels on /script tags. + * Merge #126: Fix deprecation warning on py3 due to html.escape + * Fix #145: Running test suite on Travis CI for Python 2.6. +- update to version 2016.5.29: + * Fix #125: --pad_tables now pads table cells to make them look + nice. + * Fix #114: Break does not interrupt blockquotes + * Deprecation warnings for URL retrieval. +- update to version 2016.4.2: + * Fix #106: encoding by stdin + * Fix #89: Python 3.5 support. + * Fix #113: inplace baseurl substitution for <a> and <img> tags. + * Feature #118: Update the badges to badge.kloud51.com + * Fix #119: new-line after a list is inserted +- update to version 2016.1.8: + * Feature #99: Removed duplicated initialisation. + * Fix #100: Get element style key error. + * Fix #101: Fix error end tag pop exception + * <s>, <strike>, <del> now rendered as ~~text~~. +- Implement singlespec version. + +------------------------------------------------------------------- Old: ---- html2text-2015.11.4.tar.gz New: ---- html2text-2016.9.19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-html2text.spec ++++++ --- /var/tmp/diff_new_pack.c9QXXI/_old 2017-05-02 08:54:49.378913568 +0200 +++ /var/tmp/diff_new_pack.c9QXXI/_new 2017-05-02 08:54:49.382913004 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-html2text # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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,23 +16,29 @@ # +%bcond_without tests + +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-html2text -Version: 2015.11.4 +Version: 2016.9.19 Release: 0 Url: https://github.com/Alir3z4/html2text/ Summary: Turn HTML into equivalent Markdown-structured text License: GPL-3.0 Group: Development/Languages/Python -Source: https://pypi.python.org/packages/source/h/html2text/html2text-%{version}.ta… +Source: https://files.pythonhosted.org/packages/source/h/html2text/html2text-%{vers… BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: python-unittest2 -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else -BuildArch: noarch +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +%if %{with tests} +BuildRequires: python2-unittest2 %endif +Requires(post): update-alternatives +Requires(preun): update-alternatives +BuildArch: noarch +%python_subpackages %description html2text is a Python script that converts a page of HTML into clean, @@ -45,19 +51,35 @@ sed -i '/^#!/d' html2text/__init__.py %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} -mv %{buildroot}%{_bindir}/html2text %{buildroot}%{_bindir}/html2text-python%{py_ver} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} +# To avoid conflicts with the rst2html5 package +mv %{buildroot}%{_bindir}/html2text %{buildroot}%{_bindir}/html2text-python +ln -s -f %{_sysconfdir}/alternatives/html2text %{buildroot}%{_bindir}/html2text + +%post +update-alternatives --install %{_bindir}/html2text html2text %{_bindir}/html2text-python 15 + +%preun +if [ ! -f %{_bindir}/html2text-python ] ; then + update-alternatives --remove html2text %{_bindir}/html2text-python +fi + +%if %{with tests} %check -python setup.py test +%python_exec setup.py test +%endif -%files +%files %python_files %defattr(-,root,root,-) %doc COPYING README.md AUTHORS.rst ChangeLog.rst -%{_bindir}/html2text-python%{py_ver} +%python3_only %{_bindir}/html2text +%python3_only %{_bindir}/html2text-python +%python3_only %ghost %{_sysconfdir}/alternatives/html2text %{python_sitelib}/* %changelog ++++++ html2text-2015.11.4.tar.gz -> html2text-2016.9.19.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/AUTHORS.rst new/html2text-2016.9.19/AUTHORS.rst --- old/html2text-2015.11.4/AUTHORS.rst 2015-11-04 15:32:38.000000000 +0100 +++ new/html2text-2016.9.19/AUTHORS.rst 2016-05-29 18:08:48.000000000 +0200 @@ -19,6 +19,7 @@ * Albert Berger <gh: nbdsp> * Etienne Millon <me(a)emillon.org> * John C F <gh: critiqjo> +* Mikhail Melnik <by.zumzoom(a)gmail.com> Maintainer: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/ChangeLog.rst new/html2text-2016.9.19/ChangeLog.rst --- old/html2text-2015.11.4/ChangeLog.rst 2015-11-04 15:48:46.000000000 +0100 +++ new/html2text-2016.9.19/ChangeLog.rst 2016-09-19 00:03:35.000000000 +0200 @@ -1,3 +1,44 @@ +2016.9.19 +========= +---- + +* Default image alt text option created and set to a default of empty string "" to maintain backward compatibility +* Fix #136: --default-image-alt now takes a string as argument +* Fix #113: Stop changing quiet levels on \/script tags. +* Merge #126: Fix deprecation warning on py3 due to html.escape +* Fix #145: Running test suite on Travis CI for Python 2.6. + + +2016.5.29 +========= +---- + +* Fix #125: --pad_tables now pads table cells to make them look nice. +* Fix #114: Break does not interrupt blockquotes +* Deprecation warnings for URL retrieval. + + +2016.4.2 +========= +---- + +* Fix #106: encoding by stdin +* Fix #89: Python 3.5 support. +* Fix #113: inplace baseurl substitution for <a> and <img> tags. +* Feature #118: Update the badges to badge.kloud51.com +* Fix #119: new-line after a list is inserted + + +2016.1.8 +========= +---- + +* Feature #99: Removed duplicated initialisation. +* Fix #100: Get element style key error. +* Fix #101: Fix error end tag pop exception +* <s>, <strike>, <del> now rendered as ~~text~~. + + 2015.11.4 ========= ---- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/PKG-INFO new/html2text-2016.9.19/PKG-INFO --- old/html2text-2015.11.4/PKG-INFO 2015-11-04 16:23:02.000000000 +0100 +++ new/html2text-2016.9.19/PKG-INFO 2016-09-19 00:08:46.000000000 +0200 @@ -1,12 +1,129 @@ Metadata-Version: 1.1 Name: html2text -Version: 2015.11.4 +Version: 2016.9.19 Summary: Turn HTML into equivalent Markdown-structured text. Home-page: https://github.com/Alir3z4/html2text/ Author: Alireza Savand Author-email: alireza.savand(a)gmail.com License: GNU GPL 3 -Description: UNKNOWN +Description: html2text + ========= + + |Build Status| |Coverage Status| |Downloads| |Version| |Wheel?| |Format| + |License| + + html2text is a Python script that converts a page of HTML into clean, + easy-to-read plain ASCII text. Better yet, that ASCII also happens to be + valid Markdown (a text-to-HTML format). + + Usage: ``html2text [(filename|url) [encoding]]`` + + +---------------------------------------+------------------------------------+ + | Option | Description | + +=======================================+====================================+ + | ``--version`` | Show program's version number and | + | | exit | + +---------------------------------------+------------------------------------+ + | ``-h``, ``--help`` | Show this help message and exit | + +---------------------------------------+------------------------------------+ + | ``--ignore-links`` | Don't include any formatting for | + | | links | + +---------------------------------------+------------------------------------+ + | ``--escape-all`` | Escape all special characters. | + | | Output is less readable, but | + | | avoids corner case formatting | + | | issues. | + +---------------------------------------+------------------------------------+ + | ``--reference-links`` | Use reference links instead of | + | | links to create markdown | + +---------------------------------------+------------------------------------+ + | ``--mark-code`` | Mark preformatted and code blocks | + | | with [code]...[/code] | + +---------------------------------------+------------------------------------+ + + For a complete list of options see the + `docs <https://github.com/Alir3z4/html2text/blob/master/docs/usage.md>`__ + + Or you can use it from within ``Python``: + + :: + + >>> import html2text + >>> + >>> print(html2text.html2text("<p><strong>Zed's</strong> dead baby, <em>Zed's</em> dead.</p>")) + **Zed's** dead baby, _Zed's_ dead. + + Or with some configuration options: + + :: + + >>> import html2text + >>> + >>> h = html2text.HTML2Text() + >>> # Ignore converting links from HTML + >>> h.ignore_links = True + >>> print h.handle("<p>Hello, <a href='http://earth.google.com/'>world</a>!") + Hello, world! + + >>> print(h.handle("<p>Hello, <a href='http://earth.google.com/'>world</a>!")) + + Hello, world! + + >>> # Don't Ignore links anymore, I like links + >>> h.ignore_links = False + >>> print(h.handle("<p>Hello, <a href='http://earth.google.com/'>world</a>!")) + Hello, [world](http://earth.google.com/)! + + *Originally written by Aaron Swartz. This code is distributed under the + GPLv3.* + + How to install + -------------- + + ``html2text`` is available on pypi + https://pypi.python.org/pypi/html2text + + :: + + $ pip install html2text + + How to run unit tests + --------------------- + + :: + + PYTHONPATH=$PYTHONPATH:. coverage run --source=html2text setup.py test -v + + To see the coverage results: + + :: + + coverage combine + coverage html + + then open the ``./htmlcov/index.html`` file in your browser. + + Documentation + ------------- + + Documentation lives + `here <https://github.com/Alir3z4/html2text/blob/master/docs/usage.md>`__ + + .. |Build Status| image:: https://secure.travis-ci.org/Alir3z4/html2text.png + :target: http://travis-ci.org/Alir3z4/html2text + .. |Coverage Status| image:: https://coveralls.io/repos/Alir3z4/html2text/badge.png + :target: https://coveralls.io/r/Alir3z4/html2text + .. |Downloads| image:: http://badge.kloud51.com/pypi/d/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + .. |Version| image:: http://badge.kloud51.com/pypi/v/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + .. |Wheel?| image:: http://badge.kloud51.com/pypi/wheel/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + .. |Format| image:: http://badge.kloud51.com/pypi/format/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + .. |License| image:: http://badge.kloud51.com/pypi/license/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + Platform: OS Independent Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers @@ -20,7 +137,7 @@ Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.0 -Classifier: Programming Language :: Python :: 3.1 Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/README.md new/html2text-2016.9.19/README.md --- old/html2text-2015.11.4/README.md 2015-11-04 15:32:38.000000000 +0100 +++ new/html2text-2016.9.19/README.md 2016-09-18 23:51:18.000000000 +0200 @@ -2,12 +2,11 @@ [![Build Status](https://secure.travis-ci.org/Alir3z4/html2text.png)](http://travis-… [![Coverage Status](https://coveralls.io/repos/Alir3z4/html2text/badge.png)](https://coveralls.io/r/Alir3z4/html2text) -[![Downloads](https://pypip.in/d/html2text/badge.png)](https://pypi.python.org/pypi/html2text/) -[![Version](https://pypip.in/v/html2text/badge.png)](https://pypi.python.org/pypi/html2text/) -[![Egg?](https://pypip.in/egg/html2text/badge.png)](https://pypi.python.org/pypi/html2text/) -[![Wheel?](https://pypip.in/wheel/html2text/badge.png)](https://pypi.python.org/pypi/html2text/) -[![Format](https://pypip.in/format/html2text/badge.png)](https://pypi.python.org/pypi/html2text/) -[![License](https://pypip.in/license/html2text/badge.png)](https://pypi.python.org/pypi/html2text/) +[![Downloads](http://badge.kloud51.com/pypi/d/html2text.png)](https://pypi.python.org/pypi/html2text/) +[![Version](http://badge.kloud51.com/pypi/v/html2text.png)](https://pypi.python.org/pypi/html2text/) +[![Wheel?](http://badge.kloud51.com/pypi/wheel/html2text.png)](https://pypi.python.org/pypi/html2text/) +[![Format](http://badge.kloud51.com/pypi/format/html2text.png)](https://pypi.python.org/pypi/html2text/) +[![License](http://badge.kloud51.com/pypi/license/html2text.png)](https://pypi.python.org/pypi/html2text/) html2text is a Python script that converts a page of HTML into clean, easy-to-read plain ASCII text. Better yet, that ASCII also happens to be valid Markdown (a text-to-HTML format). @@ -24,7 +23,7 @@ | `--reference-links` | Use reference links instead of links to create markdown | `--mark-code` | Mark preformatted and code blocks with [code]...[/code] -For a complete list of options see the [docs](docs/usage.md) +For a complete list of options see the [docs](https://github.com/Alir3z4/html2text/blob/master/docs/usage.md) Or you can use it from within `Python`: @@ -85,4 +84,4 @@ ## Documentation -Documentation lives [here](docs/index.md) +Documentation lives [here](https://github.com/Alir3z4/html2text/blob/master/docs/usage.md) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/html2text/__init__.py new/html2text-2016.9.19/html2text/__init__.py --- old/html2text-2015.11.4/html2text/__init__.py 2015-11-04 15:48:14.000000000 +0100 +++ new/html2text-2016.9.19/html2text/__init__.py 2016-09-19 00:03:55.000000000 +0200 @@ -3,14 +3,14 @@ """html2text: Turn HTML into equivalent Markdown-structured text.""" from __future__ import division import re -import cgi +import sys try: from textwrap import wrap except ImportError: # pragma: no cover pass -from html2text.compat import urlparse, HTMLParser +from html2text.compat import urlparse, HTMLParser, html_escape from html2text import config from html2text.utils import ( @@ -26,10 +26,11 @@ list_numbering_start, dumb_css_parser, escape_md_section, - skipwrap + skipwrap, + pad_tables_in_text ) -__version__ = (2015, 11, 4) +__version__ = (2016, 9, 19) # TODO: @@ -44,7 +45,10 @@ appends lines of text). baseurl: base URL of the document we process """ - HTMLParser.HTMLParser.__init__(self) + kwargs = {} + if sys.version_info >= (3, 4): + kwargs['convert_charrefs'] = False + HTMLParser.HTMLParser.__init__(self, **kwargs) # Config options self.split_next_td = False @@ -64,6 +68,7 @@ self.images_with_size = config.IMAGES_WITH_SIZE # covered in cli self.ignore_emphasis = config.IGNORE_EMPHASIS # covered in cli self.bypass_tables = config.BYPASS_TABLES # covered in cli + self.ignore_tables = config.IGNORE_TABLES # covered in cli self.google_doc = False # covered in cli self.ul_item_mark = '*' # covered in cli self.emphasis_mark = '_' # covered in cli @@ -72,9 +77,9 @@ self.use_automatic_links = config.USE_AUTOMATIC_LINKS # covered in cli self.hide_strikethrough = False # covered in cli self.mark_code = config.MARK_CODE - self.single_line_break = config.SINGLE_LINE_BREAK - self.use_automatic_links = config.USE_AUTOMATIC_LINKS self.wrap_links = config.WRAP_LINKS # covered in cli + self.pad_tables = config.PAD_TABLES # covered in cli + self.default_image_alt = config.DEFAULT_IMAGE_ALT # covered in cli self.tag_callback = None if out is None: # pragma: no cover @@ -128,7 +133,11 @@ def handle(self, data): self.feed(data) self.feed("") - return self.optwrap(self.close()) + markdown = self.optwrap(self.close()) + if self.pad_tables: + return pad_tables_in_text(markdown) + else: + return markdown def outtextf(self, s): self.outtextlist.append(s) @@ -140,23 +149,20 @@ try: nochr = unicode('') + unicode_character = unichr except NameError: nochr = str('') + unicode_character = chr self.pbr() self.o('', 0, 'end') outtext = nochr.join(self.outtextlist) + if self.unicode_snob: - try: - nbsp = unichr(name2cp('nbsp')) - except NameError: - nbsp = chr(name2cp('nbsp')) + nbsp = unicode_character(name2cp('nbsp')) else: - try: - nbsp = unichr(32) - except NameError: - nbsp = chr(32) + nbsp = unicode_character(32) try: outtext = outtext.replace(unicode('&nbsp_place_holder;'), nbsp) except NameError: @@ -171,14 +177,14 @@ def handle_charref(self, c): charref = self.charref(c) if not self.code and not self.pre: - charref = cgi.escape(charref) + charref = html_escape(charref) self.handle_data(charref, True) def handle_entityref(self, c): entityref = self.entityref(c) if (not self.code and not self.pre and entityref != '&nbsp_place_holder;'): - entityref = cgi.escape(entityref) + entityref = html_escape(entityref) self.handle_data(entityref, True) def handle_starttag(self, tag, attrs): @@ -306,7 +312,7 @@ tag_style = element_style(attrs, self.style_def, parent_style) self.tag_stack.append((tag, attrs, tag_style)) else: - dummy, attrs, tag_style = self.tag_stack.pop() + dummy, attrs, tag_style = self.tag_stack.pop() if self.tag_stack else (None, {}, {}) if self.tag_stack: parent_style = self.tag_stack[-1][2] @@ -329,7 +335,10 @@ self.p() if tag == "br" and start: - self.o(" \n") + if self.blockquote > 0: + self.o(" \n> ") + else: + self.o(" \n") if tag == "hr" and start: self.p() @@ -367,9 +376,9 @@ self.o(self.strong_mark) if tag in ['del', 'strike', 's']: if start: - self.o("<" + tag + ">") + self.o('~~') else: - self.o("</" + tag + ">") + self.o('~~') if self.google_doc: if not self.inheader: @@ -418,9 +427,9 @@ try: title = escape_md(a['title']) except KeyError: - self.o("](" + escape_md(a['href']) + ")") + self.o("](" + escape_md(urlparse.urljoin(self.baseurl, a['href'])) + ")") else: - self.o("](" + escape_md(a['href']) + self.o("](" + escape_md(urlparse.urljoin(self.baseurl, a['href'])) + ' "' + title + '" )') else: i = self.previousIndex(a) @@ -437,7 +446,7 @@ if 'src' in attrs: if not self.images_to_alt: attrs['href'] = attrs['src'] - alt = attrs.get('alt') or '' + alt = attrs.get('alt') or self.default_image_alt # If we have images_with_size, write raw html including width, # height, and alt attributes @@ -474,7 +483,7 @@ self.o("![" + escape_md(alt) + "]") if self.inline_links: href = attrs.get('href') or '' - self.o("(" + escape_md(href) + ")") + self.o("(" + escape_md(urlparse.urljoin(self.baseurl, href)) + ")") else: i = self.previousIndex(attrs) if i is not None: @@ -512,6 +521,8 @@ else: if self.list: self.list.pop() + if (not self.google_doc) and (not self.list): + self.o('\n') self.lastWasList = True else: self.lastWasList = False @@ -537,7 +548,16 @@ self.start = 1 if tag in ["table", "tr", "td", "th"]: - if self.bypass_tables: + if self.ignore_tables: + if tag == 'tr': + if start: + pass + else: + self.soft_br() + else: + pass + + elif self.bypass_tables: if start: self.soft_br() if tag in ["td", "th"]: @@ -552,8 +572,16 @@ self.o('</{0}>'.format(tag)) else: - if tag == "table" and start: - self.table_start = True + if tag == "table": + if start: + self.table_start = True + if self.pad_tables: + self.o("<"+config.TABLE_MARKER_FOR_PAD+">") + self.o(" \n") + else: + if self.pad_tables: + self.o("</"+config.TABLE_MARKER_FOR_PAD+">") + self.o(" \n") if tag in ["td", "th"] and start: if self.split_next_td: self.o("| ") @@ -703,9 +731,6 @@ self.outcount += 1 def handle_data(self, data, entity_char=False): - if r'\/script>' in data: - self.quiet -= 1 - if self.style: self.style_def.update(dumb_css_parser(data)) @@ -810,7 +835,9 @@ for para in text.split("\n"): if len(para) > 0: if not skipwrap(para, self.wrap_links): - result += "\n".join(wrap(para, self.body_width)) + result += "\n".join( + wrap(para, self.body_width, break_long_words=False) + ) if para.endswith(' '): result += " \n" newlines = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/html2text/cli.py new/html2text-2016.9.19/html2text/cli.py --- old/html2text-2015.11.4/html2text/cli.py 2015-11-04 15:32:38.000000000 +0100 +++ new/html2text-2016.9.19/html2text/cli.py 2016-09-18 23:51:18.000000000 +0200 @@ -1,4 +1,5 @@ import optparse +import warnings from html2text.compat import urllib from html2text import HTML2Text, config, __version__ @@ -23,6 +24,20 @@ version='%prog ' + ".".join(map(str, __version__)) ) p.add_option( + "--default-image-alt", + dest="default_image_alt", + action="store", + type="str", + default=config.DEFAULT_IMAGE_ALT, + help="The default alt string for images with missing ones") + p.add_option( + "--pad-tables", + dest="pad_tables", + action="store_true", + default=config.PAD_TABLES, + help="pad the cells to equal column width in tables" + ) + p.add_option( "--no-wrap-links", dest="wrap_links", action="store_false", @@ -139,6 +154,13 @@ help="Format tables in HTML rather than Markdown syntax." ) p.add_option( + "--ignore-tables", + action="store_true", + dest="ignore_tables", + default=config.IGNORE_TABLES, + help="Ignore table-related tags (table, th, td, tr) while keeping rows." + ) + p.add_option( "--single-line-break", action="store_true", dest="single_line_break", @@ -195,14 +217,17 @@ # process input encoding = "utf-8" + if len(args) == 2: + encoding = args[1] + elif len(args) > 2: + p.error('Too many arguments') + if len(args) > 0 and args[0] != '-': # pragma: no cover file_ = args[0] - if len(args) == 2: - encoding = args[1] - if len(args) > 2: - p.error('Too many arguments') if file_.startswith('http://') or file_.startswith('https://'): + warnings.warn("Support for retrieving html over network is set for deprecation by version (2017, 1, x)", + DeprecationWarning) baseurl = file_ j = urllib.urlopen(baseurl) data = j.read() @@ -259,6 +284,7 @@ h.hide_strikethrough = options.hide_strikethrough h.escape_snob = options.escape_snob h.bypass_tables = options.bypass_tables + h.ignore_tables = options.ignore_tables h.single_line_break = options.single_line_break h.inline_links = options.inline_links h.unicode_snob = options.unicode_snob @@ -267,5 +293,7 @@ h.links_each_paragraph = options.links_each_paragraph h.mark_code = options.mark_code h.wrap_links = options.wrap_links + h.pad_tables = options.pad_tables + h.default_image_alt = options.default_image_alt wrapwrite(h.handle(data)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/html2text/compat.py new/html2text-2016.9.19/html2text/compat.py --- old/html2text-2015.11.4/html2text/compat.py 2015-11-04 15:32:38.000000000 +0100 +++ new/html2text-2016.9.19/html2text/compat.py 2016-09-18 23:51:18.000000000 +0200 @@ -6,8 +6,12 @@ import urlparse import HTMLParser import urllib + from cgi import escape as html_escape else: import urllib.parse as urlparse import html.entities as htmlentitydefs import html.parser as HTMLParser import urllib.request as urllib + from html import escape + def html_escape(s): + return escape(s, quote=False) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/html2text/config.py new/html2text-2016.9.19/html2text/config.py --- old/html2text-2015.11.4/html2text/config.py 2015-11-04 15:32:38.000000000 +0100 +++ new/html2text-2016.9.19/html2text/config.py 2016-09-18 23:51:18.000000000 +0200 @@ -3,6 +3,8 @@ # Use Unicode characters instead of their ascii psuedo-replacements UNICODE_SNOB = 0 +# Marker to use for marking tables for padding post processing +TABLE_MARKER_FOR_PAD = "special_marker_for_table_padding" # Escape all special characters. Output is less readable, but avoids # corner case formatting issues. ESCAPE_SNOB = 0 @@ -36,6 +38,8 @@ IGNORE_EMPHASIS = False MARK_CODE = False DECODE_ERRORS = 'strict' +DEFAULT_IMAGE_ALT = '' +PAD_TABLES = False # Convert links with same href and text to <href> format if they are absolute links USE_AUTOMATIC_LINKS = True @@ -116,7 +120,11 @@ 'rlm': '' } +# Format tables in HTML rather than Markdown syntax BYPASS_TABLES = False +# Ignore table-related tags (table, th, td, tr) while keeping rows +IGNORE_TABLES = False + # Use a single line break after a block element rather an two line breaks. # NOTE: Requires body width setting to be 0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/html2text/utils.py new/html2text-2016.9.19/html2text/utils.py --- old/html2text-2015.11.4/html2text/utils.py 2015-11-04 15:32:38.000000000 +0100 +++ new/html2text-2016.9.19/html2text/utils.py 2016-09-18 23:51:18.000000000 +0200 @@ -31,7 +31,7 @@ """ :returns: A hash of css attributes """ - out = dict([(x.strip(), y.strip()) for x, y in + out = dict([(x.strip().lower(), y.strip().lower()) for x, y in [z.split(':', 1) for z in style.split(';') if ':' in z ] @@ -80,7 +80,7 @@ style = parent_style.copy() if 'class' in attrs: for css_class in attrs['class'].split(): - css_style = style_def['.' + css_class] + css_style = style_def.get('.' + css_class, {}) style.update(css_style) if 'style' in attrs: immediate_style = dumb_property_dict(attrs['style']) @@ -149,7 +149,7 @@ font_family = '' if 'font-family' in style: font_family = style['font-family'] - if 'Courier New' == font_family or 'Consolas' == font_family: + if 'courier new' == font_family or 'consolas' == font_family: return True return False @@ -244,3 +244,55 @@ text = config.RE_MD_DASH_MATCHER.sub(r"\1\\\2", text) return text + +def reformat_table(lines, right_margin): + """ + Given the lines of a table + padds the cells and returns the new lines + """ + # find the maximum width of the columns + max_width = [len(x.rstrip()) + right_margin for x in lines[0].split('|')] + for line in lines: + cols = [x.rstrip() for x in line.split('|')] + max_width = [max(len(x) + right_margin, old_len) + for x, old_len in zip(cols, max_width)] + + # reformat + new_lines = [] + for line in lines: + cols = [x.rstrip() for x in line.split('|')] + if set(line.strip()) == set('-|'): + filler = '-' + new_cols = [x.rstrip() + (filler * (M - len(x.rstrip()))) + for x, M in zip(cols, max_width)] + else: + filler = ' ' + new_cols = [x.rstrip() + (filler * (M - len(x.rstrip()))) + for x, M in zip(cols, max_width)] + new_lines.append('|'.join(new_cols)) + return new_lines + +def pad_tables_in_text(text, right_margin=1): + """ + Provide padding for tables in the text + """ + lines = text.split('\n') + table_buffer, altered_lines, table_widths, table_started = [], [], [], False + new_lines = [] + for line in lines: + # Toogle table started + if (config.TABLE_MARKER_FOR_PAD in line): + table_started = not table_started + if not table_started: + table = reformat_table(table_buffer, right_margin) + new_lines.extend(table) + table_buffer = [] + new_lines.append('') + continue + # Process lines + if table_started: + table_buffer.append(line) + else: + new_lines.append(line) + new_text = '\n'.join(new_lines) + return new_text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/html2text.egg-info/PKG-INFO new/html2text-2016.9.19/html2text.egg-info/PKG-INFO --- old/html2text-2015.11.4/html2text.egg-info/PKG-INFO 2015-11-04 16:23:02.000000000 +0100 +++ new/html2text-2016.9.19/html2text.egg-info/PKG-INFO 2016-09-19 00:08:46.000000000 +0200 @@ -1,12 +1,129 @@ Metadata-Version: 1.1 Name: html2text -Version: 2015.11.4 +Version: 2016.9.19 Summary: Turn HTML into equivalent Markdown-structured text. Home-page: https://github.com/Alir3z4/html2text/ Author: Alireza Savand Author-email: alireza.savand(a)gmail.com License: GNU GPL 3 -Description: UNKNOWN +Description: html2text + ========= + + |Build Status| |Coverage Status| |Downloads| |Version| |Wheel?| |Format| + |License| + + html2text is a Python script that converts a page of HTML into clean, + easy-to-read plain ASCII text. Better yet, that ASCII also happens to be + valid Markdown (a text-to-HTML format). + + Usage: ``html2text [(filename|url) [encoding]]`` + + +---------------------------------------+------------------------------------+ + | Option | Description | + +=======================================+====================================+ + | ``--version`` | Show program's version number and | + | | exit | + +---------------------------------------+------------------------------------+ + | ``-h``, ``--help`` | Show this help message and exit | + +---------------------------------------+------------------------------------+ + | ``--ignore-links`` | Don't include any formatting for | + | | links | + +---------------------------------------+------------------------------------+ + | ``--escape-all`` | Escape all special characters. | + | | Output is less readable, but | + | | avoids corner case formatting | + | | issues. | + +---------------------------------------+------------------------------------+ + | ``--reference-links`` | Use reference links instead of | + | | links to create markdown | + +---------------------------------------+------------------------------------+ + | ``--mark-code`` | Mark preformatted and code blocks | + | | with [code]...[/code] | + +---------------------------------------+------------------------------------+ + + For a complete list of options see the + `docs <https://github.com/Alir3z4/html2text/blob/master/docs/usage.md>`__ + + Or you can use it from within ``Python``: + + :: + + >>> import html2text + >>> + >>> print(html2text.html2text("<p><strong>Zed's</strong> dead baby, <em>Zed's</em> dead.</p>")) + **Zed's** dead baby, _Zed's_ dead. + + Or with some configuration options: + + :: + + >>> import html2text + >>> + >>> h = html2text.HTML2Text() + >>> # Ignore converting links from HTML + >>> h.ignore_links = True + >>> print h.handle("<p>Hello, <a href='http://earth.google.com/'>world</a>!") + Hello, world! + + >>> print(h.handle("<p>Hello, <a href='http://earth.google.com/'>world</a>!")) + + Hello, world! + + >>> # Don't Ignore links anymore, I like links + >>> h.ignore_links = False + >>> print(h.handle("<p>Hello, <a href='http://earth.google.com/'>world</a>!")) + Hello, [world](http://earth.google.com/)! + + *Originally written by Aaron Swartz. This code is distributed under the + GPLv3.* + + How to install + -------------- + + ``html2text`` is available on pypi + https://pypi.python.org/pypi/html2text + + :: + + $ pip install html2text + + How to run unit tests + --------------------- + + :: + + PYTHONPATH=$PYTHONPATH:. coverage run --source=html2text setup.py test -v + + To see the coverage results: + + :: + + coverage combine + coverage html + + then open the ``./htmlcov/index.html`` file in your browser. + + Documentation + ------------- + + Documentation lives + `here <https://github.com/Alir3z4/html2text/blob/master/docs/usage.md>`__ + + .. |Build Status| image:: https://secure.travis-ci.org/Alir3z4/html2text.png + :target: http://travis-ci.org/Alir3z4/html2text + .. |Coverage Status| image:: https://coveralls.io/repos/Alir3z4/html2text/badge.png + :target: https://coveralls.io/r/Alir3z4/html2text + .. |Downloads| image:: http://badge.kloud51.com/pypi/d/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + .. |Version| image:: http://badge.kloud51.com/pypi/v/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + .. |Wheel?| image:: http://badge.kloud51.com/pypi/wheel/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + .. |Format| image:: http://badge.kloud51.com/pypi/format/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + .. |License| image:: http://badge.kloud51.com/pypi/license/html2text.png + :target: https://pypi.python.org/pypi/html2text/ + Platform: OS Independent Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers @@ -20,7 +137,7 @@ Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.0 -Classifier: Programming Language :: Python :: 3.1 Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/html2text.egg-info/SOURCES.txt new/html2text-2016.9.19/html2text.egg-info/SOURCES.txt --- old/html2text-2015.11.4/html2text.egg-info/SOURCES.txt 2015-11-04 16:23:02.000000000 +0100 +++ new/html2text-2016.9.19/html2text.egg-info/SOURCES.txt 2016-09-19 00:08:46.000000000 +0200 @@ -35,10 +35,14 @@ test/bodywidth_newline.md test/bold_inside_link.html test/bold_inside_link.md +test/break_preserved_in_blockquote.html +test/break_preserved_in_blockquote.md test/css_import_no_semicolon.html test/css_import_no_semicolon.md test/decript_tage.html test/decript_tage.md +test/default_image_alt.html +test/default_image_alt.md test/doc_with_table.html test/doc_with_table.md test/doc_with_table_bypass.html @@ -49,6 +53,8 @@ test/empty-link.md test/flip_emphasis.html test/flip_emphasis.md +test/google-like_font-properties.html +test/google-like_font-properties.md test/header_tags.html test/header_tags.md test/horizontal_rule.html @@ -63,6 +69,8 @@ test/images_with_size.md test/img-tag-with-link.html test/img-tag-with-link.md +test/inplace_baseurl_substitution.html +test/inplace_baseurl_substitution.md test/invalid_start.html test/invalid_start.md test/invalid_unicode.html @@ -71,6 +79,8 @@ test/link_titles.md test/list_tags_example.html test/list_tags_example.md +test/long_lines.html +test/long_lines.md test/mark_code.html test/mark_code.md test/nbsp.html @@ -91,6 +101,8 @@ test/normal.md test/normal_escape_snob.html test/normal_escape_snob.md +test/pad_table.html +test/pad_table.md test/pre.html test/pre.md test/preformatted_in_list.html @@ -99,7 +111,11 @@ test/protect_links.md test/single_line_break.html test/single_line_break.md +test/table_ignore.html +test/table_ignore.md test/test_html2text.py test/test_memleak.py +test/text_after_list.html +test/text_after_list.md test/url-escaping.html test/url-escaping.md \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/setup.py new/html2text-2016.9.19/setup.py --- old/html2text-2015.11.4/setup.py 2015-11-04 15:58:13.000000000 +0100 +++ new/html2text-2016.9.19/setup.py 2016-05-29 18:13:44.000000000 +0200 @@ -1,7 +1,14 @@ # coding: utf-8 import sys + from setuptools import setup, Command, find_packages +try: + from pypandoc import convert + read_md = lambda f: convert(f, 'rst') +except ImportError: + read_md = lambda f: open(f, 'r').read() + requires_list = [] try: import unittest2 as unittest @@ -13,7 +20,8 @@ class RunTests(Command): - """New setup.py command to run all tests for the package. + """ + New setup.py command to run all tests for the package. """ description = "run all tests for the package" @@ -36,6 +44,7 @@ name="html2text", version=".".join(map(str, __import__('html2text').__version__)), description="Turn HTML into equivalent Markdown-structured text.", + long_description=read_md('README.md'), author="Aaron Swartz", author_email="me(a)aaronsw.com", maintainer='Alireza Savand', @@ -56,10 +65,10 @@ 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.0', - 'Programming Language :: Python :: 3.1', 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', ], entry_points=""" [console_scripts] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/break_preserved_in_blockquote.html new/html2text-2016.9.19/test/break_preserved_in_blockquote.html --- old/html2text-2015.11.4/test/break_preserved_in_blockquote.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/break_preserved_in_blockquote.html 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1 @@ +a<blockquote>b<br>c</blockquote> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/break_preserved_in_blockquote.md new/html2text-2016.9.19/test/break_preserved_in_blockquote.md --- old/html2text-2015.11.4/test/break_preserved_in_blockquote.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/break_preserved_in_blockquote.md 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1,5 @@ +a + +> b +> c + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/decript_tage.md new/html2text-2016.9.19/test/decript_tage.md --- old/html2text-2015.11.4/test/decript_tage.md 2015-11-04 15:32:38.000000000 +0100 +++ new/html2text-2016.9.19/test/decript_tage.md 2016-05-29 18:08:48.000000000 +0200 @@ -1,2 +1,2 @@ -<del>something</del> <strike>something</strike> <s>something</s> +~~something~~ ~~something~~ ~~something~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/default_image_alt.html new/html2text-2016.9.19/test/default_image_alt.html --- old/html2text-2015.11.4/test/default_image_alt.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/default_image_alt.html 2016-09-18 23:51:18.000000000 +0200 @@ -0,0 +1 @@ +<a href="http://google.com"><img src="images/google.png"></a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/default_image_alt.md new/html2text-2016.9.19/test/default_image_alt.md --- old/html2text-2015.11.4/test/default_image_alt.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/default_image_alt.md 2016-09-18 23:51:18.000000000 +0200 @@ -0,0 +1,2 @@ +[![Image](images/google.png)](http://google.com) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/google-like_font-properties.html new/html2text-2016.9.19/test/google-like_font-properties.html --- old/html2text-2015.11.4/test/google-like_font-properties.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/google-like_font-properties.html 2016-09-18 23:51:18.000000000 +0200 @@ -0,0 +1,15 @@ +<HTML> + <HEAD> + <TITLE>CAPS-LOCK TEST</TITLE> + </HEAD> + <BODY> + <p><span style="font-weight: bold">font-weight: bold</span></p> + <P><SPAN STYLE="FONT-WEIGHT: BOLD">FONT-WEIGHT: BOLD</SPAN></P> + <p><span style="font-style: italic">font-style: italic</span></p> + <P><SPAN STYLE="FONT-STYLE: ITALIC">FONT-STYLE: ITALIC</SPAN></P> + <p><span style="font-weight: bold;font-style: italic"> + font-weight: bold;font-style: italic</span></p> + <P><SPAN STYLE="FONT-WEIGHT: BOLD;FONT-STYLE: ITALIC"> + FONT-WEIGHT: BOLD;FONT-STYLE: ITALIC</SPAN></P> + </BODY> +</HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/google-like_font-properties.md new/html2text-2016.9.19/test/google-like_font-properties.md --- old/html2text-2015.11.4/test/google-like_font-properties.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/google-like_font-properties.md 2016-09-18 23:51:18.000000000 +0200 @@ -0,0 +1,6 @@ +**font-weight: bold** +**FONT-WEIGHT: BOLD** +_font-style: italic_ +_FONT-STYLE: ITALIC_ +_**font-weight: bold;font-style: italic**_ +_**FONT-WEIGHT: BOLD;FONT-STYLE: ITALIC**_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/inplace_baseurl_substitution.html new/html2text-2016.9.19/test/inplace_baseurl_substitution.html --- old/html2text-2015.11.4/test/inplace_baseurl_substitution.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/inplace_baseurl_substitution.html 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1,11 @@ +<!DOCTYPE html> +<head></head> +<body> +<p> +<img src="/uploads/2012/01/read2textheader.jpg" alt="read2text header image" width="650" height="165"/> +</p> +<p> +<a href="/">BrettTerpstra.com</a> +</p> +</body> +</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/inplace_baseurl_substitution.md new/html2text-2016.9.19/test/inplace_baseurl_substitution.md --- old/html2text-2015.11.4/test/inplace_baseurl_substitution.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/inplace_baseurl_substitution.md 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1,3 @@ +![read2text header image](http://brettterpstra.com/uploads/2012/01/read2textheader.jpg) + +[BrettTerpstra.com](http://brettterpstra.com/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/list_tags_example.md new/html2text-2016.9.19/test/list_tags_example.md --- old/html2text-2015.11.4/test/list_tags_example.md 2015-11-04 15:32:38.000000000 +0100 +++ new/html2text-2016.9.19/test/list_tags_example.md 2016-05-29 18:08:48.000000000 +0200 @@ -28,9 +28,11 @@ * some item * Some other item * some item + 1. Some other item 2. some item 3. some item + * somthing else here * some item diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/long_lines.html new/html2text-2016.9.19/test/long_lines.html --- old/html2text-2015.11.4/test/long_lines.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/long_lines.html 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1 @@ +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd <img src="http://www.fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo…"> asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/long_lines.md new/html2text-2016.9.19/test/long_lines.md --- old/html2text-2015.11.4/test/long_lines.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/long_lines.md 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1,14 @@ +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd +![](http://www.foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo.com) +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd asd +asd asd asd asd asd + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/pad_table.html new/html2text-2016.9.19/test/pad_table.html --- old/html2text-2015.11.4/test/pad_table.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/pad_table.html 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1,26 @@ +<!DOCTYPE html> <html> + <head lang="en"> <meta charset="UTF-8"> <title></title> </head> + <body> <h1>This is a test document</h1> With some text, <code>code</code>, <b>bolds</b> and <i>italics</i>. <h2>This is second header</h2> <p style="display: none">Displaynone text</p> + <table> + <tr> <th>Header 1</th> <th>Header 2</th> <th>Header 3</th> </tr> + <tr> <td>Content 1</td> <td>2</td> <td><img src="http://lorempixel.com/200/200" alt="200"/> Image!</td> </tr> + <tr> <td>Content 1 longer</td> <td>Content 2</td> <td>blah</td> </tr> + <tr> <td>Content </td> <td>Content 2</td> <td>blah</td> </tr> + <tr> <td>t </td> <td>Content 2</td> <td>blah blah blah</td> </tr> + </table> + + + <table> <tr> <th>H1</th> <th>H2</th> <th>H3</th> </tr> + <tr> <td>C1</td> <td>Content 2</td> <td>x</td> </tr> + <tr> <td>C123</td> <td>Content 2</td> <td>xyz</td> </tr> + </table> + +some content between the tables<br> + + <table> <tr> <th>Header 1</th> <th>Header 2</th> <th>Header 3</th> </tr> + <tr> <td>Content 1</td> <td>Content 2</td> <td><img src="http://lorempixel.com/200/200" alt="200"/> Image!</td> </tr> + <tr> <td>Content 1</td> <td>Content 2 longer</td> <td><img src="http://lorempixel.com/200/200" alt="200"/> Image!</td> </tr> + </table> + +something else entirely +</body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/pad_table.md new/html2text-2016.9.19/test/pad_table.md --- old/html2text-2015.11.4/test/pad_table.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/pad_table.md 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1,28 @@ +# This is a test document + +With some text, `code`, **bolds** and _italics_. + +## This is second header + +Displaynone text + +Header 1 | Header 2 | Header 3 +-----------------|-----------|---------------------------------------------- +Content 1 | 2 | ![200](http://lorempixel.com/200/200) Image! +Content 1 longer | Content 2 | blah +Content | Content 2 | blah +t | Content 2 | blah blah blah + +H1 | H2 | H3 +-----|-----------|----- +C1 | Content 2 | x +C123 | Content 2 | xyz + +some content between the tables +Header 1 | Header 2 | Header 3 +----------|------------------|---------------------------------------------- +Content 1 | Content 2 | ![200](http://lorempixel.com/200/200) Image! +Content 1 | Content 2 longer | ![200](http://lorempixel.com/200/200) Image! + +something else entirely + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/table_ignore.html new/html2text-2016.9.19/test/table_ignore.html --- old/html2text-2015.11.4/test/table_ignore.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/table_ignore.html 2016-09-18 23:51:18.000000000 +0200 @@ -0,0 +1,26 @@ +<!DOCTYPE html> <html> + <head lang="en"> <meta charset="UTF-8"> <title></title> </head> + <body> <h1>This is a test document</h1> With some text, <code>code</code>, <b>bolds</b> and <i>italics</i>. <h2>This is second header</h2> <p style="display: none">Displaynone text</p> + <table> + <tr> <th>Header 1</th> <th>Header 2</th> <th>Header 3</th> </tr> + <tr> <td>Content 1</td> <td>2</td> <td><img src="http://lorempixel.com/200/200" alt="200"/> Image!</td> </tr> + <tr> <td>Content 1 longer</td> <td>Content 2</td> <td>blah</td> </tr> + <tr> <td>Content </td> <td>Content 2</td> <td>blah</td> </tr> + <tr> <td>t </td> <td>Content 2</td> <td>blah blah blah</td> </tr> + </table> + + + <table> <tr> <th>H1</th> <th>H2</th> <th>H3</th> </tr> + <tr> <td>C1</td> <td>Content 2</td> <td>x</td> </tr> + <tr> <td>C123</td> <td>Content 2</td> <td>xyz</td> </tr> + </table> + +some content between the tables<br> + + <table> <tr> <th>Header 1</th> <th>Header 2</th> <th>Header 3</th> </tr> + <tr> <td>Content 1</td> <td>Content 2</td> <td><img src="http://lorempixel.com/200/200" alt="200"/> Image!</td> </tr> + <tr> <td>Content 1</td> <td>Content 2 longer</td> <td><img src="http://lorempixel.com/200/200" alt="200"/> Image!</td> </tr> + </table> + +something else entirely +</body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/table_ignore.md new/html2text-2016.9.19/test/table_ignore.md --- old/html2text-2015.11.4/test/table_ignore.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/table_ignore.md 2016-09-18 23:51:18.000000000 +0200 @@ -0,0 +1,22 @@ +# This is a test document + +With some text, `code`, **bolds** and _italics_. + +## This is second header + +Displaynone text + +Header 1 Header 2 Header 3 +Content 1 2 ![200](http://lorempixel.com/200/200) Image! +Content 1 longer Content 2 blah +Content Content 2 blah +t Content 2 blah blah blah +H1 H2 H3 +C1 Content 2 x +C123 Content 2 xyz +some content between the tables +Header 1 Header 2 Header 3 +Content 1 Content 2 ![200](http://lorempixel.com/200/200) Image! +Content 1 Content 2 longer ![200](http://lorempixel.com/200/200) Image! +something else entirely + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/test_html2text.py new/html2text-2016.9.19/test/test_html2text.py --- old/html2text-2015.11.4/test/test_html2text.py 2015-11-04 15:32:38.000000000 +0100 +++ new/html2text-2016.9.19/test/test_html2text.py 2016-09-18 23:51:18.000000000 +0200 @@ -114,6 +114,10 @@ func_args = {} base_fn = os.path.basename(fn).lower() + if base_fn.startswith('default_image_alt'): + module_args['default_image_alt'] = 'Image' + cmdline_args.append('--default-image-alt=Image') + if base_fn.startswith('google'): module_args['google_doc'] = True cmdline_args.append('--googledoc') @@ -134,6 +138,10 @@ module_args['bypass_tables'] = True cmdline_args.append('--bypass-tables') + if base_fn.startswith('table_ignore'): + module_args['ignore_tables'] = True + cmdline_args.append('--ignore-tables') + if base_fn.startswith('bodywidth'): # module_args['unicode_snob'] = True module_args['body_width'] = 0 @@ -161,7 +169,7 @@ if base_fn.startswith('no_inline_links'): module_args['inline_links'] = False cmdline_args.append('--reference-links') - + if base_fn.startswith('no_wrap_links'): module_args['wrap_links'] = False cmdline_args.append('--no-wrap-links') @@ -170,9 +178,19 @@ module_args['mark_code'] = True cmdline_args.append('--mark-code') + if base_fn.startswith('pad_table'): + module_args['pad_tables'] = True + cmdline_args.append('--pad-tables') + if base_fn not in ['bodywidth_newline.html', 'abbr_tag.html']: test_func = None + if base_fn == 'inplace_baseurl_substitution.html': + module_args['baseurl'] = 'http://brettterpstra.com' + module_args['body_width'] = 0 + # there is no way to specify baseurl in cli :( + test_cmd = None + return test_mod, test_cmd, test_func # Originally from http://stackoverflow.com/questions/32899/\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/text_after_list.html new/html2text-2016.9.19/test/text_after_list.html --- old/html2text-2015.11.4/test/text_after_list.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/text_after_list.html 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1,2 @@ +<ul><li>item</li></ul> +text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/text_after_list.md new/html2text-2016.9.19/test/text_after_list.md --- old/html2text-2015.11.4/test/text_after_list.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2016.9.19/test/text_after_list.md 2016-05-29 18:08:48.000000000 +0200 @@ -0,0 +1,4 @@ + * item + +text + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.11.4/test/url-escaping.html new/html2text-2016.9.19/test/url-escaping.html --- old/html2text-2015.11.4/test/url-escaping.html 2015-02-18 14:16:15.000000000 +0100 +++ new/html2text-2016.9.19/test/url-escaping.html 2016-05-29 18:08:48.000000000 +0200 @@ -6,8 +6,8 @@ <li><a href="http://msdn.microsoft.com/en-us/library/system.drawing.drawing2d(v=vs.110)">Some MSDN link using parenthesis</a></li> <li><a href="https://www.google.ru/search?q=[brackets are cool]">Google search result URL with unescaped brackets</a></li> <li><a href="https://www.google.ru/search?q='[({})]'">Yet another test for [brackets], {curly braces} and (parenthesis) processing inside the anchor</a></li> - <li>Use automatic links like <a href="http://example.com/">http://example.com/</a> when the URL is the label</a> - <li>Exempt <a href="non-absolute_URIs">non-absolute_URIs</a> from automatic link detection</a> + <li>Use automatic links like <a href="http://example.com/">http://example.com/</a> when the URL is the label</a></li> + <li>Exempt <a href="non-absolute_URIs">non-absolute_URIs</a> from automatic link detection</a></li> </ul> <p>And here are images with tricky attribute values:</p>

1 0

commit audience for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package audience for openSUSE:Factory checked in at 2017-05-02 08:54:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audience (Old) and /work/SRC/openSUSE:Factory/.audience.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audience" Tue May 2 08:54:44 2017 rev:4 rq:490809 version:0.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/audience/audience.changes 2017-04-11 09:39:24.065919256 +0200 +++ /work/SRC/openSUSE:Factory/.audience.new/audience.changes 2017-05-02 08:54:47.631160016 +0200 @@ -1,0 +2,11 @@ +Fri Apr 14 14:11:44 UTC 2017 - avvissu(a)yandex.by + +- Update to 0.2.2: + * Make use of x-appcenter-color-primary + * fixed preview popover not always pointing to correct location + * Launchpad automatic translations update. + * Fix build with vala 0.35.6 + * Fix printf being used before translating the string +- Drop audience-0.2.1.2-vala-0.36.patch + +------------------------------------------------------------------- Old: ---- audience-0.2.1.2-vala-0.36.patch audience-0.2.1.2.tar.xz New: ---- audience-0.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audience.spec ++++++ --- /var/tmp/diff_new_pack.NipwvA/_old 2017-05-02 08:54:48.247073167 +0200 +++ /var/tmp/diff_new_pack.NipwvA/_new 2017-05-02 08:54:48.251072603 +0200 @@ -17,15 +17,13 @@ Name: audience -Version: 0.2.1.2 +Version: 0.2.2 Release: 0 Summary: A minimalistic media player License: GPL-3.0 Group: Productivity/Multimedia/Video/Players Url: https://launchpad.net/audience Source: https://launchpad.net/audience/0.4-loki/%{version}/+download/%{name}-%{vers… -# PATCH-FIX-UPSTREAM vala-0.36.patch avvissu(a)yandex.by -- Fix build with vala >= 0.36 -Patch0: audience-0.2.1.2-vala-0.36.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: elementary-icon-theme @@ -56,7 +54,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake \ ++++++ audience-0.2.1.2.tar.xz -> audience-0.2.2.tar.xz ++++++ ++++ 4078 lines of diff (skipped)

1 0

commit noise for openSUSE:Factory
by root＠hilbert.suse.de 02 May '17

02 May '17

Hello community, here is the log from the commit of package noise for openSUSE:Factory checked in at 2017-05-02 08:54:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/noise (Old) and /work/SRC/openSUSE:Factory/.noise.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "noise" Tue May 2 08:54:42 2017 rev:4 rq:490805 version:0.4.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/noise/noise.changes 2017-04-11 09:39:34.144495526 +0200 +++ /work/SRC/openSUSE:Factory/.noise.new/noise.changes 2017-05-02 08:54:43.711712689 +0200 @@ -1,0 +2,15 @@ +Sat Apr 22 11:28:29 UTC 2017 - avvissu(a)yandex.by + +- Update to 0.4.0.3: + * Create README.md and remove old files (#32) + * Add the release information to the AppData.xml to provide + appcenter support + * Launchpad automatic translations update. + * Fix build with vala 0.35.6 + * Fix lp#1623663 + * Update Header to correct LGPL-2+ + * For further information or changes, please contact me. + * Use the correct printf arguments +- Drop noise-0.4.0.2-vala-0.36.patch (fixed) + +------------------------------------------------------------------- Old: ---- noise-0.4.0.2-vala-0.36.patch noise-0.4.0.2.tar.xz New: ---- noise-0.4.0.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ noise.spec ++++++ --- /var/tmp/diff_new_pack.NkK4dH/_old 2017-05-02 08:54:44.439610049 +0200 +++ /var/tmp/diff_new_pack.NkK4dH/_new 2017-05-02 08:54:44.439610049 +0200 @@ -19,15 +19,13 @@ %define _version 0.4.x %define soname noise-core0 Name: noise -Version: 0.4.0.2 +Version: 0.4.0.3 Release: 0 Summary: The official Elementary music player License: GPL-3.0 Group: Productivity/Multimedia/Sound/Players Url: https://launchpad.net/noise Source: https://launchpad.net/noise/%{_version}/%{version}/+download/%{name}-%{vers… -# PATCH-FIX-UPSTREAM noise-0.4.0.2-vala-0.36.patch -- Fix build with vala >= 0.36. -Patch0: noise-0.4.0.2-vala-0.36.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -86,7 +84,7 @@ %prep %setup -q -%patch0 -p1 + sed -i 's/metainfo/appdata/' $(grep -rwl metainfo) %build @@ -116,19 +114,18 @@ %icon_theme_cache_postun %post -n lib%{soname} -p /sbin/ldconfig - %postun -n lib%{soname} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc AUTHORS COPYING NEWS README +%doc AUTHORS COPYING %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/org.pantheon.noise.desktop %dir %{_datadir}/appdata/ %{_datadir}/appdata/org.pantheon.noise.appdata.xml %{_datadir}/glib-2.0/schemas/org.pantheon.noise.gschema.xml -%{_datadir}/icons/hicolor/*/apps/*.* +%{_datadir}/icons/hicolor/*/apps/*.??g %files -n lib%{soname} %defattr (-,root,root) ++++++ noise-0.4.0.2.tar.xz -> noise-0.4.0.3.tar.xz ++++++ ++++ 480292 lines of diff (skipped)

1 0