Accepting request 506885 from home:scarabeus_iv:branches:devel:libraries:c_c++

- Version update to 1.13:
  * Various few fixes
- Cleanup the spec a bit
- Refresh patch gdbm-no-build-date.patch
- Remove chinese language support patched in house, if anything it
  should be merged in the upstream git repo
- Drop the ndbm compats as it is not provided by any other distro

OBS-URL: https://build.opensuse.org/request/show/506885
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gdbm?expand=0&rev=40

.gitattributes

@@ -21,5 +21,3 @@
 *.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

gdbm-1.12.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d97b2166ee867fd6ca5c022efee80702d6f30dd66af0e03ed092285c3af9bcea
-size 841213

gdbm-1.12.tar.gz.sig

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.15 (GNU/Linux)
-
-iEYEABECAAYFAlc6LZUACgkQNgKwf1XQxzJyxQCeJGERmrV5hLA9gyIkBYJIBfD7
-6agAoI1g/meiN8NTYQlrPInjeWuQdjKr
-=CQ3h
------END PGP SIGNATURE-----

gdbm-1.13.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253
+size 891987

gdbm-1.13.tar.gz.sig

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.15 (GNU/Linux)
+
+iEYEABECAAYFAljEKKgACgkQNgKwf1XQxzJI/gCgneIHAy4tfcEhzuNLeVE4PO+D
+TxcAoKNkmTk5PwNBHSbsOI8sanQop+F/
+=R+s2
+-----END PGP SIGNATURE-----

gdbm-no-build-date.patch

@@ -5,7 +5,7 @@ Index: src/version.c
 @@ -25,9 +25,6 @@
     making the distdir. */
  const char * gdbm_version = "GDBM version " PACKAGE_VERSION ". "
- "16/05/2016"
+ "11/03/2017"
 -#if defined(__STDC__) && defined(__DATE__) && defined(__TIME__)
 -		" (built " __DATE__ " " __TIME__ ")"
 -#endif

gdbm.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jun 28 14:20:34 UTC 2017 - tchvatal@suse.com
+
+- Version update to 1.13:
+  * Various few fixes
+- Cleanup the spec a bit
+- Refresh patch gdbm-no-build-date.patch
+- Remove chinese language support patched in house, if anything it
+  should be merged in the upstream git repo
+- Drop the ndbm compats as it is not provided by any other distro
+
 -------------------------------------------------------------------
 Wed May 18 18:04:35 UTC 2016 - mpluskal@suse.com
 

gdbm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gdbm
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,26 +18,22 @@
 
 %define lname	libgdbm4
 Name:           gdbm
-Version:        1.12
+Version:        1.13
 Release:        0
 Summary:        GNU dbm key/data database
 License:        GPL-3.0+
 Group:          System/Libraries
-Url:            https://www.gnu.org.ua/software/gdbm/
+Url:            https://www.gnu.org/software/gdbm/
 Source0:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
 Source2:        baselibs.conf
-# ENHANCE-FOR-UPSTREM i@marguerite.su - add zh_CN translation. And I'll submit it to upstream.
-Source3:        zh_CN.gmo
 Source4:        %{name}.keyring
-# FIX-FOR-UPSTREAM i@marguerite.su - remove the build date from src/version.c
+# PATCH-FIX-SUSE: remove the build date from src/version.c
 Patch4:         gdbm-no-build-date.patch
-BuildRequires:  autoconf >= 2.63
-BuildRequires:  automake >= 1.11
 BuildRequires:  libtool
 BuildRequires:  makeinfo
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-#!BuildIgnore: man
+%lang_package
 
 %description
 GNU dbm is a library of database functions that use extensible
@@ -53,13 +49,11 @@ and retrieving the data by its key and deleting a key along with its
 data. It also supports sequential iteration over all key/data pairs in
 a database.
 
-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-3.0+
 Group:          System/Libraries
+Recommends:     %{name}-lang = %{version}
 # O/P added in 12.2
 Obsoletes:      gdbm < %{version}-%{release}
 Provides:       gdbm = %{version}-%{release}
@@ -78,12 +72,9 @@ and retrieving the data by its key and deleting a key along with its
 data. It also supports sequential iteration over all key/data pairs in
 a database.
 
-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-3.0+ and LGPL-2.1+
+License:        GPL-3.0+ AND LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Requires:       gdbm = %{version}
 Requires(postun): %{install_info_prereq}
@@ -99,13 +90,8 @@ to develop applications that require these.
 %patch4
 
 %build
-aclocal
-autoreconf -fiv
-%ifarch sparc64
-export CC="gcc -m64"
-%endif
-export CFLAGS="%{optflags} -Wa,--noexecstack"
 %configure \
+  --disable-static \
   --disable-silent-rules \
   --enable-libgdbm-compat
 make %{?_smp_mflags}
@@ -114,33 +100,22 @@ make %{?_smp_mflags}
 make check %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%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 )" > %{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 )" > %{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
-# do not ship these
 find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name}
 
 %post devel
-%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
 %preun devel
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
 %post -n %{lname} -p /sbin/ldconfig
 %postun -n %{lname} -p /sbin/ldconfig
 
-%files -n %{lname} -f %{name}.lang
+%files lang -f %{name}.lang
-%defattr(-,root,root)
+
+%files -n %{lname}
 %doc COPYING README NEWS
 %{_libdir}/libgdbm.so.4
 %{_libdir}/libgdbm.so.4.0.0
@@ -148,18 +123,13 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/libgdbm_compat.so.4.0.0
 
 %files devel
-%defattr(-,root,root)
 %{_bindir}/*
 %{_includedir}/dbm.h
 %{_includedir}/gdbm.h
 %{_includedir}/ndbm.h
 %{_infodir}/gdbm.info%{ext_info}
-%{_libdir}/libgdbm.a
 %{_libdir}/libgdbm.so
-%{_libdir}/libgdbm_compat.a
 %{_libdir}/libgdbm_compat.so
-%{_libdir}/libndbm.a
-%{_libdir}/libndbm.so
 %{_mandir}/man1/*%{ext_man}
 %{_mandir}/man3/gdbm.3%{ext_man}
 

zh_CN.gmo

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d33b6a30150d94b457854a149f61218b1ddc96fbbcb875e1ac23d0af77bff228
-size 9770