pool/ding-libs
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 704658 from home:scarabeus_iv:branches:network:ldap

Browse Source 
- Update to 0.6.1:
  * No upstream changelog
- Update URL
  * Remove the git link info as it 404 atm
- Add patches from upstream to fix ini behaviour:
  * INI-Fix-detection-of-error-messages.patch
  * INI-Silence-ini_augment-match-failures.patch
  * TEST-validators_ut_check-Fix-fail-with-new-glibc.patch

OBS-URL: https://build.opensuse.org/request/show/704658
OBS-URL: https://build.opensuse.org/package/show/network:ldap/ding-libs?expand=0&rev=35
This commit is contained in:
Jan Engelhardt 2019-05-23 12:01:13 +00:00 committed by Git OBS Bridge
parent 76750939ed
commit 26dfb1f16c
10 changed files with 365 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
INI-Fix-detection-of-error-messages.patch Normal file
View File

@ -0,0 +1,47 @@
From 72c19bd018b107ecf5a80963b433e9922f7243fd Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Wed, 3 Jan 2018 18:03:44 +0100
Subject: [PATCH 01/11] INI: Fix detection of error messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
libc on BSD returns different error messages.
Reviewed-by: Michal Židek <mzidek@redhat.com>
---
ini/ini_validators_ut_check.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c
index fa7105a..9ecde75 100644
--- a/ini/ini_validators_ut_check.c
+++ b/ini/ini_validators_ut_check.c
@@ -607,6 +607,12 @@ START_TEST(test_ini_allowed_options_wrong_regex)
"[rule/options_for_foo]: Cannot compile regular expression "
"from option 'section_re'. "
"Error: 'Unmatched [ or [^'");
+ if (ret != 0) {
+ ret = strcmp(errmsg,
+ "[rule/options_for_foo]: Cannot compile regular expression "
+ "from option 'section_re'. "
+ "Error: 'brackets ([ ]) not balanced'");
+ }
fail_unless(ret == 0, "Got msg: [%s]", errmsg);
ini_errobj_next(errobj);
@@ -1028,6 +1034,11 @@ START_TEST(test_ini_allowed_sections_wrong_regex)
ret = strcmp(errmsg,
"[rule/section_list]: Validator failed to use regex "
"[^foo\\(*$]:[Unmatched ( or \\(]");
+ if (ret !=0) {
+ ret = strcmp(errmsg,
+ "[rule/section_list]: Validator failed to use regex "
+ "[^foo\\(*$]:[parentheses not balanced]");
+ }
fail_unless(ret == 0, "Got msg: [%s]", errmsg);
ini_errobj_next(errobj);
--
2.9.5

96
INI-Silence-ini_augment-match-failures.patch Normal file
View File

@ -0,0 +1,96 @@
From 781fdebda1d9e62e224630efb8d4dd5da8fe5f69 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <alexander.m.scheel@gmail.com>
Date: Mon, 30 Oct 2017 12:43:19 -0500
Subject: [PATCH] INI: Silence ini_augment match failures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Resolves:
https://pagure.io/SSSD/ding-libs/issue/3182
Reviewed-by: Michal Židek <mzidek@redhat.com>
Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com>
Merges: https://pagure.io/SSSD/ding-libs/pull-request/3183
(cherry picked from commit be9ca3a2c26b061d1f22bd4a09009bba7a01f67b)
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
ini/ini.d/merge.validator | 11 -----------
ini/ini_augment.c | 13 +++++++------
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/ini/ini.d/merge.validator b/ini/ini.d/merge.validator
index 1defe8e..017c1cb 100644
--- a/ini/ini.d/merge.validator
+++ b/ini/ini.d/merge.validator
@@ -1,17 +1,8 @@
-File %s%s/merge.validator did not match provided patterns. Skipping.
-File %s%s/real8.conf did not match provided patterns. Skipping.
-File %s%s/new_line.conf did not match provided patterns. Skipping.
-File %s%s/real32be.conf did not match provided patterns. Skipping.
-File %s%s/real32le.conf did not match provided patterns. Skipping.
-File %s%s/real16be.conf did not match provided patterns. Skipping.
-File %s%s/real16le.conf did not match provided patterns. Skipping.
-File %s%s/foo.conf.in did not match provided patterns. Skipping.
Errors detected while parsing: %s%s/comment.conf.
Error (9) on line 22: Invalid space character at the beginning of the line.
Error (9) on line 24: Invalid space character at the beginning of the line.
Error (9) on line 26: Invalid space character at the beginning of the line.
Error (15) on line 32: Incomplete comment at the end of the file.
-No sections found in file %s%s/comment.conf. Skipping.
Section [section_a] found in file %s%s/first.conf is not allowed.
Section [section_c] found in file %s%s/first.conf is not allowed.
Section [section_b] found in file %s%s/first.conf is not allowed.
@@ -42,7 +33,6 @@ Error (9) on line 1: Invalid space character at the beginning of the line.
Error (9) on line 2: Invalid space character at the beginning of the line.
Error (9) on line 3: Invalid space character at the beginning of the line.
Error (9) on line 4: Invalid space character at the beginning of the line.
-No sections found in file %s%s/space.conf. Skipping.
Section [info] found in file %s%s/symbols.conf is not allowed.
Section [languages] found in file %s%s/symbols.conf is not allowed.
Section [text] found in file %s%s/symbols.conf is not allowed.
@@ -55,6 +45,5 @@ Error (9) on line 15: Invalid space character at the beginning of the line.
Error (9) on line 16: Invalid space character at the beginning of the line.
Error (9) on line 26: Invalid space character at the beginning of the line.
Error (9) on line 35: Invalid space character at the beginning of the line.
-No sections found in file %s%s/test.conf. Skipping.
%s%s/ipa.conf
%s%s/real.conf
diff --git a/ini/ini_augment.c b/ini/ini_augment.c
index af5c0b6..9d83ad9 100644
--- a/ini/ini_augment.c
+++ b/ini/ini_augment.c
@@ -32,6 +32,8 @@
#include <sys/types.h>
#include <regex.h>
#include <unistd.h>
+#define TRACE_LEVEL 7
+#define TRACE_HOME
#include "trace.h"
#include "collection.h"
#include "collection_tools.h"
@@ -456,10 +458,9 @@ static int ini_aug_construct_list(char *dirname ,
}
}
else {
- ini_aug_add_string(ra_err,
- "File %s did not match provided patterns."
- " Skipping.",
- fullname);
+ TRACE_INFO_STRING("File did not match provided patterns."
+ " Skipping:",
+ fullname);
}
}
@@ -609,8 +610,8 @@ static int ini_aug_match_sec(struct ini_cfgobj *snip_cfg,
/* Just in case check that we processed anything */
if (section_count == 0) {
- ini_aug_add_string(ra_err, "No sections found in file %s. Skipping.",
- snip_name);
+ TRACE_INFO_STRING("No sections found in file. Skipping:",
+ snip_name);
*skip = true;
TRACE_FLOW_EXIT();
return EOK;

49
TEST-validators_ut_check-Fix-fail-with-new-glibc.patch Normal file
View File

@ -0,0 +1,49 @@
From 9f9a3ded23cc2bb917468939b745cc498cec523a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
Date: Wed, 1 Aug 2018 17:48:10 +0200
Subject: [PATCH] validators_ut_check: Fix fail with new glibc
Error message was slightly change from previous version
of glibc which caused fails in validators unit tests.
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
---
ini/ini_validators_ut_check.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c
index 9ecde75..3af8551 100644
--- a/ini/ini_validators_ut_check.c
+++ b/ini/ini_validators_ut_check.c
@@ -602,6 +602,8 @@ START_TEST(test_ini_allowed_options_wrong_regex)
fail_unless(ret == 0, "Got msg: [%s]", errmsg);
ini_errobj_next(errobj);
+ /* Different versions of libc produce slightly different error strings
+ * in this case. For simplicity compare against all of them. */
errmsg = ini_errobj_get_msg(errobj);
ret = strcmp(errmsg,
"[rule/options_for_foo]: Cannot compile regular expression "
@@ -609,10 +611,17 @@ START_TEST(test_ini_allowed_options_wrong_regex)
"Error: 'Unmatched [ or [^'");
if (ret != 0) {
ret = strcmp(errmsg,
- "[rule/options_for_foo]: Cannot compile regular expression "
- "from option 'section_re'. "
+ "[rule/options_for_foo]: Cannot compile regular "
+ "expression from option 'section_re'. "
"Error: 'brackets ([ ]) not balanced'");
}
+
+ if (ret != 0) {
+ ret = strcmp(errmsg,
+ "[rule/options_for_foo]: Cannot compile regular "
+ "expression from option 'section_re'. "
+ "Error: 'Unmatched [, [^, [:, [., or [='");
+ }
fail_unless(ret == 0, "Got msg: [%s]", errmsg);
ini_errobj_next(errobj);
--
2.9.5

3
ding-libs-0.6.0.tar.gz
View File

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

7
ding-libs-0.6.0.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAldqZo0ACgkQHsardTLnvCUn1ACeNfL/po6emU3M5JPRG7Vgl2IB
3/4AoM09wE/4qEzrd2/UMoztu5VWJI2G
=0rD6
-----END PGP SIGNATURE-----

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

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

11
ding-libs-0.6.1.tar.gz.asc Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABCAAGBQJZxS/3AAoJELqIAA/mOYJyKy8H/jboCn7oe3C0cn+s3qct9TkX
IU1Ppq5c30+1VXFAmr8606WpzD70hgQItI/KnrOxYbzmibwFgorwTDON6E1ulFM0
9n6Ofp3u29EPdsGM39v9ivi+UWkWWVbHbZc+RLroVmHrUG+tLgKXON2Na3TA5Ynh
x63L97GagBpznIJ+YCs2Pifrc/z4WKCFgDfUOF8uVGJ2EETHuf8PRw2sYckO8czp
2NVcJy0UfiqdfgThTGUZsbKllZ/vdW3a71CwABWjee+x3QoLyFDWhD3wcaRpPU5W
VknjR5p8CbkqSUnV/D75Fmk7+FZ1Cz1Fr6oOyCLnVNi1rTGJboF9gWNIdGpYwao=
=Jlo+
-----END PGP SIGNATURE-----

12
ding-libs.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed May 22 08:00:10 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 0.6.1:
* No upstream changelog
- Update URL
* Remove the git link info as it 404 atm
- Add patches from upstream to fix ini behaviour:
* INI-Fix-detection-of-error-messages.patch
* INI-Silence-ini_augment-match-failures.patch
* TEST-validators_ut_check-Fix-fail-with-new-glibc.patch
-------------------------------------------------------------------
Mon Jan 16 23:19:11 UTC 2017 - jengelh@inai.de

71
ding-libs.keyring
View File

@ -1,34 +1,43 @@
pub dsa1024 2007-02-02 [SC]
E4E366758CA0716AAB8048671EC6AB7532E7BC25
uid [ unknown] Jakub Hrozek <jhrozek@redhat.com>
sub elg2048 2007-02-02 [E]
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQGiBEXDdfURBACLDLdnY7LeLJ7fh3HQWojKuMtJGV3tmTRtt58XnEf/FPJae0MU
XQDAKJM7MDYf0yDNT6Nq6WMQDAIHznFdGRTTSaD97kMeYO11i60FfZ9nM88XJCv0
R+OiWh8d7ChCG6riv/AUeNtg++casIQNB8xK9HKLFBS1e+q3b+rXTS9crwCg7FWX
qZoZrm4lPlBZQltfhzdmvn8D/3CyvgtW5hwr7w+ScQcYnBxdVCtMPSEo541Ealjg
q9Knn4sE9lnGjtG4RCYMT2Sideognk9Ah5nWOGynwta6cluCEqlF6ORJPKpAeqG1
a2zpn3iSPbUiyRF+udta9sbwL0hsJTcPTGzvDZO/XtMoHSSyPi/Xum6R+jwISv7n
TMQpA/0efY/Gy/SZrulBgQqKBMbaW2phvgRThph4n31IYrlSB6tAqN0G7VL6AFcs
iOJZPhu0TNqEOSYE6Mh5/YBwRPnrKMHZYXiKOeUrfjvURVq+l5dTX7KNtbnCrhS+
Rlgq1uin5L7g8QbAKMns32Mo1MxB5aN0YUL5pTbJuWL0Sb2Kb7QhSmFrdWIgSHJv
emVrIDxqaHJvemVrQHJlZGhhdC5jb20+iF8EExECACAFAkXDdfUCGwMGCwkIBwMC
BBUCCAMEFgIDAQIeAQIXgAAKCRAexqt1Mue8JSHBAKCjYF/HshYkJ8pSZTilLO0y
bMWOFwCYlOqF7icGVDFT42W3CoqLfgajCrkCDQRFw3YAEAgAuqo0FxH1XtdOi/qW
6v+tWdqYHLj/f0Voqj1cbpS+cODNTaX1/Xf4Jnv6vm4lOG5gIkqD1e5UCpG5pDJv
MkrpY0lYRr5RGoC29tHZYXfEBVEkdhuU7ZTSQRaoitK5TSwjOj5aKvFSHEjMrCWc
GSUajECQkRHwZb3HK2wqqBWrJjjjPtj+5cQg+sKp7Zp6xU3iZlMoVfdYi/zGenum
Cp5SMm8CZZ5gcsNZhjItkTww5K//N6Kz41oMYyHlgh029JD0LHPgKacP3KeEEDzS
DEx/SSEF4zD/EfLDHehga/n0ZisNmxdxue/BI2Lm7qqGNDtV+qa17pIJ6fPfafbS
AKYatwAECwf/SuMkZN36UDsoOn06qIrYi5JBss3sOfheJEnqUIEO0JCpyb+fqisd
qoTJM0G5gFpCvuZOACpzzVv0WjhlMIyPl/7UuP4KYI6LGqAARqNxsHT7FNxT0Uv6
QR8fGPQqVdFLFBd66EBL9PnOt3RDYwtJlD9cMNUNpzWEXjJ3RCk0lZF2eljpPlu0
Or53OuiommnhmcmjxR5gvMf4pLqURhEZ2U0ylRiTiTIk0YyIASsDnAf0BClFXz4i
4qSD6jJloKorRC7Mu87xi1DG4ML+FYC/2d53I8OqHBRhtNUt/GbcthsHDxFq5iVp
NxwDAX1vr65PWv98pvTMnJmjIDhfgwJMdIhJBBgRAgAJBQJFw3YAAhsMAAoJEB7G
q3Uy57wllOcAoKkHB3lDFWlUNcSLdRCQxfsCCy7zAJ9GLSU2G0HR+hQVMi2ONorE
i/EyTA==
=nO6v
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
gZmj0yhMzGBElfS9FU0Kq+fUCQ==
=sTrO
-----END PGP PUBLIC KEY BLOCK-----

226
ding-libs.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ding-libs
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 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
@ -12,175 +12,175 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# Defined in version.m4
%global path_utils_version 0.2.1
%global dhash_version 0.4.3
%global dhash_version 0.5.0
%global collection_version 0.7.0
%global ref_array_version 0.1.5
%global basicobjects_version 0.1.1
%global ini_config_version 1.3.0
%global ini_config_version 1.3.1
Name: ding-libs
Version: 0.6.0
Version: 0.6.1
Release: 0
Summary: "Ding is not GLib" assorted utility libraries
License: GPL-3.0+ and LGPL-3.0+
License: GPL-3.0-or-later AND LGPL-3.0-or-later
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
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
URL: https://pagure.io/SSSD/ding-libs
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: 0001-increase-ini-max-value-length.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch2: INI-Fix-detection-of-error-messages.patch
Patch3: INI-Silence-ini_augment-match-failures.patch
Patch4: TEST-validators_ut_check-Fix-fail-with-new-glibc.patch
BuildRequires: doxygen
BuildRequires: pkgconfig
BuildRequires: pkgconfig(check) >= 0.9.5
%description
Assorted C utility libraries: libcollection, libdhash, libini_config,
librefarray, libpath_utils and libbasicobjects.
%package -n libbasicobjects0
Summary: Library containing basic objects like dynamic string
License: GPL-3.0+
Group: System/Libraries
Version: %basicobjects_version
Version: %{basicobjects_version}
Release: 0
Summary: Library containing basic objects like dynamic string
License: GPL-3.0-or-later
Group: System/Libraries
%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
Version: %{basicobjects_version}
Release: 0
Requires: libbasicobjects0 = %version
Summary: Library containing basic objects like dynamic string
License: GPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: libbasicobjects0 = %{version}
%description -n libbasicobjects-devel
A small library that provides a buffer object.
%package -n libcollection4
Summary: Collection data-type for C
License: LGPL-3.0+
Group: System/Libraries
Version: %collection_version
Version: %{collection_version}
Release: 0
Summary: Collection data-type for C
License: LGPL-3.0-or-later
Group: System/Libraries
%description -n libcollection4
A data-type to collect data in a hierarchical structure for easy iteration
and serialization
%package -n libcollection-devel
Summary: Development files for libcollection
License: LGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libcollection4 = %collection_version
Version: %collection_version
Version: %{collection_version}
Release: 0
Summary: Development files for libcollection
License: LGPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: libcollection4 = %{collection_version}
%description -n libcollection-devel
A data-type to collect data in a hierarchical structure for easy iteration
and serialization
%package -n libdhash1
Summary: Dynamic hash table library
License: LGPL-3.0+
Group: System/Libraries
Version: %dhash_version
Version: %{dhash_version}
Release: 0
Summary: Dynamic hash table library
License: LGPL-3.0-or-later
Group: System/Libraries
%description -n libdhash1
A hash table which will dynamically resize to achieve optimal storage & access
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
Version: %{dhash_version}
Release: 0
Summary: Development files for libdhash
License: LGPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: libdhash1 = %{dhash_version}
%description -n libdhash-devel
A hash table which will dynamically resize to achieve optimal storage & access
time properties
%package -n libini_config5
Summary: INI file parser for C
License: LGPL-3.0+
Group: System/Libraries
Version: %ini_config_version
Version: %{ini_config_version}
Release: 0
Summary: INI file parser for C
License: LGPL-3.0-or-later
Group: System/Libraries
%description -n libini_config5
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_config5 = %ini_config_version
Version: %ini_config_version
Version: %{ini_config_version}
Release: 0
Summary: Development files for libini_config
License: LGPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: libini_config5 = %{ini_config_version}
%description -n libini_config-devel
Library to process config files in INI format into a libcollection data
structure
%package -n libpath_utils1
Summary: Filesystem Path Utilities
License: LGPL-3.0+
Group: System/Libraries
Version: %path_utils_version
Version: %{path_utils_version}
Release: 0
Summary: Filesystem Path Utilities
License: LGPL-3.0-or-later
Group: System/Libraries
%description -n libpath_utils1
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
Version: %{path_utils_version}
Release: 0
Summary: Development files for libpath_utils
License: LGPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: libpath_utils1 = %{path_utils_version}
%description -n libpath_utils-devel
Utility functions to manipulate filesystem pathnames
%package -n libref_array1
Summary: A refcounted array for C
License: GPL-3.0+
Group: System/Libraries
Version: %ref_array_version
Version: %{ref_array_version}
Release: 0
Summary: A refcounted array for C
License: GPL-3.0-or-later
Group: System/Libraries
%description -n libref_array1
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
Version: %{ref_array_version}
Release: 0
Summary: Development files for libref_array
License: GPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: libref_array1 = %{ref_array_version}
%description -n libref_array-devel
A dynamically-growing, reference-counted array
%prep
%setup -q
%patch1 -p1
%autopatch -p1
%build
%configure --disable-static
@ -190,16 +190,16 @@ make %{?_smp_mflags} all docs
make %{?_smp_mflags} check
%install
make install DESTDIR="%buildroot"
rm -f "%buildroot/%_libdir"/*.la
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
# Remove the example files from the output directory
# We will copy them directly from the source directory
# for packaging
rm -f \
"%buildroot/%_datadir/doc/ding-libs"/README.* \
"%buildroot/%_datadir/doc/ding-libs/examples/dhash_example.c" \
"%buildroot/%_datadir/doc/ding-libs/examples/dhash_test.c"
"%{buildroot}/%{_datadir}/doc/ding-libs"/README.* \
"%{buildroot}/%{_datadir}/doc/ding-libs/examples/dhash_example.c" \
"%{buildroot}/%{_datadir}/doc/ding-libs/examples/dhash_test.c"
# Remove document install script. RPM is handling this
rm -f */doc/html/installdox
@ -218,77 +218,65 @@ rm -f */doc/html/installdox
%postun -n libref_array1 -p /sbin/ldconfig
%files -n libbasicobjects0
%defattr(-,root,root)
%_libdir/libbasicobjects.so.0*
%{_libdir}/libbasicobjects.so.0*
%files -n libbasicobjects-devel
%defattr(-,root,root)
%_includedir/simplebuffer.h
%_libdir/libbasicobjects.so
%_libdir/pkgconfig/basicobjects.pc
%{_includedir}/simplebuffer.h
%{_libdir}/libbasicobjects.so
%{_libdir}/pkgconfig/basicobjects.pc
%files -n libcollection4
%defattr(-,root,root)
%_libdir/libcollection.so.4*
%{_libdir}/libcollection.so.4*
%files -n libcollection-devel
%defattr(-,root,root)
%doc COPYING COPYING.LESSER
%_includedir/collection.h
%_includedir/collection_tools.h
%_includedir/collection_queue.h
%_includedir/collection_stack.h
%_libdir/libcollection.so
%_libdir/pkgconfig/collection.pc
%license COPYING COPYING.LESSER
%{_includedir}/collection.h
%{_includedir}/collection_tools.h
%{_includedir}/collection_queue.h
%{_includedir}/collection_stack.h
%{_libdir}/libcollection.so
%{_libdir}/pkgconfig/collection.pc
%doc collection/doc/html/
%files -n libdhash1
%defattr(-,root,root)
%_libdir/libdhash.so.1*
%{_libdir}/libdhash.so.1*
%files -n libdhash-devel
%defattr(-,root,root)
%doc COPYING COPYING.LESSER
%_includedir/dhash.h
%_libdir/libdhash.so
%_libdir/pkgconfig/dhash.pc
%license COPYING COPYING.LESSER
%{_includedir}/dhash.h
%{_libdir}/libdhash.so
%{_libdir}/pkgconfig/dhash.pc
%doc dhash/README.dhash
%files -n libini_config5
%defattr(-,root,root)
%_libdir/libini_config.so.5*
%{_libdir}/libini_config.so.5*
%files -n libini_config-devel
%defattr(-,root,root)
%doc COPYING COPYING.LESSER
%_includedir/ini_*.h
%_libdir/libini_config.so
%_libdir/pkgconfig/ini_config.pc
%license COPYING COPYING.LESSER
%{_includedir}/ini_*.h
%{_libdir}/libini_config.so
%{_libdir}/pkgconfig/ini_config.pc
%doc ini/doc/html/
%files -n libpath_utils1
%defattr(-,root,root)
%_libdir/libpath_utils.so.1*
%{_libdir}/libpath_utils.so.1*
%files -n libpath_utils-devel
%defattr(-,root,root)
%doc COPYING COPYING.LESSER
%_includedir/path_utils.h
%_libdir/libpath_utils.so
%_libdir/pkgconfig/path_utils.pc
%license COPYING COPYING.LESSER
%{_includedir}/path_utils.h
%{_libdir}/libpath_utils.so
%{_libdir}/pkgconfig/path_utils.pc
%doc path_utils/README.path_utils
%doc path_utils/doc/html/
%files -n libref_array1
%defattr(-,root,root)
%_libdir/libref_array.so.1*
%{_libdir}/libref_array.so.1*
%files -n libref_array-devel
%defattr(-,root,root)
%doc COPYING COPYING.LESSER
%_includedir/ref_array.h
%_libdir/libref_array.so
%_libdir/pkgconfig/ref_array.pc
%license COPYING COPYING.LESSER
%{_includedir}/ref_array.h
%{_libdir}/libref_array.so
%{_libdir}/pkgconfig/ref_array.pc
%doc refarray/README.ref_array
%doc refarray/doc/html/