Hello community,
here is the log from the commit of package ispell for openSUSE:Factory checked
in at 2013-12-11 11:28:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ispell (Old)
and /work/SRC/openSUSE:Factory/.ispell.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ispell"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ispell/ispell.changes 2012-06-26
16:03:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ispell.new/ispell.changes 2013-12-11
11:28:33.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Dec 9 12:07:36 UTC 2013 - wer...@suse.de
+
+- Remove mixed patch leftover
+
+-------------------------------------------------------------------
+Fri Dec 6 13:09:04 UTC 2013 - wer...@suse.de
+
+- Hint from Björn Jacke that old style sort is broken, therefore
+ enforce usage of modern sort options
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ispell.spec ++++++
--- /var/tmp/diff_new_pack.YjCv85/_old 2013-12-11 11:28:34.000000000 +0100
+++ /var/tmp/diff_new_pack.YjCv85/_new 2013-12-11 11:28:34.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ispell
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
++++++ ispell-3.3.02.dif ++++++
--- /var/tmp/diff_new_pack.YjCv85/_old 2013-12-11 11:28:34.000000000 +0100
+++ /var/tmp/diff_new_pack.YjCv85/_new 2013-12-11 11:28:34.000000000 +0100
@@ -1,5 +1,5 @@
--- .pkgextract
-+++ .pkgextract 2004-12-21 16:18:58.000000000 +0100
++++ .pkgextract 2004-12-21 15:18:58.000000000 +0000
@@ -0,0 +1,9 @@
+patch -p0 -s --backup --suffix=.config < ../ispell-3.3.02-config.patch
+patch -p0 -s --backup --suffix=.suse < ../ispell-3.2.06-suse.patch
@@ -11,7 +11,7 @@
+patch -p0 -s --backup --suffix=.mkdir < ../ispell-3.3.02-mkdir.patch
+patch -p0 -s --backup --suffix=.strip < ../ispell-3.3.02-strip.patch
--- buildhash.c
-+++ buildhash.c 2004-12-21 16:46:20.000000000 +0100
++++ buildhash.c 2004-12-21 15:46:20.000000000 +0000
@@ -112,6 +112,7 @@ static char Rcs_Id[] =
#include "version.h"
#include <ctype.h>
@@ -31,7 +31,7 @@
{
argc--;
--- defmt.c
-+++ defmt.c 2004-12-21 16:18:58.000000000 +0100
++++ defmt.c 2004-12-21 15:18:58.000000000 +0000
@@ -686,6 +686,14 @@ void checkline (ofile)
p = ctoken;
@@ -48,7 +48,7 @@
*p++ = *currentchar++;
*p = 0;
--- fields.c
-+++ fields.c 2004-12-21 16:31:41.000000000 +0100
++++ fields.c 2004-12-21 15:31:41.000000000 +0000
@@ -112,6 +112,7 @@ field_t * fieldread (file, delims, flags
if (linesize == 0)
{
@@ -74,7 +74,7 @@
+ fieldp = NULL;
}
--- icombine.c
-+++ icombine.c 2007-05-31 16:47:19.557830000 +0200
++++ icombine.c 2007-05-31 14:47:20.000000000 +0000
@@ -89,6 +89,7 @@ static char Rcs_Id[] =
#include "ispell.h"
#include "proto.h"
@@ -94,7 +94,7 @@
{
argc--;
--- ijoin.c
-+++ ijoin.c 2004-12-21 16:46:28.000000000 +0100
++++ ijoin.c 2004-12-21 15:46:28.000000000 +0000
@@ -119,6 +119,7 @@ static char Rcs_Id[] =
#include "ispell.h"
#include "proto.h"
@@ -114,7 +114,7 @@
{
argc--;
--- ispell.c
-+++ ispell.c 2004-12-21 16:46:32.000000000 +0100
++++ ispell.c 2007-05-31 15:56:56.000000000 +0000
@@ -236,6 +236,7 @@ static char Rcs_Id[] =
#include <fcntl.h>
#endif /* NO_FCNTL_H */
@@ -133,8 +133,25 @@
p = getenv (LIBRARYVAR);
if (p == NULL)
(void) strcpy (libdir, LIBDIR);
+--- languages/english/msgs.h
++++ languages/english/msgs.h 2007-05-31 17:05:33.000000000 +0000
+@@ -182,10 +182,10 @@
+ #define CORR_C_HELP_4 "next to each one. You have the option of
replacing the word%s\n"
+ #define CORR_C_HELP_5 "completely, or choosing one of the suggested
words.%s\n"
+ /* You may add HELP_6 through HELP_9 if your language needs more lines */
+-#define CORR_C_HELP_6 ""
+-#define CORR_C_HELP_7 ""
+-#define CORR_C_HELP_8 ""
+-#define CORR_C_HELP_9 ""
++#define CORR_C_HELP_6 "%s"
++#define CORR_C_HELP_7 "%s"
++#define CORR_C_HELP_8 "%s"
++#define CORR_C_HELP_9 "%s"
+ #define CORR_C_HELP_COMMANDS "%s\nCommands are:%s\n%s\n"
+ #define CORR_C_HELP_R_CMD "R Replace the misspelled word
completely.%s\n"
+ #define CORR_C_HELP_BLANK "Space Accept the word this time only.%s\n"
--- munchlist.X
-+++ munchlist.X 2007-05-31 16:53:52.551491000 +0200
++++ munchlist.X 2013-12-06 13:08:15.718454418 +0000
@@ -191,7 +191,7 @@ then
echo "munchlist $*" 1>&2
set -vx
@@ -144,7 +161,26 @@
DBDIR=${MUNCHDEBUGDIR-$MAILDEBUGDIR}
-@@ -278,20 +278,20 @@ fi
+@@ -267,31 +267,33 @@ fi
+ # But that doesn't excuse breaking compatibility.)
+ #
+ # Detect whether sort accepts old-style switches.
+-if sort +0 -1 /dev/null >/dev/null 2>&1
+-then
+- CRETIN_SORT=false
+-else
+- CRETIN_SORT=true
+-fi
++##if sort +0 -1 /dev/null >/dev/null 2>&1
++##then
++## CRETIN_SORT=false
++##else
++## CRETIN_SORT=true
++##fi
++CRETIN_SORT=true
++set -e
+
+ #
# The following is necessary so that some internationalized versions of
# sort(1) don't confuse things by sorting into a nonstandard order.
#
@@ -174,20 +210,3 @@
export LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
debug=no
---- languages/english/msgs.h
-+++ languages/english/msgs.h 2007-05-31 19:05:33.090884439 +0200
-@@ -182,10 +182,10 @@
- #define CORR_C_HELP_4 "next to each one. You have the option of
replacing the word%s\n"
- #define CORR_C_HELP_5 "completely, or choosing one of the suggested
words.%s\n"
- /* You may add HELP_6 through HELP_9 if your language needs more lines */
--#define CORR_C_HELP_6 ""
--#define CORR_C_HELP_7 ""
--#define CORR_C_HELP_8 ""
--#define CORR_C_HELP_9 ""
-+#define CORR_C_HELP_6 "%s"
-+#define CORR_C_HELP_7 "%s"
-+#define CORR_C_HELP_8 "%s"
-+#define CORR_C_HELP_9 "%s"
- #define CORR_C_HELP_COMMANDS "%s\nCommands are:%s\n%s\n"
- #define CORR_C_HELP_R_CMD "R Replace the misspelled word
completely.%s\n"
- #define CORR_C_HELP_BLANK "Space Accept the word this time only.%s\n"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
