Mailinglist Archive: opensuse-commit (750 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package patch for openSUSE:Factory
checked in at Sat Oct 3 03:35:34 CEST 2009.



--------
--- patch/patch.changes 2009-07-20 10:18:31.000000000 +0200
+++ patch/patch.changes 2009-09-07 13:44:37.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Sep  7 13:30:46 CEST 2009 - agruen@xxxxxxx
+
+- Version 2.5.9.122:
+  + Try to preserve the owning group of patched files.
+- Add --unified-reject-files backwards-compatibility patch to
+  older SUSE versions of patch.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  patch-2.5.9-120-g62d03ac.tar.bz2

New:
----
  patch-2.5.9-122-gba37782.tar.bz2
  unified-reject-files-compat.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ patch.spec ++++++
--- /var/tmp/diff_new_pack.PM19mz/_old  2009-10-03 03:35:11.000000000 +0200
+++ /var/tmp/diff_new_pack.PM19mz/_new  2009-10-03 03:35:11.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package patch (Version 2.5.9.120)
+# spec file for package patch (Version 2.5.9.122)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,16 +18,17 @@
 # norootforbuild
 
 Url:            ftp://alpha.gnu.org/gnu/diffutils/
-%define ver 2.5.9-120-g62d03ac
+%define ver 2.5.9-122-gba37782
 
 Name:           patch
 License:        GPL v3 or later
 Group:          Productivity/Text/Utilities
 AutoReqProv:    on
-Version:        2.5.9.120
+Version:        2.5.9.122
 Release:        1
 Summary:        GNU patch
 Source:         ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2
+Patch:          unified-reject-files-compat.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -43,6 +44,7 @@
 
 %prep
 %setup -n patch-%ver
+%patch -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \

++++++ unified-reject-files-compat.diff ++++++
Index: patch-2.5.9-122-gba37782/src/patch.c
===================================================================
--- patch-2.5.9-122-gba37782.orig/src/patch.c
+++ patch-2.5.9-122-gba37782/src/patch.c
@@ -572,6 +572,7 @@ static struct option const longopts[] =
   {"posix", no_argument, NULL, CHAR_MAX + 7},
   {"quoting-style", required_argument, NULL, CHAR_MAX + 8},
   {"reject-format", required_argument, NULL, CHAR_MAX + 9},
+  {"unified-reject-files", no_argument, NULL, CHAR_MAX + 1001},
   {NULL, no_argument, NULL, 0}
 };
 
@@ -841,6 +842,11 @@ get_some_switches (void)
                else
                  usage (stderr, 2);
                break;
+           case CHAR_MAX + 1001:
+               say ("warning: the `--unified-reject-files' option is obsolete; 
use "
+                    "`--reject-format=unified' instead\n");
+               reject_format = UNI_DIFF;
+               break;
            default:
                usage (stderr, 2);
        }

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx