[Comm] не применяется патч при сборке пакета

Denis Nazarov =?iso-8859-1?q?marsden_=CE=C1_mail=2Eru?=
Вс Мар 15 00:29:05 MSK 2009


пытаюсь собрать пакет со своим патчем, получаю отлуп

[denis на buka RPM]$ rpm -ba --target i586 SPECS/rdesktop.spec
Платформы для сборки: i586
Сборка для платформы i586
Выполняется(%prep): /bin/sh -e /home/denis/tmp/rpm-tmp.42618
+ umask 022
+ /bin/mkdir -p /home/denis/RPM/BUILD
+ cd /home/denis/RPM/BUILD
+ cd /home/denis/RPM/BUILD
+ rm -rf rdesktop-1.6.0
+ echo 'Source #0 (rdesktop-1.6.0.tar.gz):'
Source #0 (rdesktop-1.6.0.tar.gz):
+ /bin/gzip -dc /home/denis/RPM/SOURCES/rdesktop-1.6.0.tar.gz
+ /bin/tar -xf -
+ cd rdesktop-1.6.0
+ /bin/chmod -c -Rf u+rwX,go-w .
+ echo 'Patch #1 (rdesktop-cvs-alt-raw-v2.patch):'
Patch #1 (rdesktop-cvs-alt-raw-v2.patch):
+ /usr/bin/patch -p1
patching file rdesktop.c
Hunk #4 succeeded at 785 (offset 1 line).
patching file scancodes.h
patching file xkeymap.c
Hunk #2 succeeded at 944 (offset -6 lines).
Hunk #3 succeeded at 1030 (offset -6 lines).
patching file xwin.c
Hunk #1 succeeded at 29 (offset 1 line).
Hunk #2 succeeded at 46 (offset 1 line).
Hunk #3 succeeded at 139 (offset 9 lines).
Hunk #4 succeeded at 2272 (offset 314 lines).
Hunk #5 succeeded at 2298 (offset 314 lines).
Hunk #6 succeeded at 2351 (offset 322 lines).
Hunk #7 succeeded at 2372 (offset 322 lines).
+ echo 'Patch #2 (rdesktop-alt-man.patch):'
Patch #2 (rdesktop-alt-man.patch):
+ /usr/bin/patch -p1
patching file doc/rdesktop.1
+ echo 'Patch #3 (rdesktop.long.names.on.redirect.drives.patch):'
Patch #3 (rdesktop.long.names.on.redirect.drives.patch):
+ /usr/bin/patch -p1
patching file disk.c
+ echo 'Patch #4 (rdesktop-ctrl-alt-enter-minimize.patch):'
Patch #4 (rdesktop-ctrl-alt-enter-minimize.patch):
+ /usr/bin/patch -p1
patching file rdesktop.c
Hunk #1 succeeded at 81 with fuzz 2.
Hunk #2 FAILED at 571.
1 out of 2 hunks FAILED -- saving rejects to file rdesktop.c.rej
ошибка: Неверный код возврата из /home/denis/tmp/rpm-tmp.42618 (%prep)


Ошибки сборки пакетов:
    Неверный код возврата из /home/denis/tmp/rpm-tmp.42618 (%prep)

сам патч #4 вроде как правильный

diff -urN rdesktop.orig/rdesktop.c rdesktop/rdesktop.c
--- rdesktop.orig/rdesktop.c      2009-03-15 01:58:48 +0200
+++ rdesktop/rdesktop.c   2009-03-15 02:00:21 +0300
@@ -81,6 +81,7 @@
 RD_BOOL g_desktop_save = True; /* desktop save order */
 RD_BOOL g_polygon_ellipse_orders = True;       /* polygon / ellipse orders 
*/
 RD_BOOL g_fullscreen = False;
+RD_BOOL g_isfullscreen = False;
 RD_BOOL g_grab_keyboard = True;
 RD_BOOL g_hide_decorations = False;
 RD_BOOL g_use_rdp5 = True;
@@ -570,6 +571,7 @@

                        case 'f':
                                g_fullscreen = True;
+                              g_isfullscreen = True;
                                break;

                        case 'b':

почему-то отрабатывает первое изменение,  а на втором затыкается. Что я 
делаю не так?


Подробная информация о списке рассылки community