Mailinglist Archive: opensuse-commit (1124 mails)
| < Previous | Next > |
commit html2text
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 03 Apr 2007 21:29:52 +0200
- Message-id: <20070403192952.8E466678179@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package html2text
checked in at Tue Apr 3 21:29:52 CEST 2007.
--------
--- html2text/html2text.changes 2007-02-06 17:41:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/html2text/html2text.changes 2007-04-03 20:24:23.565410000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 3 20:23:57 CEST 2007 - kssingvo@xxxxxxx
+
+- using now upstream patch for 64bit
+- added upstream utf-8 patch
+
+-------------------------------------------------------------------
Old:
----
html2text-1.3.2a-64bit.patch
New:
----
patch-amd64-html2text-1.3.2a.diff
patch-utf8-html2text-1.3.2a.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ html2text.spec ++++++
--- /var/tmp/diff_new_pack.MA8057/_old 2007-04-03 21:29:35.000000000 +0200
+++ /var/tmp/diff_new_pack.MA8057/_new 2007-04-03 21:29:35.000000000 +0200
@@ -12,17 +12,18 @@
Name: html2text
BuildRequires: gcc-c++
-URL: http://userpage.fu-berlin.de/~mbayer/tools/html2text.html
+URL: http://www.mbayer.de/html2text/
License: GNU General Public License (GPL)
Group: Productivity/Publishing/HTML/Tools
Provides: html2txt
Obsoletes: html2txt
Autoreqprov: on
Version: 1.3.2a
-Release: 38
+Release: 46
Summary: HTML to ASCII Converter
Source: html2text-%{version}.tar.bz2
-Patch0: html2text-1.3.2a-64bit.patch
+Patch0: http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
+Patch1: http://www.mbayer.de/html2text/downloads/patch-utf8-html2text-1.3.2a.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -39,6 +40,7 @@
%prep
%setup
%patch0 -p1
+%patch1 -p1
%build
./configure --prefix=/usr --mandir=%{_mandir}
@@ -58,7 +60,10 @@
%doc %{_mandir}/man1/html2text.1.gz
%doc %{_mandir}/man5/html2textrc.5.gz
-%changelog -n html2text
+%changelog
+* Tue Apr 03 2007 - kssingvo@xxxxxxx
+- using now upstream patch for 64bit
+- added upstream utf-8 patch
* Tue Feb 06 2007 - kssingvo@xxxxxxx
- fixed 64bit pointer issue (bugzilla#242105)
* Wed Jan 25 2006 - mls@xxxxxxx
++++++ patch-amd64-html2text-1.3.2a.diff ++++++
diff -ur html2text-1.3.2a/format.C html2text-1.3.2a-fixed/format.C
--- html2text-1.3.2a/format.C 2003-11-23 03:05:29.000000000 -0800
+++ html2text-1.3.2a-fixed/format.C 2005-04-27 11:47:06.023515000 -0700
@@ -560,7 +560,7 @@
"LEFT", Area::LEFT,
"CENTER", Area::CENTER,
"RIGHT", Area::RIGHT,
- 0
+ NULL
);
static char cell_attributes[7];
@@ -682,7 +682,7 @@
"LEFT", Area::LEFT,
"CENTER", Area::CENTER,
"RIGHT", Area::RIGHT,
- 0
+ NULL
);
static BlockFormat bf("P");
@@ -752,7 +752,7 @@
"LEFT", Area::LEFT,
"MIDDLE", Area::CENTER,
"RIGHT", Area::RIGHT,
- 0
+ NULL
);
Area *a = ::format(content.get(), w, halign);
if (a) return a;
@@ -802,7 +802,7 @@
"LEFT", Area::LEFT,
"CENTER", Area::CENTER,
"RIGHT", Area::RIGHT,
- 0
+ NULL
));
}
@@ -1632,7 +1632,7 @@
"A", UPPER_ALPHA,
"i", LOWER_ROMAN,
"I", UPPER_ROMAN,
- 0
+ NULL
);
}
diff -ur html2text-1.3.2a/table.C html2text-1.3.2a-fixed/table.C
--- html2text-1.3.2a/table.C 2002-07-22 04:32:50.000000000 -0700
+++ html2text-1.3.2a-fixed/table.C 2005-04-27 11:48:03.336833000 -0700
@@ -122,14 +122,14 @@
"LEFT", Area::LEFT,
"CENTER", Area::CENTER,
"RIGHT", Area::RIGHT,
- 0
+ NULL
);
int row_valign = get_attribute(
row.attributes.get(), "VALIGN", Area::MIDDLE,
"TOP", Area::LEFT,
"MIDDLE", Area::MIDDLE,
"BOTTOM", Area::BOTTOM,
- 0
+ NULL
);
const list<auto_ptr<TableCell> > &cl(*row.cells);
@@ -158,14 +158,14 @@
"LEFT", Area::LEFT,
"CENTER", Area::CENTER,
"RIGHT", Area::RIGHT,
- 0
+ NULL
);
p->valign = get_attribute(
cell.attributes.get(), "VALIGN", row_valign,
"TOP", Area::TOP,
"MIDDLE", Area::MIDDLE,
"BOTTOM", Area::BOTTOM,
- 0
+ NULL
);
{
auto_ptr<Area> tmp(cell.format(
@@ -386,7 +386,7 @@
"LEFT", Area::LEFT,
"CENTER", Area::CENTER,
"RIGHT", Area::RIGHT,
- 0
+ NULL
);
// <TABLE> => default => no border
++++++ patch-utf8-html2text-1.3.2a.diff ++++++
++++ 706 lines (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |