- new upstream, up to 2.5 (NFY as does not build)

Changed files:
    nss_db-amfix.patch -> 1.3
    nss_db-chmod_644.patch -> 1.3
    nss_db-db41.patch -> 1.3
    nss_db-enoent.patch -> 1.2
    nss_db-errno.patch -> 1.2
    nss_db-glibc23.patch -> 1.2
    nss_db-initialize.patch -> 1.2
    nss_db-link.patch -> 1.2
    nss_db-makedb-atomic.patch -> 1.2
    nss_db-makedb-shared.patch -> 1.2
    nss_db-selinux.patch -> 1.3
    nss_db.spec -> 1.47

diff --git a/nss_db-amfix.patch b/nss_db-amfix.patch
index 8c422089e543734623a52bd4c757378891764a04..e16bb2b71cc1d040288cb5ccbb5413420639bba4 100644 (file)
--- a/nss_db-amfix.patch
+++ b/nss_db-amfix.patch
@@ -1,19 +1,13 @@
---- nss_db-2.2.3pre1/src/Makefile.am.orig      2001-04-30 03:19:31.000000000 +0200
-+++ nss_db-2.2.3pre1/src/Makefile.am   2004-04-02 23:45:50.158293352 +0200
-@@ -28,13 +28,13 @@
- libnss_db_la_LIBADD = @DB_LIBS@ -lnss_files
+--- nss_db-2.5/Makefile.am~    2011-12-12 17:49:46.000000000 +0200
++++ nss_db-2.5/Makefile.am     2012-02-09 22:46:36.176785996 +0200
+@@ -49,8 +49,8 @@
+ endif
  
  bin_PROGRAMS = makedb
--makedb_SOURCES = makedb.c db-compat.c
--makedb_LDADD = @DB_LIBS@ @INTLLIBS@
+-makedb_SOURCES = makedb.c db-compat-copy-makedb.c
+-makedb_LDADD = @DB_LIBS@ @SELINUX_LIBS@ lib/libgnu.a
 +makedb_SOURCES = makedb.c
-+makedb_LDADD = db-compat.lo @DB_LIBS@ @INTLLIBS@
- 
- # To mimmick the old glibc installation as closely as possible, we
- # shuffle the installed library and the links to it around a bit,
- # removing all traces from libtool in the process.
--install-data-local:
-+install-data-hook:
-       $(mkinstalldirs) $(DESTDIR)$(libdir)
-       rm $(DESTDIR)$(slibdir)/libnss_db.la
-       rm $(DESTDIR)$(slibdir)/libnss_db.so
++makedb_LDADD = @DB_LIBS@ @SELINUX_LIBS@  db-compat-copy-makedb.lo lib/libgnu.a
+ makedb_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
+ db-compat-copy-makedb.c: db-compat.c
+       rm -f $@

diff --git a/nss_db-chmod_644.patch b/nss_db-chmod_644.patch
index ca161d25738c48707cf92d69c6d0936a5f751db1..2e425aa0e2c45198900a712ddf6bbf27cc9875c2 100644 (file)
--- a/nss_db-chmod_644.patch
+++ b/nss_db-chmod_644.patch
@@ -1,57 +1,55 @@
-diff -urN nss_db-2.2.orig/db-Makefile nss_db-2.2/db-Makefile
---- nss_db-2.2.orig/db-Makefile        Tue Aug  8 19:42:27 2000
-+++ nss_db-2.2/db-Makefile     Sun Feb 11 14:32:09 2001
-@@ -38,6 +38,7 @@
+--- nss_db-2.5/db-Makefile.in~ 2011-12-12 12:25:35.000000000 +0200
++++ nss_db-2.5/db-Makefile.in  2012-02-09 22:41:12.395398440 +0200
+@@ -61,6 +61,7 @@
                 /^[^#]/ { printf ".%s ", $$1; print; \
                           printf "=%s ", $$3; print }' $^ | \
        $(MAKEDB) -o $@ -
 +      chmod 644 $@
-       @echo "done."
  
- $(VAR_DB)/group.db: /etc/group
-@@ -49,6 +50,7 @@
+ $(GROUP_DB): $(GROUP_SOURCE)
+       @echo "$@ ..."
+@@ -71,6 +72,7 @@
                 /^[^#]/ { printf ".%s ", $$1; print; \
                           printf "=%s ", $$3; print }' $^ | \
        $(MAKEDB) -o $@ -
 +      chmod 644 $@
-       @echo "done."
  
- $(VAR_DB)/ethers.db: /etc/ethers
-@@ -60,6 +62,7 @@
-                /^[^#]/ { printf ".%s ", $$1; print; \
-                          printf "=%s ", $$2; print }' $^ | \
+ $(ETHERS_DB): $(ETHERS_SOURCE)
+       @echo "$@ ..."
+@@ -81,6 +83,7 @@
+                /^[^#]/ { printf ".%s ", $$2; print; \
+                          printf "=%s ", $$1; print }' $^ | \
        $(MAKEDB) -o $@ -
 +      chmod 644 $@
-       @echo "done."
  
- $(VAR_DB)/protocols.db: /etc/protocols
-@@ -73,6 +76,7 @@
+ $(PROTO_DB): $(PROTO_SOURCE)
+       @echo "$@ ..."
+@@ -93,6 +96,7 @@
                           for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
                             { printf ".%s ", $$i; print } }' $^ | \
        $(MAKEDB) -o $@ -
 +      chmod 644 $@
-       @echo "done."
  
- $(VAR_DB)/rpc.db: /etc/rpc
-@@ -86,6 +90,7 @@
+ $(RPC_DB): $(RPC_SOURCE)
+       @echo "$@ ..."
+@@ -105,6 +109,7 @@
                           for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \
                             { printf ".%s ", $$i; print } }' $^ | \
        $(MAKEDB) -o $@ -
 +      chmod 644 $@
-       @echo "done."
  
- $(VAR_DB)/services.db: /etc/services
-@@ -102,6 +107,7 @@
+ $(SERVICES_DB): $(SERVICES_SOURCE)
+       @echo "$@ ..."
+@@ -120,6 +125,7 @@
                             { printf ".%s/%s ", $$i, $$3; print; \
                               printf ".%s/ ", $$i; print } }' $^ | \
        $(MAKEDB) -o $@ -
 +      chmod 644 $@
-       @echo "done."
  
- $(VAR_DB)/shadow.db: /etc/shadow
-@@ -135,4 +141,5 @@
+ $(SHADOW_DB): $(SHADOW_SOURCE)
+       @echo "$@ ..."
+@@ -151,3 +157,4 @@
                           gsub(/[ \t]+/, " "); \
                           if(end == 1) printf "%s", $$0; else print }' $^ | \
        $(MAKEDB) -o $@ -
-+      chmod 640 $@
-       @echo "done."
++      chmod 644 $@

diff --git a/nss_db-db41.patch b/nss_db-db41.patch
index e341028911b911a0fd98c25f246491ae6b1623a8..59521c4ff39f97e97602a6cd773b1709bcbe4c24 100644 (file)
--- a/nss_db-db41.patch
+++ b/nss_db-db41.patch
@@ -1,5 +1,5 @@
---- nss_db-2.2.3pre1/src/db-compat.c   2010-02-22 19:32:31.371616603 +0200
-+++ nss_db-2.2.3pre1/src/db-compat.c   2010-02-22 19:32:31.371616603 +0200
+--- nss_db-2.2.3pre1/db-compat.c       2010-02-22 19:32:31.371616603 +0200
++++ nss_db-2.2.3pre1/db-compat.c       2010-02-22 19:32:31.371616603 +0200
 @@ -39,7 +39,11 @@
    if (err)
      return err;

diff --git a/nss_db-enoent.patch b/nss_db-enoent.patch
index ac6a8f8657ccf2d9f0b8ac7498f61df4aead3fea..c4f08baf9314709e0462614d8981b05a16a1b60e 100644 (file)
--- a/nss_db-enoent.patch
+++ b/nss_db-enoent.patch
@@ -4,13 +4,15 @@ back to the caller.  If we don't set it, anywhere, on error, then the
 previous error is returned.  That can be ERANGE, which would cause NSS to
 allocate a larger buffer and try again.  For no-such-key errors, this was
 exactly what was happening, and it could result in an out-of-memory error.
---- nss_db-2.2/src/db-XXX.c    Tue Apr 26 13:07:23 2005
-+++ nss_db-2.2/src/db-XXX.c    Tue Apr 26 13:07:18 2005
-@@ -122,6 +122,7 @@
+
+--- nss_db-2.5/db-XXX.c~       2011-12-13 15:22:18.000000000 +0200
++++ nss_db-2.5/db-XXX.c        2012-02-09 23:02:40.190586276 +0200
+@@ -122,7 +122,7 @@
      }
  
-   /* Succeed iff it matches a value that parses correctly.  */
+   /* Succeed if it matches a value that parses correctly.  */
+-/*  *errnop = ENOENT; */
 +  *errnop = ENOENT;
    value.flags = 0;
+   syslog (LOG_DEBUG, PACKAGE ": db->get (%s)\n", (char *)key->data);
    err = db->get (db, NULL, key, &value, 0);
-   if (err)

diff --git a/nss_db-errno.patch b/nss_db-errno.patch
index d6de9aa1c228e7e1d06262b5f8dc320794cdaa89..5076cfda995fd50c0b4080b769668c0ad7da808e 100644 (file)
--- a/nss_db-errno.patch
+++ b/nss_db-errno.patch
@@ -1,6 +1,5 @@
-diff -urN nss_db-2.2.3pre1.org/src/db-open.c nss_db-2.2.3pre1/src/db-open.c
---- nss_db-2.2.3pre1.org/src/db-open.c 2004-08-16 06:20:08.219189152 +0200
-+++ nss_db-2.2.3pre1/src/db-open.c     2004-08-16 06:20:32.966427000 +0200
+--- nss_db-2.2.3pre1.org/db-open.c     2004-08-16 06:20:08.219189152 +0200
++++ nss_db-2.2.3pre1/db-open.c 2004-08-16 06:20:32.966427000 +0200
 @@ -58,7 +58,7 @@
    if (err != 0)
      {

diff --git a/nss_db-glibc23.patch b/nss_db-glibc23.patch
index f312dbae7680aeea061dbec63dfc6a535f3e959a..59db2bc52b9ac6aff95c8e94ac0bf3388c6dcd31 100644 (file)
--- a/nss_db-glibc23.patch
+++ b/nss_db-glibc23.patch
@@ -1,5 +1,5 @@
---- nss_db-2.2.3pre1/src/db-XXX.c.orig 2001-04-30 03:07:41.000000000 +0200
-+++ nss_db-2.2.3pre1/src/db-XXX.c      2004-04-02 23:51:28.467862480 +0200
+--- nss_db-2.2.3pre1/db-XXX.c.orig     2001-04-30 03:07:41.000000000 +0200
++++ nss_db-2.2.3pre1/db-XXX.c  2004-04-02 23:51:28.467862480 +0200
 @@ -24,7 +24,7 @@
  #include <stdio.h>
  #include <string.h>
@@ -9,8 +9,8 @@
  
  #include "nss_db.h"
  
---- nss_db-2.2.3pre1/src/db-alias.c.orig       2001-04-30 03:07:41.000000000 +0200
-+++ nss_db-2.2.3pre1/src/db-alias.c    2004-04-02 23:51:43.827527456 +0200
+--- nss_db-2.2.3pre1/db-alias.c.orig   2001-04-30 03:07:41.000000000 +0200
++++ nss_db-2.2.3pre1/db-alias.c        2004-04-02 23:51:43.827527456 +0200
 @@ -26,7 +26,7 @@
  #include <stdio.h>
  #include <string.h>
@@ -20,8 +20,8 @@
  
  #include "nss_db.h"
  
---- nss_db-2.2.3pre1/src/db-netgrp.c.orig      2001-04-30 03:07:41.000000000 +0200
-+++ nss_db-2.2.3pre1/src/db-netgrp.c   2004-04-02 23:51:55.586739784 +0200
+--- nss_db-2.2.3pre1/db-netgrp.c.orig  2001-04-30 03:07:41.000000000 +0200
++++ nss_db-2.2.3pre1/db-netgrp.c       2004-04-02 23:51:55.586739784 +0200
 @@ -22,7 +22,7 @@
  #include <fcntl.h>
  #include <netgroup.h>
@@ -31,8 +31,8 @@
  #include <paths.h>
  
  #include "nss_db.h"
---- nss_db-2.2.3pre1/src/Makefile.am.orig      2004-04-02 23:46:06.000000000 +0200
-+++ nss_db-2.2.3pre1/src/Makefile.am   2004-04-02 23:54:15.053537608 +0200
+--- nss_db-2.2.3pre1/Makefile.am.orig  2004-04-02 23:46:06.000000000 +0200
++++ nss_db-2.2.3pre1/Makefile.am       2004-04-02 23:54:15.053537608 +0200
 @@ -11,7 +11,7 @@
  
  noinst_HEADERS = db-compat.h netgroup.h nss_db.h
@@ -51,8 +51,8 @@
  
  bin_PROGRAMS = makedb
  makedb_SOURCES = makedb.c
---- nss_db-2.2.3pre1/src/libc-lock.h.orig      1970-01-01 01:00:00.000000000 +0100
-+++ nss_db-2.2.3pre1/src/libc-lock.h   2004-04-02 23:53:23.534369712 +0200
+--- nss_db-2.2.3pre1/libc-lock.h.orig  1970-01-01 01:00:00.000000000 +0100
++++ nss_db-2.2.3pre1/libc-lock.h       2004-04-02 23:53:23.534369712 +0200
 @@ -0,0 +1,43 @@
 +/* libc-internal interface for mutex locks.  LinuxThreads version.
 +   Adapted for nss_db.

diff --git a/nss_db-initialize.patch b/nss_db-initialize.patch
index 58c724dd5c7afc1464a9dbc7984563196cd3dd78..ac4ce840c09021ee827430dca8d316c0c2a5ece0 100644 (file)
--- a/nss_db-initialize.patch
+++ b/nss_db-initialize.patch
@@ -1,7 +1,8 @@
 Initialize all of the fields of the key to zeroes, so that we don't pass
 garbage keys in to later versions of Berkeley DB.
---- nss_db-2.2/src/db-XXX.c    2005-03-29 16:13:57.103516704 -0500
-+++ nss_db-2.2/src/db-XXX.c    2005-03-29 16:13:47.108821931 -0500
+
+--- nss_db-2.2/db-XXX.c        2005-03-29 16:13:57.103516704 -0500
++++ nss_db-2.2/db-XXX.c        2005-03-29 16:13:47.108821931 -0500
 @@ -225,6 +225,7 @@
    DBT key;                                                                  \
    enum nss_status status;                                                   \

diff --git a/nss_db-link.patch b/nss_db-link.patch
index 28d5a60c60a62ca36ac1fe0e2b84005b1b400366..9a131d6d36d28cd5b8f8b2f33d6b7a7331c417ba 100644 (file)
--- a/nss_db-link.patch
+++ b/nss_db-link.patch
@@ -1,15 +1,12 @@
---- nss_db-2.2.3pre1/src/Makefile.am~  2005-12-05 18:59:41.933364712 +0100
-+++ nss_db-2.2.3pre1/src/Makefile.am   2005-12-05 21:45:54.944990152 +0100
-@@ -23,9 +23,10 @@
-       files-ethers.c files-grp.c files-parse.c files-proto.c files-pwd.c \
-       files-rpc.c files-service.c files-spwd.c
- libnss_db_la_LDFLAGS = -version-info $(INTERFACE) \
--       -Wl,--version-script=$(srcdir)/libnss_db.map
-+       -Wl,--version-script=$(srcdir)/libnss_db.map \
-+       -Wl,$(slibdir)/libnss_files.so.2
- libnss_db_la_DEPENDENCIES = libnss_db.map
--libnss_db_la_LIBADD = @DB_LIBS@ $(slibdir)/libnss_files.so.2
-+libnss_db_la_LIBADD = @DB_LIBS@
+--- nss_db-2.5/Makefile.am~    2012-02-09 22:59:18.000000000 +0200
++++ nss_db-2.5/Makefile.am     2012-02-09 23:00:19.130840181 +0200
+@@ -45,7 +45,8 @@
+ else
+   libnss_db_la_SOURCES += db-alias.c
+   EXTRA_libnss_db_la_SOURCES += libnss_db.map
+-  libnss_db_la_LDFLAGS += -Wl,--version-script=libnss_db.map
++  libnss_db_la_LDFLAGS += -Wl,--version-script=libnss_db.map \
++      -Wl,$(slibdir)/libnss_files.so.2
+ endif
  
  bin_PROGRAMS = makedb
- makedb_SOURCES = makedb.c

diff --git a/nss_db-makedb-atomic.patch b/nss_db-makedb-atomic.patch
index 55c2715015f9244d289d927c11fab08cee6c7b34..3212028bfac1d1dc0e44083657fe29010dd64214 100644 (file)
--- a/nss_db-makedb-atomic.patch
+++ b/nss_db-makedb-atomic.patch
@@ -5,8 +5,8 @@ date: 2008/08/07 16:51:58;  author: nalin;  state: Exp;
 - create and populate new db files, moving them in place afterward (patch
   from Kelsey Cummings, CentOS #1987)
 
---- nss_db-2.2/src/makedb.c    2008-08-04 14:21:06.000000000 -0700
-+++ nss_db-2.2/src/makedb.c    2008-08-04 14:24:08.000000000 -0700
+--- nss_db-2.2/makedb.c        2008-08-04 14:21:06.000000000 -0700
++++ nss_db-2.2/makedb.c        2008-08-04 14:24:08.000000000 -0700
 @@ -31,6 +31,7 @@
  #include <stdlib.h>
  #include <string.h>

diff --git a/nss_db-makedb-shared.patch b/nss_db-makedb-shared.patch
index 0eebf1d2770e3904c9d38f4e21f1caca1d7c9c96..daf673417077653d143744ca431c119a3c69bee5 100644 (file)
--- a/nss_db-makedb-shared.patch
+++ b/nss_db-makedb-shared.patch
@@ -1,9 +1,9 @@
---- nss_db-2.2.3pre1/src/libnss_db.map~        2010-02-23 13:09:05.000000000 +0200
-+++ nss_db-2.2.3pre1/src/libnss_db.map 2010-02-23 13:09:08.098884892 +0200
-@@ -14,6 +14,8 @@
-     _nss_db_setaliasent; _nss_db_setetherent; _nss_db_setgrent;
+--- nss_db-2.5/libnss_db.map~  2011-12-12 17:48:06.000000000 +0200
++++ nss_db-2.5/libnss_db.map   2012-02-09 23:09:44.849891839 +0200
+@@ -15,6 +15,8 @@
      _nss_db_setnetgrent; _nss_db_setprotoent; _nss_db_setpwent;
      _nss_db_setrpcent; _nss_db_setservent; _nss_db_setspent;
+     _nss_db_initgroups_dyn;
 -  local:
 -    *;
 +};
@@ -11,14 +11,14 @@
 +  global:
 +    *_nssdb;
  };
---- nss_db-2.2.3pre1/src/Makefile.am~  2010-02-23 13:11:23.000000000 +0200
-+++ nss_db-2.2.3pre1/src/Makefile.am   2010-02-23 13:11:32.562202953 +0200
-@@ -30,7 +30,7 @@
+--- nss_db-2.5/Makefile.am~    2012-02-09 23:08:49.000000000 +0200
++++ nss_db-2.5/Makefile.am     2012-02-09 23:11:00.986686451 +0200
+@@ -51,7 +51,7 @@
  
  bin_PROGRAMS = makedb
  makedb_SOURCES = makedb.c
--makedb_LDADD = db-compat.lo @DB_LIBS@ @SELINUX_LIBS@ @INTLLIBS@
-+makedb_LDADD = db-compat.lo libnss_db.la @SELINUX_LIBS@ @INTLLIBS@
- 
- # To mimmick the old glibc installation as closely as possible, we
- # shuffle the installed library and the links to it around a bit,
+-makedb_LDADD = @DB_LIBS@ @SELINUX_LIBS@  db-compat-copy-makedb.lo lib/libgnu.a
++makedb_LDADD = @DB_LIBS@ @SELINUX_LIBS@ libnss_db.la db-compat-copy-makedb.lo lib/libgnu.a
+ makedb_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
+ db-compat-copy-makedb.c: db-compat.c
+       rm -f $@

diff --git a/nss_db-selinux.patch b/nss_db-selinux.patch
index a8fdaf9ae2a227dd92af673804feceb773f76ea7..cc4b4995c3789adec0f2fd559f70bee5b5323321 100644 (file)
--- a/nss_db-selinux.patch
+++ b/nss_db-selinux.patch
@@ -55,8 +55,8 @@ Note that this does *not* change the context of existing files.
  AC_SUBST(slibdir)
  
  dnl Internationalization macros.
---- nss_db-2.2.3pre1/src/Makefile.am~  2010-02-22 19:20:49.000000000 +0200
-+++ nss_db-2.2.3pre1/src/Makefile.am   2010-02-22 19:22:25.691737306 +0200
+--- nss_db-2.2.3pre1/Makefile.am~      2010-02-22 19:20:49.000000000 +0200
++++ nss_db-2.2.3pre1/Makefile.am       2010-02-22 19:22:25.691737306 +0200
 @@ -30,7 +30,7 @@
  
  bin_PROGRAMS = makedb
@@ -66,8 +66,8 @@ Note that this does *not* change the context of existing files.
  
  # To mimmick the old glibc installation as closely as possible, we
  # shuffle the installed library and the links to it around a bit,
---- nss_db-2.2.3/src/makedb.c  2004-10-20 13:52:02.814327392 -0400
-+++ nss_db-2.2.3/src/makedb.c  2004-10-20 14:06:07.605899552 -0400
+--- nss_db-2.2.3/makedb.c      2004-10-20 13:52:02.814327392 -0400
++++ nss_db-2.2.3/makedb.c      2004-10-20 14:06:07.605899552 -0400
 @@ -32,6 +32,10 @@
  #include <string.h>
  #include <sys/stat.h>

diff --git a/nss_db.spec b/nss_db.spec
index 16bd7727b3d225e88c06cb7ecadacaa0d4ea8c1f..1bdb6dc5066b5691e2909a5c2f31eef6cd39ab96 100644 (file)
--- a/nss_db.spec
+++ b/nss_db.spec
@@ -1,23 +1,23 @@
 # TODO
 # - new usptream: http://sourceforge.net/projects/nssdb/
 #   see http://www.linux-archive.org/development-discussions-related-fedora-devel-lists-fedoraproject-org/546891-nss_db.html
+# - think of how to install with glibc 2.15
 # 4.8 makes libpthread a hard requirement
 # 4.7 has a heavier footprint
 %define                db_version      4.6.21
 
-%define                subver          pre1
-%define                rel                     11
 Summary:       Berkeley DB Name Service Switch Module
 Summary(pl.UTF-8):     Moduł NSS do baz db
 Name:          nss_db
-Version:       2.2.3
-Release:       0.%{subver}.%{rel}
+Version:       2.5
+Release:       0.1
 # DB is under the Sleepycat (Oracle) license.
 # nss_db is under the LGPLv2+ license.
 License:       Sleepycat and LGPL v2+
 Group:         Base
-Source0:       ftp://sources.redhat.com/pub/glibc/old-releases/%{name}-%{version}%{subver}.tar.gz
-# Source0-md5: b4440ba2865d28e9068e465426c19ede
+URL:           http://sourceforge.net/projects/nssdb/
+Source0:       http://downloads.sourceforge.net/nssdb/%{name}-%{version}.tar.gz
+# Source0-md5: 5216e844559cd5aad1823f8de2269bf6
 Source1:       http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 # Source1-md5: 718082e7e35fc48478a2334b0bc4cd11
 Patch0:                %{name}-chmod_644.patch
@@ -62,18 +62,18 @@ To jest nss_db, moduł do serwisu nazw, który może być używany z
 glibc-2.2.x.
 
 %prep
-%setup -q -n %{name}-%{version}%{subver} -a1
+%setup -q -a1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch2 -p1 # seems obsolete
+#%patch3 -p1 # obsolete
+#%patch4 -p1 obsolete
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+#%patch7 -p1 applied
+#%patch8 -p1 applied
+#%patch9 -p1 applied
+#%patch10 -p1 applied
 %patch11 -p1
 
 mkdir db-build
@@ -118,9 +118,9 @@ echo db_cv_mutex=UNIX/fcntl > config.cache
 %{__make} install
 cd ..
 
-%{__gettextize}
+#%{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}