From 6c04dfc90470f2f69e8b4c15d5f846e88dfef8705fcbe133a0176846ecac8821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 25 Sep 2012 13:47:24 +0000 Subject: [PATCH] Accepting request 135590 from home:MargueriteSu updated baselibs.conf. sorry I forgot it. OBS-URL: https://build.opensuse.org/request/show/135590 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gdbm?expand=0&rev=23 --- .gitattributes | 2 + baselibs.conf | 4 +- gdbm-1.10.tar.gz | 3 + gdbm-1.8.3-no-build-date.patch | 14 --- gdbm-1.8.3.dif | 117 ---------------------- gdbm-1.8.3.tar.bz2 | 3 - gdbm-fix_testprogs.patch | 138 -------------------------- gdbm-no-build-date.patch | 17 ++++ gdbm-protoize_dbm_headers.patch | 114 --------------------- gdbm-prototype_static_functions.patch | 11 -- gdbm.changes | 30 ++++++ gdbm.spec | 86 ++++++++-------- zh_CN.gmo | 3 + 13 files changed, 96 insertions(+), 446 deletions(-) create mode 100644 gdbm-1.10.tar.gz delete mode 100644 gdbm-1.8.3-no-build-date.patch delete mode 100644 gdbm-1.8.3.dif delete mode 100644 gdbm-1.8.3.tar.bz2 delete mode 100644 gdbm-fix_testprogs.patch create mode 100644 gdbm-no-build-date.patch delete mode 100644 gdbm-protoize_dbm_headers.patch delete mode 100644 gdbm-prototype_static_functions.patch create mode 100644 zh_CN.gmo diff --git a/.gitattributes b/.gitattributes index 9b03811..7a88be3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +zh_CN.gmo filter=lfs diff=lfs merge=lfs -text diff --git a/baselibs.conf b/baselibs.conf index 9dcecc8..b187e5c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libgdbm3 +libgdbm4 gdbm-devel requires -gdbm- - requires "libgdbm3- = " + requires "libgdbm4- = " diff --git a/gdbm-1.10.tar.gz b/gdbm-1.10.tar.gz new file mode 100644 index 0000000..d1585bc --- /dev/null +++ b/gdbm-1.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26db773441 +size 655599 diff --git a/gdbm-1.8.3-no-build-date.patch b/gdbm-1.8.3-no-build-date.patch deleted file mode 100644 index 5dea7b1..0000000 --- a/gdbm-1.8.3-no-build-date.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: version.c -=================================================================== ---- version.c.orig 2002-10-16 00:00:42.000000000 +0200 -+++ version.c 2010-08-30 01:41:23.653696000 +0200 -@@ -29,8 +29,4 @@ - #include "autoconf.h" - - /* Keep a string with the version number in it! */ --const char * gdbm_version = "GDBM version 1.8.3. 10/15/2002" --#if defined(__STDC__) && defined(__DATE__) && defined(__TIME__) -- " (built " __DATE__ " " __TIME__ ")" --#endif -- ; -+const char * gdbm_version = "GDBM version 1.8.3. 10/15/2002"; diff --git a/gdbm-1.8.3.dif b/gdbm-1.8.3.dif deleted file mode 100644 index 9ce4058..0000000 --- a/gdbm-1.8.3.dif +++ /dev/null @@ -1,117 +0,0 @@ ---- gdbmopen.c -+++ gdbmopen.c 2005/08/23 08:25:23 -@@ -212,7 +212,7 @@ - file_block_size = block_size; - - /* Get space for the file header. */ -- dbf->header = (gdbm_file_header *) malloc (file_block_size); -+ dbf->header = (gdbm_file_header *) calloc (1, file_block_size); - if (dbf->header == NULL) - { - gdbm_close (dbf); ---- gdbmreorg.c -+++ gdbmreorg.c 2005/08/24 16:07:12 -@@ -112,7 +112,7 @@ - - /* Get the mode for the old file and open the new database. */ - fstat (dbf->desc, &fileinfo); -- new_dbf = gdbm_open (new_name, dbf->header->block_size, GDBM_WRCREAT, -+ new_dbf = gdbm_open (new_name, dbf->header->block_size, GDBM_NEWDB, - fileinfo.st_mode, dbf->fatal_err); - - if (new_dbf == NULL) ---- Makefile.in -+++ Makefile.in 2005/08/23 08:25:23 -@@ -15,8 +15,8 @@ - INSTALL_DATA = @INSTALL_DATA@ - - # File ownership and group --BINOWN = bin --BINGRP = bin -+BINOWN = root -+BINGRP = root - - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi -@@ -130,22 +130,23 @@ - $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ - $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ - $(INSTALL_ROOT)$(infodir) -- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ -+ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la \ -+ $(INSTALL_ROOT)$(libdir)/libgdbm.la -+ $(INSTALL_DATA) gdbm.h \ - $(INSTALL_ROOT)$(includedir)/gdbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ -+ $(INSTALL_DATA) $(srcdir)/gdbm.3 \ - $(INSTALL_ROOT)$(man3dir)/gdbm.3 -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ -+ $(INSTALL_DATA) $(srcdir)/gdbm.info \ - $(INSTALL_ROOT)$(infodir)/gdbm.info - - install-compat: - $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ - $(INSTALL_ROOT)$(includedir) -- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ -+ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \ - $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ -+ $(INSTALL_DATA) $(srcdir)/dbm.h \ - $(INSTALL_ROOT)$(includedir)/dbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ -+ $(INSTALL_DATA) $(srcdir)/ndbm.h \ - $(INSTALL_ROOT)$(includedir)/ndbm.h - - #libgdbm.a: $(OBJS) gdbm.h -@@ -172,10 +173,10 @@ - chmod -w gdbm.h - - testgdbm: testgdbm.o libgdbm.la @LIBOBJS@ -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ - - testdbm: testdbm.o libgdbm.la libgdbm_compat.la -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la - - tdbm: testdbm.o - $(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS) -@@ -184,7 +185,7 @@ - $(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c - - testndbm: testndbm.o libgdbm.la libgdbm_compat.la -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la - - tndbm.o: testndbm.c - cp $(srcdir)/testndbm.c ./tndbm.c -@@ -195,7 +196,7 @@ - $(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS) - - conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@ -- $(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@ - - lintgdbm: - lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c ---- systems.h -+++ systems.h 2005/08/23 08:25:23 -@@ -23,7 +23,7 @@ - Computer Science Department - Western Washington University - Bellingham, WA 98226 -- -+ - *************************************************************************/ - - -@@ -61,7 +61,7 @@ - - /* Do we have flock? (BSD...) */ - --#if HAVE_FLOCK -+#if HAVE_FLOCK && !HAVE_FCNTL_H - - #ifndef LOCK_SH - #define LOCK_SH 1 diff --git a/gdbm-1.8.3.tar.bz2 b/gdbm-1.8.3.tar.bz2 deleted file mode 100644 index 5bfb4c1..0000000 --- a/gdbm-1.8.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2d4cf369018d64585c2c28e0fb4448becb2ad7dc288cab14b80def3144a747b -size 172773 diff --git a/gdbm-fix_testprogs.patch b/gdbm-fix_testprogs.patch deleted file mode 100644 index 4741fec..0000000 --- a/gdbm-fix_testprogs.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- testdbm.c -+++ testdbm.c -@@ -31,6 +31,9 @@ - #include "autoconf.h" - - #include -+#if HAVE_STRING_H -+#include -+#endif - #include - #if HAVE_STDLIB_H - #include -@@ -39,19 +42,15 @@ - #include - #endif - #include -+#ifdef GNU -+#include "dbm.h" -+#else -+#include -+#endif - - #define TRUE 1 - #define FALSE 0 - --typedef struct { -- char *dptr; -- int dsize; --} datum; -- --extern datum fetch (); --extern datum firstkey (); --extern datum nextkey (); -- - /* The test program allows one to call all the routines plus the hash function. - The commands are single letter commands. The user is prompted for all other - information. The commands are q (quit), f (fetch), s (store), d (delete), -@@ -123,7 +122,7 @@ - - case 'f': - printf ("key -> "); -- gets (key_line); -+ fgets (key_line, sizeof(key_line), stdin); - key_data.dptr = key_line; - key_data.dsize = strlen (key_line)+1; - return_data = fetch (key_data); -@@ -135,11 +134,11 @@ - - case 's': - printf ("key -> "); -- gets (key_line); -+ fgets (key_line, sizeof(key_line), stdin); - key_data.dptr = key_line; - key_data.dsize = strlen (key_line)+1; - printf ("data -> "); -- gets (data_line); -+ fgets (data_line, sizeof(data_line), stdin); - data_data.dsize = strlen (data_line)+1; - if (store (key_data, data_data) != 0) - printf ("Item not inserted. \n"); -@@ -148,7 +147,7 @@ - - case 'd': - printf ("key -> "); -- gets (key_line); -+ fgets (key_line, sizeof(key_line), stdin); - key_data.dptr = key_line; - key_data.dsize = strlen (key_line)+1; - if (delete (key_data) != 0) ---- testgdbm.c -+++ testgdbm.c -@@ -37,10 +37,22 @@ - - #include "getopt.h" - -+#if defined(__GNUC__) && __GNUC__ >=3 -+# define NORETURN __attribute__((__noreturn__)) -+#else -+# define NORETURN -+#endif -+ - extern const char * gdbm_version; - - extern const char *gdbm_strerror __P((gdbm_error)); - -+void print_bucket __P((hash_bucket *bucket, char *mesg)); -+void _gdbm_print_avail_list __P((gdbm_file_info *dbf)); -+void _gdbm_print_bucket_cache __P((gdbm_file_info *dbf)); -+void usage __P((char *)) NORETURN; -+ -+ - gdbm_file_info *gdbm_file; - - /* Debug procedure to print the contents of the current hash bucket. */ ---- testndbm.c -+++ testndbm.c -@@ -42,6 +42,9 @@ - #if HAVE_FCNTL_H - #include - #endif -+#if HAVE_STRING_H -+#include -+#endif - #ifdef GNU - #include "ndbm.h" - #else -@@ -120,7 +123,7 @@ - - case 'f': - printf ("key -> "); -- gets (key_line); -+ fgets (key_line, sizeof(key_line), stdin); - key_data.dptr = key_line; - key_data.dsize = strlen (key_line)+1; - return_data = dbm_fetch (dbm_file, key_data); -@@ -132,11 +135,11 @@ - - case 's': - printf ("key -> "); -- gets (key_line); -+ fgets (key_line, sizeof(key_line), stdin); - key_data.dptr = key_line; - key_data.dsize = strlen (key_line)+1; - printf ("data -> "); -- gets (data_line); -+ fgets (data_line, sizeof(data_line), stdin); - data_data.dsize = strlen (data_line)+1; - if (dbm_store (dbm_file, key_data, data_data, DBM_REPLACE) != 0) - printf ("Item not inserted. \n"); -@@ -145,7 +148,7 @@ - - case 'd': - printf ("key -> "); -- gets (key_line); -+ fgets (key_line, sizeof(key_line), stdin); - key_data.dptr = key_line; - key_data.dsize = strlen (key_line)+1; - if (dbm_delete (dbm_file, key_data) != 0) diff --git a/gdbm-no-build-date.patch b/gdbm-no-build-date.patch new file mode 100644 index 0000000..6ea3f0a --- /dev/null +++ b/gdbm-no-build-date.patch @@ -0,0 +1,17 @@ +diff -urN gdbm-1.10.orig/src/version.c gdbm-1.10/src/version.c +--- gdbm-1.10.orig/src/version.c 2012-09-23 16:12:24.331788076 +0800 ++++ gdbm-1.10/src/version.c 2012-09-23 16:24:17.517221527 +0800 +@@ -24,11 +24,8 @@ + The DIST_DATE magic below is replaced by the actual date when + making the distdir. */ + const char * gdbm_version = "GDBM version " PACKAGE_VERSION ". " +-"13/11/2011" +-#if defined(__STDC__) && defined(__DATE__) && defined(__TIME__) +- " (built " __DATE__ " " __TIME__ ")" +-#endif +-; ++"13/11/2011"; ++ + int const gdbm_version_number[3] = { + GDBM_VERSION_MAJOR, + GDBM_VERSION_MINOR, diff --git a/gdbm-protoize_dbm_headers.patch b/gdbm-protoize_dbm_headers.patch deleted file mode 100644 index ada75dd..0000000 --- a/gdbm-protoize_dbm_headers.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- dbm.h -+++ dbm.h -@@ -1,7 +1,7 @@ - /* dbm.h - The include file for dbm users. */ - - /* This file is part of GDBM, the GNU data base manager, by Philip A. Nelson. -- Copyright (C) 1990, 1991, 1993 Free Software Foundation, Inc. -+ Copyright (C) 1990, 1991, 1993, 2008 Free Software Foundation, Inc. - - GDBM is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -32,21 +32,31 @@ - int dsize; - } datum; - -+/* The file information header. This is good enough for most applications. */ -+typedef struct {int dummy[10];} DBM; - --/* These are the routines in dbm. */ - --extern int dbminit (); -+/* Determine if the C(++) compiler requires complete function prototype */ -+#ifndef __P -+#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) -+#define __P(x) x -+#else -+#define __P(x) () -+#endif -+#endif -+ -+/* These are the routines in dbm. */ - --extern datum fetch (); -+extern int dbminit __P((char *file)); - --extern int store (); -+extern datum fetch __P((datum key)); - --extern int delete (); -+extern int store __P((datum key, datum content)); - --extern int delete (); -+extern int delete __P((datum key)); - --extern datum firstkey (); -+extern datum firstkey __P((void)); - --extern datum nextkey (); -+extern datum nextkey __P((datum key)); - --extern int dbmclose (); -+extern int dbmclose __P((void)); ---- ndbm.h -+++ ndbm.h -@@ -1,7 +1,7 @@ - /* ndbm.h - The include file for ndbm users. */ - - /* This file is part of GDBM, the GNU data base manager, by Philip A. Nelson. -- Copyright (C) 1990, 1991, 1993 Free Software Foundation, Inc. -+ Copyright (C) 1990, 1991, 1993, 2008 Free Software Foundation, Inc. - - GDBM is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -41,31 +41,39 @@ - /* The file information header. This is good enough for most applications. */ - typedef struct {int dummy[10];} DBM; - -+/* Determine if the C(++) compiler requires complete function prototype */ -+#ifndef __P -+#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) -+#define __P(x) x -+#else -+#define __P(x) () -+#endif -+#endif - - /* These are the routines (with some macros defining them!) */ - --extern DBM *dbm_open (); -+extern DBM *dbm_open __P((char *file, int flags, int mode)); - --extern void dbm_close (); -+extern void dbm_close __P((DBM *dbf)); - --extern datum dbm_fetch (); -+extern datum dbm_fetch __P((DBM *dbf, datum key)); - --extern int dbm_store (); -+extern int dbm_store __P((DBM *dbf, datum key, datum content, int flags)); - --extern int dbm_delete (); -+extern int dbm_delete __P((DBM *dbf, datum key)); - --extern int dbm_delete (); -+extern int dbm_delete __P((DBM *dbf, datum key)); - --extern datum dbm_firstkey (); -+extern datum dbm_firstkey __P((DBM *)); - --extern datum dbm_nextkey (); -+extern datum dbm_nextkey __P((DBM *)); - - #define dbm_error(dbf) (0) - - #define dbm_clearerr(dbf) - --extern int dbm_dirfno (); -+extern int dbm_dirfno __P((DBM *dbf)); - --extern int dbm_pagfno (); -+extern int dbm_pagfno __P((DBM *dbf)); - --extern int dbm_rdonly (); -+extern int dbm_rdonly __P((DBM *dbf)); diff --git a/gdbm-prototype_static_functions.patch b/gdbm-prototype_static_functions.patch deleted file mode 100644 index 88d6591..0000000 --- a/gdbm-prototype_static_functions.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gdbmseq.c -+++ gdbmseq.c -@@ -41,6 +41,8 @@ - at ELEM_LOC of the current bucket and using RETURN_VAL as the place to - put the data that is found. */ - -+static void get_next_key __P((gdbm_file_info *, int, datum *)); -+ - static void - get_next_key (dbf, elem_loc, return_val) - gdbm_file_info *dbf; diff --git a/gdbm.changes b/gdbm.changes index 69ba5fc..6ea4ef0 100644 --- a/gdbm.changes +++ b/gdbm.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Sep 24 07:44:41 UTC 2012 - i@marguerite.su + +- update baselibs.conf + +------------------------------------------------------------------- +Sun Sep 23 07:43:08 UTC 2012 - i@marguerite.su + +- update to 1.10 + * fully internationalized. available in Finnish + ,German, Japanese, Polish and Ukrainian + * Support for close-on-exec flag in gdbm_open (see GDBM_CLOEXEC in the docs) + * Improved testgdbm command system + * Fixed Bug #150, should handle read(2) returning less data + * Fixed Bug #151, uses uninitialized memory content + * Fixed handling of NDBM databases in read-only mode +- add zh_CN translation + * manually add. will submit to upstream. +- drop gdbm-1.8.3.diff (Patch0) + * seems this one is useless. +- regenerate and change gdbm-1.8.3-no-build-date.patch (Patch4) to + gdbm-no-build-date.patch + * its an universal solution no matter the version. +- drop gdbm-protoize_dbm_headers.patch (Patch1) + * upstream fixed. +- drop gdbm-prototype_static_functions.patch (Patch2) + * upstream fixed. +- drop gdbm-fix_testprogs.patch (Patch3) + * upstream code change. now useless. + ------------------------------------------------------------------- Fri Mar 2 12:56:37 UTC 2012 - andrea.turrini@gmail.com diff --git a/gdbm.spec b/gdbm.spec index 48f0429..fefda4c 100644 --- a/gdbm.spec +++ b/gdbm.spec @@ -17,7 +17,7 @@ Name: gdbm -%define lname libgdbm3 +%define lname libgdbm4 Url: http://directory.fsf.org/GNU/gdbm.html #!BuildIgnore: man # bug437293 @@ -25,20 +25,19 @@ Url: http://directory.fsf.org/GNU/gdbm.html Obsoletes: gdbm-64bit %endif # -Version: 1.8.3 +Version: 1.10 Release: 0 -Summary: GNU dbm key/data database License: GPL-2.0+ +Summary: GNU dbm key/data database Group: System/Libraries -Source: ftp://prep.ai.mit.edu/gnu/gdbm/gdbm-%{version}.tar.bz2 +Source: ftp://prep.ai.mit.edu/gnu/gdbm/gdbm-%{version}.tar.gz Source2: baselibs.conf -Patch: gdbm-%{version}.dif -Patch1: gdbm-protoize_dbm_headers.patch -Patch2: gdbm-prototype_static_functions.patch -Patch3: gdbm-fix_testprogs.patch -Patch4: gdbm-1.8.3-no-build-date.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# ENHANCE-FOR-UPSTREM i@marguerite.su - add zh_CN translation. And I'll submit it to upstream. +Source3: zh_CN.gmo +# FIX-FOR-UPSTREAM i@marguerite.su - remove the build date from src/version.c +Patch4: gdbm-no-build-date.patch BuildRequires: libtool +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU dbm is a library of database functions that use extensible @@ -58,12 +57,12 @@ For compatibility with programs using old UNIX dbm functions, the package also provides traditional dbm and ndbm interfaces. %package -n %lname -Summary: GNU dbm key/data database License: GPL-2.0+ +Summary: GNU dbm key/data database Group: System/Libraries # O/P added in 12.2 -Obsoletes: gdbm < %version-%release -Provides: gdbm = %version-%release +Obsoletes: gdbm < %{version}-%{release} +Provides: gdbm = %{version}-%{release} %description -n %lname GNU dbm is a library of database functions that use extensible @@ -83,12 +82,12 @@ For compatibility with programs using old UNIX dbm functions, the package also provides traditional dbm and ndbm interfaces. %package devel -Summary: Include Files and Libraries mandatory for Development License: GPL-2.0+ ; LGPL-2.1+ +Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ +Requires(pre): %install_info_prereq Requires: gdbm = %{version} Provides: gdbm:/usr/lib/libgdbm.so -PreReq: %install_info_prereq # bug437293 %ifarch ppc64 Obsoletes: gdbm-devel-64bit @@ -99,20 +98,9 @@ Obsoletes: gdbm-devel-64bit This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - Jason Downs - Phil Nelson - %prep %setup -q -%patch -%patch1 -%patch2 -%patch3 -%patch4 +%patch4 -p1 %build aclocal @@ -120,46 +108,50 @@ autoreconf --force --install %ifarch sparc64 export CC="gcc -m64" %endif -export CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack" -%configure +export CFLAGS="%{optflags} -Wa,--noexecstack" +%configure --enable-libgdbm-compat make %{?_smp_mflags}; %install -make install INSTALL_ROOT=$RPM_BUILD_ROOT -make install-compat INSTALL_ROOT=$RPM_BUILD_ROOT +%make_install echo "/* GNU ld script Use the shared library, but some functions are only in the static library, so try that secondarily. */ -GROUP ( %_libdir/libgdbm.so %_libdir/libgdbm_compat.so )" > $RPM_BUILD_ROOT/%{_libdir}/libndbm.so +GROUP ( %{_libdir}/libgdbm.so %{_libdir}/libgdbm_compat.so )" > %{buildroot}/%{_libdir}/libndbm.so echo "/* GNU ld script Use the shared library, but some functions are only in the static library, so try that secondarily. */ -GROUP ( %_libdir/libgdbm.a %_libdir/libgdbm_compat.a )" > $RPM_BUILD_ROOT/%{_libdir}/libndbm.a +GROUP ( %{_libdir}/libgdbm.a %{_libdir}/libgdbm_compat.a )" > %{buildroot}/%{_libdir}/libndbm.a + +mkdir -p %{buildroot}%{_datadir}/locale/zh_CN/LC_MESSAGES/ +cp -r %{SOURCE3} %{buildroot}%{_datadir}/locale/zh_CN/LC_MESSAGES/%{name}.mo +%find_lang %{name} %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig -%files -n %lname +%files -n %lname -f %{name}.lang %defattr(-,root,root) %doc COPYING README NEWS -%_libdir/libgdbm.so.3 -%_libdir/libgdbm.so.3.0.0 -%_libdir/libgdbm_compat.so.3 -%_libdir/libgdbm_compat.so.3.0.0 +%{_libdir}/libgdbm.so.4 +%{_libdir}/libgdbm.so.4.0.0 +%{_libdir}/libgdbm_compat.so.4 +%{_libdir}/libgdbm_compat.so.4.0.0 %files devel %defattr(-,root,root) -%{_prefix}/include/dbm.h -%{_prefix}/include/gdbm.h -%{_prefix}/include/ndbm.h +%{_bindir}/testgdbm +%{_includedir}/dbm.h +%{_includedir}/gdbm.h +%{_includedir}/ndbm.h %{_infodir}/gdbm.info.gz -%{_prefix}/%{_lib}/libgdbm.a -%{_prefix}/%{_lib}/libgdbm.so -%{_prefix}/%{_lib}/libgdbm_compat.a -%{_prefix}/%{_lib}/libgdbm_compat.so -%{_prefix}/%{_lib}/libndbm.a -%{_prefix}/%{_lib}/libndbm.so +%{_libdir}/libgdbm.a +%{_libdir}/libgdbm.so +%{_libdir}/libgdbm_compat.a +%{_libdir}/libgdbm_compat.so +%{_libdir}/libndbm.a +%{_libdir}/libndbm.so %{_mandir}/man3/gdbm.3.gz %exclude %{_libdir}/*.la diff --git a/zh_CN.gmo b/zh_CN.gmo new file mode 100644 index 0000000..dcb4e57 --- /dev/null +++ b/zh_CN.gmo @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d33b6a30150d94b457854a149f61218b1ddc96fbbcb875e1ac23d0af77bff228 +size 9770