macosx/opendarwin hackery, take 1.

CVS patchset: 7710
CVS date: 2005/01/25 05:24:40

diff --git a/Makefile.am b/Makefile.am
index 3cff70a..93b7311 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -183,7 +183,7 @@ install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/noarch
        @case "@host_os@" in \
        mint) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/m68kmint ;;\
-       solaris*|linux*) \
+       solaris*|linux*|darwin*) \
           chmod u+x $(top_srcdir)/installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" $(top_srcdir)/installplatform rpmrc macros platform ;; \
        esac
        @$(mkinstalldirs) $(DESTDIR)/var/tmp

diff --git a/installplatform b/installplatform
index 8fa47bd..d7647dd 100755 (executable)
--- a/installplatform
+++ b/installplatform
@@ -93,6 +93,9 @@ for SUBST in $SUBSTS ; do
   redhat)
     VENDORSED='-e s,^@redhat@,,'
     ;;
+  apple)
+    VENDORSED='-e s,^@apple@,,'
+    ;;
   esac
 
   cat $PLATFORM \

diff --git a/misc/fnmatch.c b/misc/fnmatch.c
index acbc523..e9082f7 100644 (file)
--- a/misc/fnmatch.c
+++ b/misc/fnmatch.c
@@ -607,10 +607,7 @@ internal_fnmatch (const char *pattern, const char *string,
 
 
 int
-fnmatch (pattern, string, flags)
-     const char *pattern;
-     const char *string;
-     int flags;
+xxfnmatch (const char *pattern, const char *string, int flags)
 {
   return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags);
 }

