Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37038635
en ru br
Репозитории ALT
S:2.1.41-alt23
5.1: 2.1.41-alt9
4.1: 2.1.41-alt3.M41.1
4.0: 2.1.35-alt5
3.0: 2.1.25-alt3
+backports:2.1.29-alt4.0.M30
www.altlinux.org/Changes

Группа :: Система/Основа
Пакет: menu

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: menu-2.1.41-ALT.patch
Скачать


--- menu-2.1.27~/install-menu/install-menu.cc	2005-12-12 00:16:17 +0300
+++ menu-2.1.27/install-menu/install-menu.cc	2006-03-23 18:16:24 +0300
@@ -517,7 +517,7 @@ void read_forcetree(parsestream &i)
 //  methodinfo
 //
 methodinfo::methodinfo(parsestream &i) 
-    : roots("/Debian"), mainmt("Debian"), treew("c(m)"),
+    : roots("/ALT Linux"), mainmt("ALT Linux"), treew("c(m)"),
     onlyrunasroot(false), onlyrunasuser(false),
     onlyuniquetitles(false), hint_optimize(false), hint_nentry(6),
     hint_topnentry(5), hint_mixedpenalty(15), hint_minhintfreq(0.1),
--- menu-2.1.35/Makefile.am~	2007-04-20 19:40:00 +0400
+++ menu-2.1.35/Makefile.am	2007-07-20 15:37:22 +0400
@@ -1,4 +1,4 @@
-SUBDIRS = update-menus install-menu doc scripts po po-sections po-su-to-root
+SUBDIRS = update-menus install-menu doc
 EXTRA_DIST = autogen.sh Doxyfile
 dist-hook:
 	mkdir $(distdir)/examples $(distdir)/default
--- menu-2.1.35/Makefile.in~	2007-06-07 03:21:40 +0400
+++ menu-2.1.35/Makefile.in	2007-07-20 15:35:40 +0400
@@ -162,7 +162,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = update-menus install-menu doc scripts po po-sections po-su-to-root
+SUBDIRS = update-menus install-menu doc
 EXTRA_DIST = autogen.sh Doxyfile
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
--- menu-2.1.41/update-menus/update-menus.cc~	2008-07-25 21:00:45 +0400
+++ menu-2.1.41/update-menus/update-menus.cc	2008-11-18 22:25:35 +0300
@@ -884,6 +898,7 @@ void usage(ostream &c)
   "  -d                     Output debugging messages.\n"
   "  -v                     Be verbose about what is going on.\n"
   "  -h, --help             This message.\n"
+  "  -N, --nofork           (ignored).\n"
   "  --menufilesdir=<dir>   Add <dir> to the lists of menu directories to search.\n"
   "  --menumethod=<method>  Run only the menu method <method>.\n"
   "  --nodefaultdirs        Disable the use of all the standard menu directories.\n"
@@ -895,6 +896,7 @@ void usage(ostream &c)
 }
 
 struct option long_options[] = { 
+  { "nofork", no_argument, NULL, 'N' }, 
   { "debug", no_argument, NULL, 'd' }, 
   { "verbose", no_argument, NULL, 'v' }, 
   { "help", no_argument, NULL, 'h' }, 
@@ -914,11 +916,13 @@ void parse_params(int argc, char **argv)
 {
   while(1)
   {
-    int c = getopt_long (argc, argv, "hvd", long_options, NULL);
+    int c = getopt_long (argc, argv, "hvdN", long_options, NULL);
     if (c == -1) 
       break;
     switch(c)
     {
+    case 'N':
+        break;
     case 'v':
         config.set_verbosity(configinfo::report_verbose);
       break;
@@ -1040,6 +1044,10 @@ int main (int argc, char **argv)
   string stdoutfile;
   struct stat st;
 
+  if (getenv("RPM_INSTALL_NAME")) {
+    exit(0);
+  }
+
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
@@ -1092,6 +1100,6 @@ int main (int argc, char **argv)
 
   if(!stdoutfile.empty())
       if (!stat(stdoutfile.c_str(),&st))
-          if (!st.st_size)
+          if (!st.st_size && S_ISREG(st.st_mode))
               unlink(stdoutfile.c_str());
 }
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin