- upgraded to 4.7.4

Changed files:
    changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff -> 1.2
    changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff -> 1.2
    changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff -> 1.2
    mc.spec -> 1.324

diff --git a/changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff b/changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff
deleted file mode 100644 (file)
index 7aa5a27..0000000
--- a/changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: src/complete.c
-===================================================================
---- src/complete.c (revision 74651f2e9f112eacc07ed9d1281e27ce6a4be9d4)
-+++ src/complete.c (revision 2ac7aeadc8560e8830877677192d0c28290c6a33)
-@@ -1026,5 +1026,5 @@
-                 GList *e;
- 
--                for (i = 0, e = ((WListbox *) h->current)->list;
-+                for (i = 0, e = ((WListbox *) h->current->data)->list;
-                      e != NULL; i++, e = g_list_next (e))
-                 {
-@@ -1033,5 +1033,5 @@
-                     if (strncmp (input->buffer + start, le->text, end - start - 1) == 0)
-                     {
--                        listbox_select_entry ((WListbox *) h->current, i);
-+                        listbox_select_entry ((WListbox *) h->current->data, i);
-                         end = str_get_prev_char (&(input->buffer[end])) - input->buffer;
-                         handle_char (input, parm);
-@@ -1078,5 +1078,5 @@
-                 }
- 
--                for (i = 0, e = ((WListbox *) h->current)->list;
-+                for (i = 0, e = ((WListbox *) h->current->data)->list;
-                      e != NULL; i++, e = g_list_next (e))
-                 {
-@@ -1118,5 +1118,5 @@
-                             {
-                                 need_redraw = 1;
--                                listbox_select_entry ((WListbox *) h->current, i);
-+                                listbox_select_entry ((WListbox *) h->current->data, i);
-                                 last_text = le->text;
-                             }

diff --git a/changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff b/changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff
deleted file mode 100644 (file)
index b17cc75..0000000
--- a/changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: src/editor/editcmd.c
-===================================================================
---- src/editor/editcmd.c (revision 49f70b533903bb91f9ae915d6285c896359f7fc9)
-+++ src/editor/editcmd.c (revision 11e335cdba4b4915f37146b7d268d8dabb3ef0b7)
-@@ -1647,11 +1647,12 @@
- #ifdef HAVE_CHARSET
-     GString *tmp;
-+
-     tmp = str_convert_to_display (str);
--
--    if (tmp && tmp->len)
--    {
--        return g_string_free (tmp, FALSE);
--    }
--    g_string_free (tmp, TRUE);
-+    if (tmp != NULL)
-+    {
-+        if (tmp->len != 0)
-+            return g_string_free (tmp, FALSE);
-+        g_string_free (tmp, TRUE);
-+    }
- #endif
-     return g_strdup (str);
-@@ -1663,12 +1664,12 @@
- #ifdef HAVE_CHARSET
-     GString *tmp;
-+
-     tmp = str_convert_to_input (str);
--
--    if (tmp && tmp->len)
--    {
--        return g_string_free (tmp, FALSE);
--    }
--    g_string_free (tmp, TRUE);
--    return g_strdup (str);
-+    if (tmp != NULL)
-+    {
-+        if (tmp->len != 0)
-+            return g_string_free (tmp, FALSE);
-+        g_string_free (tmp, TRUE);
-+    }
- #endif
-     return g_strdup (str);

diff --git a/changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff b/changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff
deleted file mode 100644 (file)
index 7def570..0000000
--- a/changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: src/achown.c
-===================================================================
---- src/achown.c (revision 74651f2e9f112eacc07ed9d1281e27ce6a4be9d4)
-+++ src/achown.c (revision ce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5)
-@@ -499,5 +499,5 @@
-               break;
-           flag_pos = f_pos * 3 + i;   /* (strchr(ch_perm,parm)-ch_perm); */
--          if (((WButton *) h->current)->text.start[(flag_pos % 3)] ==
-+          if (((WButton *) h->current->data)->text.start[(flag_pos % 3)] ==
-               '-')
-               ch_flags[flag_pos] = '+';

diff --git a/mc.spec b/mc.spec
index e41c9f4b5f0ad19b7d1bc0bb433b46caecddb585..84ac8f18e2102433e4f12a7bd780d9f39bcb047f 100644 (file)
--- a/mc.spec
+++ b/mc.spec
@@ -20,13 +20,13 @@ Summary(tr.UTF-8):  Midnight Commander görsel kabuğu
 Summary(uk.UTF-8):     Диспетчер файлів Midnight Commander
 Summary(zh_CN.UTF-8):  一个方便实用的文件管理器和虚拟Shell
 Name:          mc
-Version:       4.7.3
-Release:       2
+Version:       4.7.4
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Applications/Shells
 Source0:       http://www.midnight-commander.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 42eb806d733b11d0d13ff7ee5fd1a03c
+# Source0-md5: ae07f873b91e8a2e4a3b081f1adedd2e
 Source3:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source3-md5: 17d7b574e1b85ad6f8ddceda9e841f19
 Source7:       %{name}.desktop
@@ -37,13 +37,9 @@ Patch2:              %{name}-down2.diff
 Patch4:                %{name}-home_etc2.patch
 Patch5:                %{name}-pl.patch
 Patch6:                %{name}-no-ws-visible.patch
-Patch7:                changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff
-Patch8:                changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff
-Patch9:                changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff
 Patch11:       %{name}-noperl-vfs.patch
 # at now syntax highligthing for PLD-update-TODO and CVSROOT/users
 Patch12:       %{name}-pld-developerfriendly.patch
-Patch17:       %{name}-nolibs.patch
 Patch24:       %{name}-find_options.patch
 URL:           http://www.midnight-commander.org/
 BuildRequires: autoconf
@@ -175,12 +171,8 @@ tar, zip ve RPM dosyalarının içeriklerini gösterebilmesidir.
 # doesn't apply
 #%patch5 -p1
 %patch6 -p1
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
 %{!?with_perl_vfs:%patch11 -p1}
 %patch12 -p1
-%patch17 -p1
 %if "%{pld_release}" == "ti"
 %patch24 -p1
 %endif