diff --git a/misc/fnmatch.h b/misc/fnmatch.h
index c0fd6a9..07f0ec4 100644 (file)
--- a/misc/fnmatch.h
+++ b/misc/fnmatch.h
@@ -75,7 +75,7 @@ extern "C" {
 
 /* Match NAME against the filename pattern PATTERN,
    returning zero if it matches, FNM_NOMATCH if not.  */
-extern int fnmatch __P ((__const char *__pattern, __const char *__name,
+extern int xxfnmatch __P ((__const char *__pattern, __const char *__name,
                         int __flags));
 
 #ifdef __cplusplus

diff --git a/misc/glob.c b/misc/glob.c
index 4cf1baa..a698744 100644 (file)
--- a/misc/glob.c
+++ b/misc/glob.c
@@ -48,7 +48,7 @@
 
 # include <assert.h>
 
-#define        __alloca        alloca
+#define        __xxalloca      alloca
 #define        __stat          stat
 #define        NAMLEN(_d)      NLENGTH(_d)
 
@@ -130,7 +130,7 @@ static int __glob_pattern_p (const char *pattern, int quote);
    If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
    Otherwise, `glob' returns zero.  */
 int
-glob (const char *pattern, int flags,
+xxglob (const char *pattern, int flags,
        int (*errfunc) __P ((const char *, int)), glob_t *pglob)
 {
   const char *filename;
@@ -165,7 +165,7 @@ glob (const char *pattern, int flags,
          if (onealt == NULL)
            {
              if (!(flags & GLOB_APPEND))
-               globfree (pglob);
+               xxglobfree (pglob);
              return GLOB_NOSPACE;
            }
 #endif
@@ -187,7 +187,7 @@ glob (const char *pattern, int flags,
 #ifndef __GNUC__
              free (onealt);
 #endif
-             return glob (pattern, flags & ~GLOB_BRACE, errfunc, pglob);
+             return xxglob (pattern, flags & ~GLOB_BRACE, errfunc, pglob);
            }
 
          /* Now find the end of the whole brace expression.  */
@@ -201,7 +201,7 @@ glob (const char *pattern, int flags,
 #ifndef __GNUC__
                  free (onealt);
 #endif
-                 return glob (pattern, flags & ~GLOB_BRACE, errfunc, pglob);
+                 return xxglob (pattern, flags & ~GLOB_BRACE, errfunc, pglob);
                }
            }
          /* Please note that we now can be sure the brace expression
@@ -236,7 +236,7 @@ glob (const char *pattern, int flags,
              memcpy (&alt_start[next - p], rest, rest_len);
 #endif
 
-             result = glob (onealt,
+             result = xxglob (onealt,
                             ((flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC))
                              | GLOB_APPEND), errfunc, pglob);
 
@@ -247,7 +247,7 @@ glob (const char *pattern, int flags,
                  free (onealt);
 #endif
                  if (!(flags & GLOB_APPEND))
-                   globfree (pglob);
+                   xxglobfree (pglob);
                  return result;
                }
 
@@ -325,7 +325,7 @@ glob (const char *pattern, int flags,
          char *drive_spec;
 
          ++dirlen;
-         drive_spec = (char *) __alloca (dirlen + 1);
+         drive_spec = (char *) __xxalloca (dirlen + 1);
 #ifdef HAVE_MEMPCPY
          *((char *) mempcpy (drive_spec, pattern, dirlen)) = '\0';
 #else
@@ -341,7 +341,7 @@ glob (const char *pattern, int flags,
             from "d:/", since "d:" and "d:/" are not the same.*/
        }
 #endif
-      newp = (char *) __alloca (dirlen + 1);
+      newp = (char *) __xxalloca (dirlen + 1);
 #ifdef HAVE_MEMPCPY
       *((char *) mempcpy (newp, pattern, dirlen)) = '\0';
 #else
@@ -360,7 +360,7 @@ glob (const char *pattern, int flags,
          && dirlen > 1)
        /* "pattern/".  Expand "pattern", appending slashes.  */
        {
-         int val = glob (dirname, flags | GLOB_MARK, errfunc, pglob);
+         int val = xxglob (dirname, flags | GLOB_MARK, errfunc, pglob);
          if (val == 0)
            pglob->gl_flags = ((pglob->gl_flags & ~GLOB_MARK)
                               | (flags & GLOB_MARK));
@@ -402,7 +402,7 @@ glob (const char *pattern, int flags,
                /* `sysconf' does not support _SC_LOGIN_NAME_MAX.  Try
                   a moderate value.  */
                buflen = 20;
-             name = (char *) __alloca (buflen);
+             name = (char *) __xxalloca (buflen);
 
              success = getlogin_r (name, buflen) >= 0;
 #   else
@@ -421,7 +421,7 @@ glob (const char *pattern, int flags,
                    /* `sysconf' does not support _SC_GETPW_R_SIZE_MAX.
                       Try a moderate value.  */
                    pwbuflen = 1024;
-                 pwtmpbuf = (char *) __alloca (pwbuflen);
+                 pwtmpbuf = (char *) __xxalloca (pwbuflen);
 
                  while (getpwnam_r (name, &pwbuf, pwtmpbuf, pwbuflen, &p)
                         != 0)
@@ -432,7 +432,7 @@ glob (const char *pattern, int flags,
                          break;
                        }
                      pwbuflen *= 2;
-                     pwtmpbuf = (char *) __alloca (pwbuflen);
+                     pwtmpbuf = (char *) __xxalloca (pwbuflen);
                      __set_errno (save);
                    }
 #   else
@@ -458,7 +458,7 @@ glob (const char *pattern, int flags,
            {
              char *newp;
              size_t home_len = strlen (home_dir);
-             newp = (char *) __alloca (home_len + dirlen);
+             newp = (char *) __xxalloca (home_len + dirlen);
 # ifdef HAVE_MEMPCPY
              mempcpy (mempcpy (newp, home_dir, home_len),
                       &dirname[1], dirlen);
@@ -481,7 +481,7 @@ glob (const char *pattern, int flags,
          else
            {
              char *newp;
-             newp = (char *) __alloca (end_name - dirname);
+             newp = (char *) __xxalloca (end_name - dirname);
 # ifdef HAVE_MEMPCPY
              *((char *) mempcpy (newp, dirname + 1, end_name - dirname))
                = '\0';
@@ -505,7 +505,7 @@ glob (const char *pattern, int flags,
              /* `sysconf' does not support _SC_GETPW_R_SIZE_MAX.  Try a
                 moderate value.  */
              buflen = 1024;
-           pwtmpbuf = (char *) __alloca (buflen);
+           pwtmpbuf = (char *) __xxalloca (buflen);
 
            while (getpwnam_r (user_name, &pwbuf, pwtmpbuf, buflen, &p) != 0)
              {
@@ -515,7 +515,7 @@ glob (const char *pattern, int flags,
                    break;
                  }
                buflen *= 2;
-               pwtmpbuf = __alloca (buflen);
+               pwtmpbuf = __xxalloca (buflen);
                __set_errno (save);
              }
 #  else
@@ -532,7 +532,7 @@ glob (const char *pattern, int flags,
              char *newp;
              size_t home_len = strlen (home_dir);
              size_t rest_len = end_name == NULL ? 0 : strlen (end_name);
-             newp = (char *) __alloca (home_len + rest_len + 1);
+             newp = (char *) __xxalloca (home_len + rest_len + 1);
 #  ifdef HAVE_MEMPCPY
              *((char *) mempcpy (mempcpy (newp, home_dir, home_len),
                                  end_name, rest_len)) = '\0';
@@ -625,7 +625,7 @@ glob (const char *pattern, int flags,
          dirs.gl_lstat = pglob->gl_lstat;
        }
 
-      status = glob (dirname,
+      status = xxglob (dirname,
                     ((flags & (GLOB_ERR | GLOB_NOCHECK | GLOB_NOESCAPE
                                | GLOB_ALTDIRFUNC))
                      | GLOB_NOSORT | GLOB_ONLYDIR),
@@ -647,8 +647,8 @@ glob (const char *pattern, int flags,
 
            if (interrupt_state)
              {
-               globfree (&dirs);
-               globfree (&files);
+               xxglobfree (&dirs);
+               xxglobfree (&files);
                return GLOB_ABORTED;
              }
          }
@@ -665,8 +665,8 @@ glob (const char *pattern, int flags,
 
          if (status != 0)
            {
-             globfree (&dirs);
-             globfree (pglob);
+             xxglobfree (&dirs);
+             xxglobfree (pglob);
              return status;
            }
 
@@ -675,8 +675,8 @@ glob (const char *pattern, int flags,
                            &pglob->gl_pathv[old_pathc],
                            pglob->gl_pathc - old_pathc))
            {
-             globfree (&dirs);
-             globfree (pglob);
+             xxglobfree (&dirs);
+             xxglobfree (pglob);
              return GLOB_NOSPACE;
            }
        }
@@ -706,7 +706,7 @@ glob (const char *pattern, int flags,
                                     sizeof (char *));
              if (pglob->gl_pathv == NULL)
                {
-                 globfree (&dirs);
+                 xxglobfree (&dirs);
                  return GLOB_NOSPACE;
                }
 
@@ -730,8 +730,8 @@ glob (const char *pattern, int flags,
                                                             + filename_len);
                  if (pglob->gl_pathv[pglob->gl_pathc] == NULL)
                    {
-                     globfree (&dirs);
-                     globfree (pglob);
+                     xxglobfree (&dirs);
+                     xxglobfree (pglob);
                      return GLOB_NOSPACE;
                    }
 
@@ -763,7 +763,7 @@ glob (const char *pattern, int flags,
            return GLOB_NOMATCH;
        }
 
-      globfree (&dirs);
+      xxglobfree (&dirs);
     }
   else
     {
@@ -783,7 +783,7 @@ glob (const char *pattern, int flags,
                            &pglob->gl_pathv[ignore],
                            pglob->gl_pathc - ignore))
            {
-             globfree (pglob);
+             xxglobfree (pglob);
              return GLOB_NOSPACE;
            }
        }
@@ -804,7 +804,7 @@ glob (const char *pattern, int flags,
            char *new = xrealloc (pglob->gl_pathv[i], len);
            if (new == NULL)
              {
-               globfree (pglob);
+               xxglobfree (pglob);
                return GLOB_NOSPACE;
              }
            strcpy (&new[len - 2], "/");
@@ -831,7 +831,7 @@ glob (const char *pattern, int flags,
 
 /* Free storage allocated in PGLOB by a previous `glob' call.  */
 void
-globfree (glob_t *pglob)
+xxglobfree (glob_t *pglob)
 {
   if (pglob->gl_pathv != NULL)
     {
@@ -1001,7 +1001,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
          struct stat st;
          size_t patlen = strlen (pattern);
          size_t dirlen = strlen (directory);
-         char *fullname = (char *) __alloca (dirlen + 1 + patlen + 1);
+         char *fullname = (char *) __xxalloca (dirlen + 1 + patlen + 1);
 
 # ifdef HAVE_MEMPCPY
          mempcpy (mempcpy (mempcpy (fullname, directory, dirlen),
@@ -1028,7 +1028,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
        {
          /* This is a special case for matching directories like in
             "*a/".  */
-         names = (struct globlink *) __alloca (sizeof (struct globlink));
+         names = (struct globlink *) __xxalloca (sizeof (struct globlink));
          names->name = (char *) xmalloc (1);
          if (names->name == NULL)
            goto memory_error;
@@ -1084,10 +1084,10 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
 
                  name = d->d_name;
 
-                 if (fnmatch (pattern, name, fnm_flags) == 0)
+                 if (xxfnmatch (pattern, name, fnm_flags) == 0)
                    {
                      struct globlink *new = (struct globlink *)
-                       __alloca (sizeof (struct globlink));
+                       __xxalloca (sizeof (struct globlink));
                      len = NAMLEN (d);
                      new->name = (char *) xmalloc (len + 1);
                      if (new->name == NULL)
@@ -1112,7 +1112,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
     {
       size_t len = strlen (pattern);
       nfound = 1;
-      names = (struct globlink *) __alloca (sizeof (struct globlink));
+      names = (struct globlink *) __xxalloca (sizeof (struct globlink));
       names->next = NULL;
       names->name = (char *) xmalloc (len + 1);
       if (names->name == NULL)

diff --git a/misc/glob.h b/misc/glob.h
index a52d109..c4e38c9 100644 (file)
--- a/misc/glob.h
+++ b/misc/glob.h
@@ -152,12 +152,12 @@ typedef struct
    If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
    Otherwise, `glob' returns zero.  */
 #if _FILE_OFFSET_BITS != 64
-extern int glob __P ((__const char *__pattern, int __flags,
+extern int xxglob __P ((__const char *__pattern, int __flags,
                      int (*__errfunc) (__const char *, int),
                      glob_t *__pglob));
 
 /* Free storage allocated in PGLOB by a previous `glob' call.  */
-extern void globfree __P ((glob_t *__pglob));
+extern void xxglobfree __P ((glob_t *__pglob));
 #else
 # if __GNUC__ >= 2
 extern int glob __P ((__const char *__pattern, int __flags,

diff --git a/platform.in b/platform.in
index 726cd07..f14ce37 100644 (file)
--- a/platform.in
+++ b/platform.in
@@ -82,11 +82,17 @@
 @redhat@#%{nil}
 
 
+@apple@#---------------------------------------------------------------------
+@apple@#       Apple Darwin vendor specific macros
+@apple@#
+@apple@%_use_internal_dependency_generator     0
+@apple@%__so   dylib
+
+
 @mandrake@#---------------------------------------------------------------------
 @mandrake@#    Mandrake vendor specific macros
 @mandrake@# XXX Add a support e-mail address here, please.
 @mandrake@#
-@mandrake@#
 @mandrake@# XXX These values, particularly vendor, need to be regularized, please.
 @mandrake@%_vendor             MandrakeSoft
 @mandrake@%_real_vendor                mandrake

diff --git a/po/cs.po b/po/cs.po
index aac7873..98472ec 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"

diff --git a/po/da.po b/po/da.po
index bba59f6..ee424cf 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"

diff --git a/po/de.po b/po/de.po
index 2ef1d9b..0930684 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"

diff --git a/po/fi.po b/po/fi.po
index 39fb773..b1bbb5e 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"

diff --git a/po/fr.po b/po/fr.po
index b3dfa4b..2008e07 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM 4.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2003-07-06 01:36+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"

diff --git a/po/gl.po b/po/gl.po
index c27d0a1..129223d 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"

diff --git a/po/is.po b/po/is.po
index e6fa8d4..4cdf2cf 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"

diff --git a/po/ja.po b/po/ja.po
index 5189f6d..51ef801 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"

diff --git a/po/ko.po b/po/ko.po
index 4a498a9..0a2fe59 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"

diff --git a/po/no.po b/po/no.po
index 982fc4e..72f6e4a 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"

diff --git a/po/pl.po b/po/pl.po
index 1e7783c..b4840f9 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.3-20030515\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2003-06-08 22:42+0200\n"
 "Last-Translator: Arkadiusz Miskiewicz <arekm@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"

diff --git a/po/pt.po b/po/pt.po
index 1088da4..9a62776 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 678c8c1..da40d40 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2004-02-29 07:48+0500\n"
 "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese\n"

diff --git a/po/ro.po b/po/ro.po
index 0b91e4e..a396bd6 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"

diff --git a/po/rpm.pot b/po/rpm.pot
index 14619df..b45acc7 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/ru.po b/po/ru.po
index 2774753..5c9e5c2 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"

diff --git a/po/sk.po b/po/sk.po
index aeaa740..f5b219c 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"

diff --git a/po/sl.po b/po/sl.po
index 255b72e..c3678c1 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,13 +1,13 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.389.2.9 2005/01/23 20:45:06 jbj Exp $
+# $Id: sl.po,v 1.389.2.10 2005/01/25 05:24:44 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"

diff --git a/po/sr.po b/po/sr.po
index 0a8f571..e5b36fa 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2004-02-29 07:48+0500\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"

diff --git a/po/sv.po b/po/sv.po
index 3a413e8..af433aa 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2003-02-05 12:40+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"

diff --git a/po/tr.po b/po/tr.po
index 6154db9..c44541b 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-23 15:29-0500\n"
+"POT-Creation-Date: 2005-01-24 05:52-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"

diff --git a/rpmio/macro.c b/rpmio/macro.c
index a65534d..463ed9a 100644 (file)
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -1681,7 +1681,7 @@ int rpmGlob(const char * patterns, int * argcPtr, const char *** argvPtr)
     int argc = 0;
     const char ** argv = NULL;
     char * globRoot = NULL;
-#ifdef ENABLE_NLS      
+#ifdef ENABLE_NLS
     const char * old_collate = NULL;
     const char * old_ctype = NULL;
     const char * t;
@@ -1788,7 +1788,7 @@ fprintf(stderr, "*** rpmGlob argv[%d] \"%s\"\n", argc, globURL);
 
 
 exit:
-#ifdef ENABLE_NLS
+#ifdef ENABLE_NLS      
 /*@-branchstate@*/
     if (old_collate) {
        (void) setlocale(LC_COLLATE, old_collate);

diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c
index 85542b2..b3a8f6f 100644 (file)
--- a/rpmio/rpmrpc.c
+++ b/rpmio/rpmrpc.c
@@ -1413,7 +1413,7 @@ int Glob_pattern_p (const char * pattern, int quote)
        case ']':
            if (open)
                return (1);
-           continue;      
+           continue;
 
        case '+':
        case '@':
@@ -1466,14 +1466,14 @@ fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", pattern, (unsigned)flags, (void *)e
        return -2;
        /*@notreached@*/ break;
     }
-    return glob(pattern, flags, errfunc, pglob);
+    return xxglob(pattern, flags, errfunc, pglob);
 }
 
 void Globfree(glob_t *pglob)
 {
 if (_rpmio_debug)
 fprintf(stderr, "*** Globfree(%p)\n", pglob);
-    globfree(pglob);
+    xxglobfree(pglob);
 }
 
 DIR * Opendir(const char * path)

diff --git a/scripts/brp-strip b/scripts/brp-strip
index 6f0388c..1493877 100755 (executable)
--- a/scripts/brp-strip
+++ b/scripts/brp-strip
@@ -4,6 +4,11 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
        exit 0
 fi
 
+case `uname -a` in
+Darwin*) exit 0 ;;
+*) ;;
+esac
+
 # Strip ELF binaries
 for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
         grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \

diff --git a/scripts/brp-strip-comment-note b/scripts/brp-strip-comment-note
index 15a5ed2..87b18b7 100755 (executable)
--- a/scripts/brp-strip-comment-note
+++ b/scripts/brp-strip-comment-note
@@ -4,6 +4,11 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
        exit 0
 fi
 
+case `uname -a` in
+Darwin*) exit 0 ;;
+*) ;;
+esac
+
 # Strip .comment and .note sections (the latter only if it is not allocated)
 # for already stripped elf files in the build root
 for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \

diff --git a/scripts/brp-strip-shared b/scripts/brp-strip-shared
index d254f53..01317a5 100644 (file)
--- a/scripts/brp-strip-shared
+++ b/scripts/brp-strip-shared
@@ -7,6 +7,11 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
        exit 0
 fi
 
+case `uname -a` in
+Darwin*) exit 0 ;;
+*) ;;
+esac
+
 # Strip ELF shared objects
 # Please note we don't restrict our search to executable files because
 # our libraries are not (should not be, at least) +x.

diff --git a/scripts/brp-strip-static-archive b/scripts/brp-strip-static-archive
index 6831239..df2f92e 100755 (executable)
--- a/scripts/brp-strip-static-archive
+++ b/scripts/brp-strip-static-archive
@@ -4,6 +4,11 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
        exit 0
 fi
 
+case `uname -a` in
+Darwin*) exit 0 ;;
+*) ;;
+esac
+
 # Strip static libraries.
 for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \
         grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \