commit html2text for openSUSE:Factory
Hello community,
here is the log from the commit of package html2text for openSUSE:Factory
checked in at 2017-04-30 21:23:32
Comparing /work/SRC/openSUSE:Factory/html2text (Old)
and /work/SRC/openSUSE:Factory/.html2text.new (New)
Package is "html2text"
Sun Apr 30 21:23:32 2017 rev:20 rq:491753 version:1.3.2a
Changes:
--- /work/SRC/openSUSE:Factory/html2text/html2text.changes 2016-05-08
10:45:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.html2text.new/html2text.changes 2017-04-30
21:23:47.241634734 +0200
@@ -1,0 +2,6 @@
+Thu Apr 27 16:32:45 UTC 2017 - toddrme2...@gmail.com
+
+- Implement update-alternatives to avoid conflict with
+ python3-html2text.
+
+---
Other differences:
--
++ html2text.spec ++
--- /var/tmp/diff_new_pack.ZQxZTr/_old 2017-04-30 21:23:47.981530410 +0200
+++ /var/tmp/diff_new_pack.ZQxZTr/_new 2017-04-30 21:23:47.985529846 +0200
@@ -38,6 +38,8 @@
Patch8:
http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
Patch9: html2text-debian-810_fix_deprecated_conversion_warnings.patch
BuildRequires: gcc-c++
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -63,15 +65,32 @@
make %{?_smp_mflags} EXPLICIT="%{optflags}"
%install
-install -D -m 0755 html2text%{buildroot}%{_bindir}/html2text
-install -D -m 0644 html2text.1.gz %{buildroot}%{_mandir}/man1/html2text.1.gz
+# To avoid conflicts with the python3-html2text package
+install -D -m 0755 html2text%{buildroot}%{_bindir}/html2text-cpp
+install -D -m 0644 html2text.1.gz
%{buildroot}%{_mandir}/man1/html2text-cpp.1.gz
install -D -m 0644 html2textrc.5.gz
%{buildroot}%{_mandir}/man5/html2textrc.5.gz
+ln -s -f %{_sysconfdir}/alternatives/html2text %{buildroot}%{_bindir}/html2text
+ln -s -f %{_sysconfdir}/alternatives/html2text.1.gz
%{buildroot}%{_mandir}/man1/html2text.1.gz
+
+%post
+update-alternatives --install %{_bindir}/html2text html2text
%{_bindir}/html2text-cpp 30 \
+--slave %{_mandir}/man1/html2text.1.gz html2text.1.gz
%{_mandir}/man1/html2text-cpp.1.gz
+
+%preun
+if [ ! -f %{_bindir}/html2text-cpp ] ; then
+ update-alternatives --remove html2text %{_bindir}/html2text-cpp
+fi
+
%files
%defattr(-,root,root)
%doc README CHANGES COPYING TODO CREDITS KNOWN_BUGS RELEASE_NOTES
%{_bindir}/html2text
+%{_bindir}/html2text-cpp
+%ghost %{_sysconfdir}/alternatives/html2text
%{_mandir}/man1/html2text.1.gz
+%{_mandir}/man1/html2text-cpp.1.gz
+%ghost %{_sysconfdir}/alternatives/html2text.1.gz
%{_mandir}/man5/html2textrc.5.gz
%changelog
commit html2text for openSUSE:Factory
Hello community,
here is the log from the commit of package html2text for openSUSE:Factory
checked in at 2016-05-08 10:45:17
Comparing /work/SRC/openSUSE:Factory/html2text (Old)
and /work/SRC/openSUSE:Factory/.html2text.new (New)
Package is "html2text"
Changes:
--- /work/SRC/openSUSE:Factory/html2text/html2text.changes 2014-10-09
12:52:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.html2text.new/html2text.changes 2016-05-08
10:45:29.0 +0200
@@ -1,0 +2,10 @@
+Mon Mar 21 08:44:13 UTC 2016 - mplus...@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Use macro for configure
+- Do not ship INSTALL
+- Remove useless provides/obsoletes
+- Add gpg signature
+- Use url for source
+
+---
Old:
html2text-1.3.2a.tar.bz2
New:
html2text-1.3.2a.tar.gz
html2text-1.3.2a.tar.gz.asc
html2text.keyring
Other differences:
--
++ html2text.spec ++
--- /var/tmp/diff_new_pack.P3Xclk/_old 2016-05-08 10:45:30.0 +0200
+++ /var/tmp/diff_new_pack.P3Xclk/_new 2016-05-08 10:45:30.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package html2text
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -23,8 +23,10 @@
License:GPL-2.0+
Group: Productivity/Publishing/HTML/Tools
Url:http://www.mbayer.de/html2text/
-Source: html2text-%{version}.tar.bz2
-Source1:html2text.1.gz
+Source0:
http://www.mbayer.de/html2text/downloads/html2text-%{version}.tar.gz
+Source1:http://www.mbayer.de/html2text/html2text-%{version}.tar.gz.asc
+Source2:%{name}.keyring
+Source3:html2text.1.gz
Patch0: html2text-debian-200_close_files_inside_main_loop.patch
Patch1: html2text-debian-220_nobs_when_stdout_is_a_tty.patch
Patch2: html2text-1.3.2a-400_remove_builtin_http_support.patch
@@ -35,25 +37,15 @@
Patch7: html2text-debian-630_recode_output_to_locale_charset.patch
Patch8:
http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
Patch9: html2text-debian-810_fix_deprecated_conversion_warnings.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
-Provides: html2txt
-Obsoletes: html2txt
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A tool for converting from HTML to ASCII. It can reasonably handle
tables.
-
-
-Authors:
-
-Arno Unkrig
-Martin Bayer
-Eugene V. Lyubimkin
-
%prep
-%setup
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -64,24 +56,22 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-cp -a %{SOURCE1} .
+cp -a %{SOURCE3} .
%build
-./configure --prefix=/usr --mandir=%{_mandir}
-make %{?_smp_mflags} EXPLICIT="${RPM_OPT_FLAGS}"
+%configure
+make %{?_smp_mflags} EXPLICIT="%{optflags}"
%install
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5}
-install -m 755 html2text $RPM_BUILD_ROOT/usr/bin
-install -m 644 html2text.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 html2textrc.5.gz $RPM_BUILD_ROOT%{_mandir}/man5
+install -D -m 0755 html2text%{buildroot}%{_bindir}/html2text
+install -D -m 0644 html2text.1.gz %{buildroot}%{_mandir}/man1/html2text.1.gz
+install -D -m 0644 html2textrc.5.gz
%{buildroot}%{_mandir}/man5/html2textrc.5.gz
%files
%defattr(-,root,root)
-%doc INSTALL README CHANGES COPYING TODO CREDITS KNOWN_BUGS RELEASE_NOTES
-/usr/bin/html2text
-%doc %{_mandir}/man1/html2text.1.gz
-%doc %{_mandir}/man5/html2textrc.5.gz
+%doc README CHANGES COPYING TODO CREDITS KNOWN_BUGS RELEASE_NOTES
+%{_bindir}/html2text
+%{_mandir}/man1/html2text.1.gz
+%{_mandir}/man5/html2textrc.5.gz
%changelog
++ html2text-1.3.2a.tar.gz.asc ++
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.2 (GNU/Linux)
iD8DBQBABVtNQabrkMtTe2ARAmkFAKCgs7ae0MxWNtO5ljtJhXqrwOxcogCgzUhy
gNsKOrWhhmzcL7qy/pQIZo4=
=9bEU
-END PGP SIGNATURE-
++ html2text.keyring ++
2961 lines (skipped)
commit html2text for openSUSE:Factory
Hello community,
here is the log from the commit of package html2text for openSUSE:Factory
checked in at 2014-10-09 12:52:26
Comparing /work/SRC/openSUSE:Factory/html2text (Old)
and /work/SRC/openSUSE:Factory/.html2text.new (New)
Package is "html2text"
Changes:
--- /work/SRC/openSUSE:Factory/html2text/html2text.changes 2011-09-23
02:02:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.html2text.new/html2text.changes 2014-10-09
12:52:46.0 +0200
@@ -1,0 +2,5 @@
+Wed Oct 8 11:48:09 UTC 2014 - jeng...@inai.de
+
+- Remove old/implicit specfile tags (AutoReqProv, norootforbuild)
+
+---
Other differences:
--
++ html2text.spec ++
--- /var/tmp/diff_new_pack.rL8u1G/_old 2014-10-09 12:52:47.0 +0200
+++ /var/tmp/diff_new_pack.rL8u1G/_new 2014-10-09 12:52:47.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package html2text (Version 1.3.2a)
+# spec file for package html2text
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: html2text
-BuildRequires: gcc-c++
-Url:http://www.mbayer.de/html2text/
-License:GPL-2.0+
-Group: Productivity/Publishing/HTML/Tools
-Provides: html2txt
-Obsoletes: html2txt
-AutoReqProv:on
Version:1.3.2a
-Release:142
+Release:0
Summary:HTML to ASCII Converter
+License:GPL-2.0+
+Group: Productivity/Publishing/HTML/Tools
+Url:http://www.mbayer.de/html2text/
Source: html2text-%{version}.tar.bz2
Source1:html2text.1.gz
Patch0: html2text-debian-200_close_files_inside_main_loop.patch
@@ -42,6 +36,9 @@
Patch8:
http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
Patch9: html2text-debian-810_fix_deprecated_conversion_warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: gcc-c++
+Provides: html2txt
+Obsoletes: html2txt
%description
A tool for converting from HTML to ASCII. It can reasonably handle
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit html2text for openSUSE:Factory
Hello community, here is the log from the commit of package html2text for openSUSE:Factory checked in at 2011-12-06 18:18:27 Comparing /work/SRC/openSUSE:Factory/html2text (Old) and /work/SRC/openSUSE:Factory/.html2text.new (New) Package is "html2text", Maintainer is "wer...@suse.com" Changes: Other differences: -- ++ html2text.spec ++ --- /var/tmp/diff_new_pack.JxBIg0/_old 2011-12-06 18:32:12.0 +0100 +++ /var/tmp/diff_new_pack.JxBIg0/_new 2011-12-06 18:32:12.0 +0100 @@ -21,7 +21,7 @@ Name: html2text BuildRequires: gcc-c++ Url:http://www.mbayer.de/html2text/ -License:GPLv2+ +License:GPL-2.0+ Group: Productivity/Publishing/HTML/Tools Provides: html2txt Obsoletes: html2txt -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
