Accepting request 212058 from network:ldap

- Update to new upstream release 0.3.0.1

OBS-URL: https://build.opensuse.org/request/show/212058
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ding-libs?expand=0&rev=11
This commit is contained in:
Stephan Kulow 2013-12-31 09:03:20 +00:00 committed by Git OBS Bridge
commit 177b839de0
8 changed files with 173 additions and 37 deletions

View File

@ -0,0 +1,29 @@
From 0b17e2b77e41c668afcc52aff853ac95c0a98a0e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 19 Dec 2013 12:03:31 +0100
Subject: [PATCH] build: add missing Requires to pkgconfig file
Status: acked-upstream
ini_comment.h uses simplebuffer.h, therefore must Require
basicobjects which provides that. Similarly, ini_valueobj.h uses
ref_array.h and must therefore Require ref_array.
---
ini/ini_config.pc.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ini/ini_config.pc.in b/ini/ini_config.pc.in
index 600d39a..66af169 100644
--- a/ini/ini_config.pc.in
+++ b/ini/ini_config.pc.in
@@ -6,6 +6,7 @@ includedir=@includedir@
Name: ini_config
Description: Library to process config files in INI format into a libcollection data structure
Version: @INI_CONFIG_VERSION@
-Libs: -L${libdir} -lini_config -lcollection
+Requires: basicobjects ref_array collection
+Libs: -L${libdir} -lini_config
Cflags: -I${includedir}
URL: http://fedorahosted.org/sssd/
--
1.8.4

View File

@ -1,3 +1,7 @@
libbasicobjects0
libbasicobjects-devel
requires -libbasicobjects-<targettype>
requires "libbasicobjects0-<targettype> = <version>"
libpath_utils1
libpath_utils-devel
requires -libpath_utils-<targettype>
@ -14,7 +18,7 @@ libref_array1
libref_array-devel
requires -libref_array-<targettype>
requires "libref_array1-<targettype> = <version>"
libini_config2
libini_config3
libini_config-devel
requires -libini_config-<targettype>
requires "libini_config2-<targettype> = <version>"
requires "libini_config3-<targettype> = <version>"

View File

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

3
ding-libs-0.3.0.1.tar.gz Normal file
View File

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

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (GNU/Linux)
iQEcBAABAgAGBQJRVWxDAAoJEIt9rsOQrGg0nfUH+wVRdRUdn2H1a8PPK0pLI2BU
Pp56ZDanu+9XwOJiGh7cMceRpQl7vgoGX9q7ix9ZNDdIVFBfcjnSJziFBisHEBHE
NYdM/7qbVyOF0KlzFCAh7vYbpxXUVNR1r8zUPTsqHLqyhBZzphAM/JeNgBVCS+6+
/yRqGOiuLhjY0ykdzNVKbMWMCsSJzqxVeKDzGK6r5uRDwy3x2z3ojuXf+Hgaor31
XaAhFzAmSM1Igeh/Hau7FFIkt09liUW6HS9ObAmD0UzciRYILV9orXye1Bi9cDl/
BmXF7fxQKpDYwtMXNnbZWkrNYFLLHGzeAVUUrI1Cu5AYLVT59ZTjUfz+HVtRbI8=
=pPIa
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Aug 8 01:31:44 UTC 2013 - jengelh@inai.de
- Update to new upstream release 0.3.0.1
* A new libini_config interface (merging config section,
better handling of metadata)
- Optional signature verification
- Add 0001-build-add-missing-Requires-to-pkgconfig-file.patch
for corrected pkgconfig dependencies
-------------------------------------------------------------------
Sun Mar 11 19:24:54 UTC 2012 - jengelh@medozas.de

34
ding-libs.keyring Normal file
View File

@ -0,0 +1,34 @@
pub 2048R/90AC6834 2013-03-27
uid Ondrej Kos (Red Hat Inc.) <okos@redhat.com>
sub 2048R/2584B9BB 2013-03-27
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.19 (GNU/Linux)
mQENBFFTH/kBCACprCHZYDAaciTV1qV6o572LOOe/9tT78XOvHEMY+HG8p+d0/Sb
QIP4dI7agBS6UokJNiPurvpWBEWWSSGRu3/M54cZqeSuXG9c1lcCzQ7836MAqLrJ
5A1JPQmNDWVY+F1EvUaK6AXrQmkDTo2tn9JUt9WVSnf5BsehO8h8opbgIJw+UtcC
gxTdRiO3tCeuv+E6wqIblx27B1tOrUCy+Y4+nJc/JZgR//9qca2q/+Obgbuf6f7p
Hmb/CSZKR6XQgCNh0mbE7U+lJcTw4gUaGiKGLop3+8yo6rGCmhaRA7dJMxduAmsP
vNVYMOtXRPZ2W0lBJayW6GMIspSf/futplAzABEBAAG0K09uZHJlaiBLb3MgKFJl
ZCBIYXQgSW5jLikgPG9rb3NAcmVkaGF0LmNvbT6JATgEEwECACIFAlFTH/kCGwMG
CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEIt9rsOQrGg0JmoIAJH2Q/Ih+E9c
tavw5JjeugWhJUSAA+fhpDgz6jO39nodAA6ZniQeHuyO36xJfaOAjRM3QQXaoyPk
Ye8WdlJtmXZg/5mUA6rNd4i40NhNbrbQ/qF/Rut7xqbxydC6ynPQUyJOwtyy8kR0
pREL++f6tj/pvDAj9+jrsVW8flfjG1Yk3gGcV04ldvSiuVdq53jdv+pJyTmhdD4J
nZE0+e3Z63LCIyELAcoyfRpJK4aViuK6bKaV92VTx3Sf1OaUyywt9pkk3BO/Cc0a
VL7GsrVmJfcJlbvAbCVtzWJVBnHL/pMX8OiYGSSdaD6OlHOgAStjnaJVbhElDo/f
wSfClP4ht3y5AQ0EUVMf+QEIAJyvY5hOcy5OuJQD/Hui91LIBnpFuO/C3pofuzsU
JCFLwCbKjFR5mP0G0AdNKNvea1trjPVezUyIbkGiowkYZnpjY1AWy5D5AayNsfYw
VdHdUnQVQtiJqjyVwSLQvmInoPn+j4wh003G/U2v1zn/iO1etJ1v5XUUMnwybmlu
xxOJBHE7dYIlHd7TZhEpaoFq124sFFfKg9dnyC9cnTsFV2h9kDhJ0sPFPgZ22wFu
0WBjyudVAc9tnVjUA2iFm8QhjM6MvqM70PNZs4KDMe7965QKDhaSS+kKKxuwDB6M
8EA0uLFrHrq1V47hXrK5kDpjUuCNBVDj45hSGCmBIpTtteUAEQEAAYkBHwQYAQIA
CQUCUVMf+QIbDAAKCRCLfa7DkKxoNFrdB/9LEELATnNCaeBVpvmQpLOsCQzpmMJC
Q/jLbkmMByLTVCwyZQ09Ji5u1Iu7HSAnZGrLUZQDZybm7+Y5IPHeq04T1rNED+Om
JdoZjPGGU44zP2m+95AaFmYzL57ak4KDpxg2ihw5my/ptvIRbgdcd/e63sawcBDO
4A8cX7ijkt0OJMh2FofHIl94KwS9lfTGbJ93p3qM/cj+9P2Jjcu3MHE7ikIiIFi5
cmhuw4t+ypQtJDnNI7FjQ04P9Pm36KdQfUw+KiYtrlF8h7Gn2zfY49mmr4HQHYem
chhhkITf8w/MbKlTuAvR6r4KgD/i9R3jTMVc4lu5TFzGo8h+RWkDjsjL
=4R3q
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package ding-libs
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -14,46 +14,84 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%global collection_version 0.6.0
%global collection_version 0.6.2
%global dhash_version 0.4.3
%global ini_config_version 0.6.1
%global ini_config_version 1.0.0.1
%global path_utils_version 0.2.1
%global ref_array_version 0.1.1
%global ref_array_version 0.1.3
%global basicobjects_version 0.1.0
Name: ding-libs
Version: 0.1.3
Version: 0.3.0.1
Release: 0
Summary: "Ding is not GLib" assorted utility libraries
License: LGPL-3.0+
License: GPL-3.0+ and LGPL-3.0+
Group: Development/Libraries/C and C++
Url: http://fedorahosted.org/sssd/
#DL-URL: https://fedorahosted.org/sssd/wiki/Releases
#Git-Clone: git://git.fedorahosted.org/ding-libs
Source0: %{name}-%{version}.tar.bz2
Source2: baselibs.conf
Patch0: doxygen-notimestamp.dif
Patch1: pkgconfig-deps.diff
Source: https://fedorahosted.org/released/ding-libs/%name-%version.tar.gz
Source2: https://fedorahosted.org/released/ding-libs/%name-%version.tar.gz.asc
Source3: %name.keyring
Source4: baselibs.conf
Patch1: doxygen-notimestamp.dif
Patch2: 0001-build-add-missing-Requires-to-pkgconfig-file.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
### Build Dependencies ###
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: libtool
BuildRequires: m4
BuildRequires: pkg-config
BuildRequires: pkgconfig
%description
Assorted C utility libraries: libcollection, libdhash, libini_config,
librefarray and libpath_utils.
librefarray, libpath_utils and libbasicobjects.
##############################################################################
# Path Utils
##############################################################################
%package -n libbasicobjects0
Summary: Library containing basic objects like dynamic string
License: GPL-3.0+
Group: System/Libraries
Version: %basicobjects_version
Release: 0
%description -n libbasicobjects0
A small library that provides a buffer object.
%package -n libbasicobjects-devel
Summary: Library containing basic objects like dynamic string
License: GPL-3.0+
Group: Development/Libraries/C and C++
Version: %basicobjects_version
Release: 0
Requires: libbasicobjects0 = %version
%description -n libbasicobjects-devel
A small library that provides a buffer object.
%post -n libbasicobjects0 -p /sbin/ldconfig
%postun -n libbasicobjects0 -p /sbin/ldconfig
%files -n libbasicobjects0
%defattr(-,root,root)
%_libdir/libbasicobjects.so.0*
%files -n libbasicobjects-devel
%defattr(-,root,root)
%_includedir/simplebuffer.h
%_libdir/libbasicobjects.so
%_libdir/pkgconfig/basicobjects.pc
%package -n libpath_utils1
Summary: Filesystem Path Utilities
License: LGPL-3.0+
Group: System/Libraries
Version: %{path_utils_version}
Release: 0
@ -63,6 +101,7 @@ Utility functions to manipulate filesystem pathnames
%package -n libpath_utils-devel
Summary: Development files for libpath_utils
License: LGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libpath_utils1 = %{path_utils_version}
Version: %{path_utils_version}
@ -77,8 +116,7 @@ Utility functions to manipulate filesystem pathnames
%files -n libpath_utils1
%defattr(-,root,root,-)
%{_libdir}/libpath_utils.so.1
%{_libdir}/libpath_utils.so.1.0.0
%{_libdir}/libpath_utils.so.1*
%files -n libpath_utils-devel
%defattr(-,root,root,-)
@ -95,6 +133,7 @@ Utility functions to manipulate filesystem pathnames
%package -n libdhash1
Summary: Dynamic hash table
License: LGPL-3.0+
Group: System/Libraries
Version: %{dhash_version}
Release: 0
@ -105,6 +144,7 @@ time properties
%package -n libdhash-devel
Summary: Development files for libdhash
License: LGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libdhash1 = %{dhash_version}
Version: %{dhash_version}
@ -137,6 +177,7 @@ time properties
%package -n libcollection2
Summary: Collection data-type for C
License: LGPL-3.0+
Group: System/Libraries
Version: %{collection_version}
Release: 0
@ -147,6 +188,7 @@ and serialization
%package -n libcollection-devel
Summary: Development files for libcollection
License: LGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libcollection2 = %{collection_version}
Version: %{collection_version}
@ -162,8 +204,7 @@ and serialization
%files -n libcollection2
%defattr(-,root,root,-)
%{_libdir}/libcollection.so.2
%{_libdir}/libcollection.so.2.0.0
%{_libdir}/libcollection.so.2*
%files -n libcollection-devel
%defattr(-,root,root,-)
@ -182,6 +223,7 @@ and serialization
%package -n libref_array1
Summary: A refcounted array for C
License: GPL-3.0+
Group: System/Libraries
Version: %{ref_array_version}
Release: 0
@ -191,6 +233,7 @@ A dynamically-growing, reference-counted array
%package -n libref_array-devel
Summary: Development files for libref_array
License: GPL-3.0+
Group: Development/Libraries/C and C++
Requires: libref_array1 = %{ref_array_version}
Version: %{ref_array_version}
@ -205,8 +248,7 @@ A dynamically-growing, reference-counted array
%files -n libref_array1
%defattr(-,root,root,-)
%{_libdir}/libref_array.so.1
%{_libdir}/libref_array.so.1.0.0
%{_libdir}/libref_array.so.1*
%files -n libref_array-devel
%defattr(-,root,root,-)
@ -221,20 +263,24 @@ A dynamically-growing, reference-counted array
# ini_config
##############################################################################
%package -n libini_config2
%package -n libini_config3
Summary: INI file parser for C
License: LGPL-3.0+
Group: System/Libraries
Version: %{ini_config_version}
Release: 0
%description -n libini_config2
%description -n libini_config3
Library to process config files in INI format into a libcollection data
structure
%package -n libini_config-devel
Summary: Development files for libini_config
License: LGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libini_config2 = %{ini_config_version}
Requires: libbasicobjects-devel
Requires: libini_config3 = %{ini_config_version}
Requires: libref_array-devel
Version: %{ini_config_version}
Release: 0
@ -242,19 +288,18 @@ Release: 0
Library to process config files in INI format into a libcollection data
structure
%post -n libini_config2 -p /sbin/ldconfig
%post -n libini_config3 -p /sbin/ldconfig
%postun -n libini_config2 -p /sbin/ldconfig
%postun -n libini_config3 -p /sbin/ldconfig
%files -n libini_config2
%files -n libini_config3
%defattr(-,root,root,-)
%{_libdir}/libini_config.so.2
%{_libdir}/libini_config.so.2.0.0
%{_libdir}/libini_config.so.3*
%files -n libini_config-devel
%defattr(-,root,root,-)
%doc COPYING COPYING.LESSER
%{_includedir}/ini_config.h
%{_includedir}/ini_*.h
%{_libdir}/libini_config.so
%{_libdir}/pkgconfig/ini_config.pc
%doc ini/doc/html/
@ -264,14 +309,17 @@ structure
##############################################################################
%prep
%{?gpg_verify: %gpg_verify %{S:2}}
%setup -q
%patch -P 0 -P 1 -p1
%patch -P 1 -P 2 -p1
%build
%configure \
--disable-static
make %{?_smp_mflags} all docs
# ding fails to do the required SONAME changes/symvers tracking, so hack it up.
echo "DING_%version { global: *; };" >ding.map
make %{?_smp_mflags} all docs LDFLAGS="-Wl,--version-script=$PWD/ding.map"
%check
make %{?_smp_mflags} check