commit htdig for openSUSE:Factory
Hello community,
here is the log from the commit of package htdig for openSUSE:Factory checked
in at 2017-05-27 13:06:33
Comparing /work/SRC/openSUSE:Factory/htdig (Old)
and /work/SRC/openSUSE:Factory/.htdig.new (New)
Package is "htdig"
Sat May 27 13:06:33 2017 rev:23 rq:493636 version:3.2.0b6
Changes:
--- /work/SRC/openSUSE:Factory/htdig/htdig.changes 2016-06-03
16:36:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.htdig.new/htdig.changes 2017-05-27
13:08:12.533657541 +0200
@@ -1,0 +2,5 @@
+Tue Apr 4 16:38:08 UTC 2017 - crrodrig...@opensuse.org
+
+- htdig-gcc7.patch: FIx build failure with gcc7
+
+---
New:
htdig-gcc7.patch
Other differences:
--
++ htdig.spec ++
--- /var/tmp/diff_new_pack.7feG3M/_old 2017-05-27 13:08:13.209561977 +0200
+++ /var/tmp/diff_new_pack.7feG3M/_new 2017-05-27 13:08:13.213561412 +0200
@@ -1,7 +1,7 @@
#
# spec file for package htdig
#
-# 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
@@ -40,6 +40,7 @@
Patch15:%{name}-gmtime-lastday.patch
# PATCH-FIX-UPSTREAM htdig-unsigned-char.patch dims...@opensuse.org -- use
unsigned char to be sure we can store values up to (int)255
Patch16:%{name}-unsigned-char.patch
+Patch17:htdig-gcc7.patch
BuildRequires: apache2-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -112,7 +113,7 @@
%patch14 -p1
%patch15
%patch16 -p1
-
+%patch17 -p1
%build
%{?suse_update_config:%{suse_update_config -f db/dist}}
pushd contrib 1>/dev/null
++ htdig-gcc7.patch ++
Index: htdig-3.2.0b6/htdig/Parsable.cc
===
--- htdig-3.2.0b6.orig/htdig/Parsable.cc
+++ htdig-3.2.0b6/htdig/Parsable.cc
@@ -74,7 +74,7 @@ Parsable::addString(Retriever& retriever
retriever.got_word(w, wordindex++, slot); // slot for img_alt
w = HtWordToken(0);
}
-w = '\0';
+w = NULL;
}
//*
@@ -92,5 +92,5 @@ Parsable::addKeywordString(Retriever& re
retriever.got_word(w, wordindex++, 9);
w = HtWordToken(0);
}
-w = '\0';
+w = NULL;
}
commit htdig for openSUSE:Factory
Hello community,
here is the log from the commit of package htdig for openSUSE:Factory checked
in at 2016-06-03 16:36:53
Comparing /work/SRC/openSUSE:Factory/htdig (Old)
and /work/SRC/openSUSE:Factory/.htdig.new (New)
Package is "htdig"
Changes:
--- /work/SRC/openSUSE:Factory/htdig/htdig.changes 2015-04-27
22:07:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.htdig.new/htdig.changes 2016-06-03
16:36:55.0 +0200
@@ -1,0 +2,6 @@
+Tue May 24 14:52:27 UTC 2016 - dims...@opensuse.org
+
+- Add htdig-unsigned-char.patch: use unsigned char to be sure we
+ can store values up to (int)255.
+
+---
New:
htdig-unsigned-char.patch
Other differences:
--
++ htdig.spec ++
--- /var/tmp/diff_new_pack.IVKe32/_old 2016-06-03 16:36:56.0 +0200
+++ /var/tmp/diff_new_pack.IVKe32/_new 2016-06-03 16:36:56.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package htdig
#
-# Copyright (c) 2015 SUSE LINUX 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
@@ -38,6 +38,8 @@
Patch14:%{name}-quoting.patch
# PATCH-FIX-UPSTREAM gmtime-lastday.patch use INT32_MAX to define last day
(bnc##231196), related to (bnc#343913)
Patch15:%{name}-gmtime-lastday.patch
+# PATCH-FIX-UPSTREAM htdig-unsigned-char.patch dims...@opensuse.org -- use
unsigned char to be sure we can store values up to (int)255
+Patch16:%{name}-unsigned-char.patch
BuildRequires: apache2-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -109,6 +111,7 @@
%patch11
%patch14 -p1
%patch15
+%patch16 -p1
%build
%{?suse_update_config:%{suse_update_config -f db/dist}}
++ htdig-unsigned-char.patch ++
From: Dominique Leuenberger
USe unsigned char in order to ensure we can store values up to (int)255
Fixes build with gcc 6, which failed with:
[ 300s] Accents.cc:78:42: error: narrowing conversion of '128' from 'int' to
'char' inside { } [-Wnarrowing]
[ 300s] 'o', 'u', 'u', 'u', 'u', 'y', 254, 255};
Index: htdig-3.2.0b6/htfuzzy/Accents.cc
===
--- htdig-3.2.0b6.orig/htfuzzy/Accents.cc
+++ htdig-3.2.0b6/htfuzzy/Accents.cc
@@ -43,7 +43,7 @@ extern int debug;
| table iso-latin1 "minusculisee" et "de-accentuee" |
`--*/
-static char MinusculeISOLAT1[256] = {
+static unsigned char MinusculeISOLAT1[256] = {
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23,
commit htdig for openSUSE:Factory
Hello community,
here is the log from the commit of package htdig for openSUSE:Factory checked
in at 2015-04-27 22:07:22
Comparing /work/SRC/openSUSE:Factory/htdig (Old)
and /work/SRC/openSUSE:Factory/.htdig.new (New)
Package is htdig
Changes:
--- /work/SRC/openSUSE:Factory/htdig/htdig.changes 2011-10-16
12:50:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.htdig.new/htdig.changes 2015-04-27
22:07:24.0 +0200
@@ -1,0 +2,8 @@
+Tue Apr 21 12:44:10 UTC 2015 - mplus...@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Update dependencies
+- Update category for devel package
+- rename htdig-README.SuSE to htdig-README.SUSE
+
+---
Old:
htdig-README.SuSE
New:
htdig-README.SUSE
Other differences:
--
++ htdig.spec ++
--- /var/tmp/diff_new_pack.7G38s6/_old 2015-04-27 22:07:25.0 +0200
+++ /var/tmp/diff_new_pack.7G38s6/_new 2015-04-27 22:07:25.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package htdig
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -15,22 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
+%define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2/dev/null ||
%{_sbindir}/apxs2 -q PREFIX)
Name: htdig
-BuildRequires: apache2-devel gcc-c++ libapr-util1-devel libopenssl-devel
pcre-devel postfix zlib-devel
-BuildRequires: libtool
-%define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2/dev/null ||
/usr/sbin/apxs2 -q PREFIX)
-Url:http://www.htdig.org
-License:GPL-2.0+
-Group: Productivity/Networking/Web/Utilities
-AutoReqProv:on
Version:3.2.0b6
-Release:217
+Release:0
Summary:WWW Index and Search System
+License:GPL-2.0+
+Group: Productivity/Networking/Web/Utilities
+Url:http://www.htdig.org
Source:
http://switch.dl.sourceforge.net/sourceforge/htdig/htdig-%{version}.tar.bz2
-Source1:%{name}-README.SuSE
+Source1:%{name}-README.SUSE
Patch1: %{name}-google-style.patch
Patch2: %{name}-rundig.patch
Patch3: %{name}-ExternalParser-typo.patch
@@ -43,6 +38,17 @@
Patch14:%{name}-quoting.patch
# PATCH-FIX-UPSTREAM gmtime-lastday.patch use INT32_MAX to define last day
(bnc##231196), related to (bnc#343913)
Patch15:%{name}-gmtime-lastday.patch
+BuildRequires: apache2-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gcc-c++
+BuildRequires: libapr-util1-devel
+BuildRequires: libopenssl-devel
+BuildRequires: libtool
+BuildRequires: pcre-devel
+BuildRequires: postfix
+BuildRequires: rrdtool
+BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -57,18 +63,9 @@
span several Web servers at a site. The type of these Web servers does
not matter as long as they understand the HTTP 1.0 protocol.
-
-
-Authors:
-
-Andrew Scherpbier and...@contigo.com
-Gabriele Bartolini bartol...@infomedia.it
-Lachlan Andrew l...@users.sourceforge.net
-
%package devel
-License:GPL-2.0+
Summary:Development files for htdig
-Group: Productivity/Networking/Web/Utilities
+Group: Development/Languages/C and C++
Requires: %{name} = %{version}
%description devel
@@ -82,16 +79,7 @@
This package is needed if you want to develop other applications on
htdig.
-
-
-Authors:
-
-Andrew Scherpbier and...@contigo.com
-Gabriele Bartolini bartol...@infomedia.it
-Lachlan Andrew l...@users.sourceforge.net
-
%package doc
-License:GPL-2.0+
Summary:WWW Index and Search System Documentation
Group: Productivity/Networking/Web/Utilities
Requires: %{name} = %{version}
@@ -105,19 +93,11 @@
subsection of a Web site.
This package provides additional documentation for htdig in
-/usr/share/doc/packages/htdig/
-
-
-
-Authors:
-
-Andrew Scherpbier and...@contigo.com
-Gabriele Bartolini bartol...@infomedia.it
-Lachlan Andrew l...@users.sourceforge.net
+%{_docdir}/htdig/
%prep
%setup -q
-cp %{S:1} README.SuSE
+cp %{SOURCE1} README.SUSE
%patch1
%patch2
%patch3
@@ -133,14 +113,14 @@
%build
%{?suse_update_config:%{suse_update_config -f db/dist}}
pushd contrib 1/dev/null
-find . -type f | xargs -n 1 sed -i s@/usr/local/bin/perl@/usr/bin/perl@
+find . -type f | xargs -n 1 sed -i
commit htdig for openSUSE:Factory
Hello community,
here is the log from the commit of package htdig for openSUSE:Factory checked
in at 2011-12-06 18:18:25
Comparing /work/SRC/openSUSE:Factory/htdig (Old)
and /work/SRC/openSUSE:Factory/.htdig.new (New)
Package is htdig, Maintainer is mvysko...@suse.com
Changes:
Other differences:
--
++ htdig.spec ++
--- /var/tmp/diff_new_pack.TfK4WP/_old 2011-12-06 18:28:43.0 +0100
+++ /var/tmp/diff_new_pack.TfK4WP/_new 2011-12-06 18:28:43.0 +0100
@@ -23,7 +23,7 @@
BuildRequires: libtool
%define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2/dev/null ||
/usr/sbin/apxs2 -q PREFIX)
Url:http://www.htdig.org
-License:GPL v2 or later
+License:GPL-2.0+
Group: Productivity/Networking/Web/Utilities
AutoReqProv:on
Version:3.2.0b6
@@ -66,7 +66,7 @@
Lachlan Andrew l...@users.sourceforge.net
%package devel
-License:GPL v2 or later
+License:GPL-2.0+
Summary:Development files for htdig
Group: Productivity/Networking/Web/Utilities
Requires: %{name} = %{version}
@@ -91,7 +91,7 @@
Lachlan Andrew l...@users.sourceforge.net
%package doc
-License:GPL v2 or later
+License:GPL-2.0+
Summary:WWW Index and Search System Documentation
Group: Productivity/Networking/Web/Utilities
Requires: %{name} = %{version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit htdig for openSUSE:Factory
Hello community, here is the log from the commit of package htdig for openSUSE:Factory checked in at Sun Oct 16 12:49:26 CEST 2011. --- openSUSE:Factory/htdig/htdig.changes2011-09-23 02:02:59.0 +0200 +++ /mounts/work_src_done/STABLE/htdig/htdig.changes2011-10-15 06:51:05.0 +0200 @@ -1,0 +2,5 @@ +Sat Oct 15 04:47:05 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to make the spec file more reliable + +--- calling whatdependson for head-i586 Other differences: -- ++ htdig.spec ++ --- /var/tmp/diff_new_pack.47tokq/_old 2011-10-16 12:49:20.0 +0200 +++ /var/tmp/diff_new_pack.47tokq/_new 2011-10-16 12:49:20.0 +0200 @@ -1,7 +1,7 @@ # -# spec file for package htdig (Version 3.2.0b6) +# spec file for package htdig # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -20,6 +20,7 @@ Name: htdig BuildRequires: apache2-devel gcc-c++ libapr-util1-devel libopenssl-devel pcre-devel postfix zlib-devel +BuildRequires: libtool %define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2/dev/null || /usr/sbin/apxs2 -q PREFIX) Url:http://www.htdig.org License:GPL v2 or later continue with q... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
