diff --git a/.ding-libs.metadata b/.ding-libs.metadata index b877381..f7f6a10 100644 --- a/.ding-libs.metadata +++ b/.ding-libs.metadata @@ -1 +1 @@ -c8ec86cb93a26e013a13b12a7b0b3fbc1bca16c1 SOURCES/ding-libs-0.6.0.tar.gz +dab4c855b065bd728021437af81ae726c31c5272 SOURCES/ding-libs-0.6.1.tar.gz diff --git a/.gitignore b/.gitignore index 5002c37..e5dbdd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ding-libs-0.6.0.tar.gz +SOURCES/ding-libs-0.6.1.tar.gz diff --git a/SOURCES/ding-libs-fake-soname.patch b/SOURCES/ding-libs-fake-soname.patch index 7ffaf13..fbf926c 100644 --- a/SOURCES/ding-libs-fake-soname.patch +++ b/SOURCES/ding-libs-fake-soname.patch @@ -1,21 +1,34 @@ -diff -up ding-libs-0.6.0/Makefile.am.soname ding-libs-0.6.0/Makefile.am ---- ding-libs-0.6.0/Makefile.am.soname 2016-06-27 13:16:02.717757114 +0200 -+++ ding-libs-0.6.0/Makefile.am 2016-06-27 13:16:49.614901906 +0200 -@@ -150,7 +150,7 @@ libcollection_la_SOURCES = \ +From 5a49bd600f7c888abf9dad2911e53d1a20e5f7c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20=C5=BDidek?= +Date: Fri, 13 Oct 2017 15:17:42 +0200 +Subject: [PATCH] ding-libs fake soname patch + +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index d032739..cd1dff9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -166,7 +166,7 @@ libcollection_la_SOURCES = \ trace/trace.h libcollection_la_DEPENDENCIES = collection/libcollection.sym libcollection_la_LDFLAGS = \ -- -version-info 5:0:1 \ -+ -version-info 3:0:1 \ +- -version-info 5:1:1 \ ++ -version-info 3:1:1 \ -Wl,--version-script=$(top_srcdir)/collection/libcollection.sym check_PROGRAMS += \ -@@ -276,7 +276,7 @@ libini_config_la_LIBADD = \ +@@ -292,7 +292,7 @@ libini_config_la_LIBADD = \ libref_array.la \ libbasicobjects.la libini_config_la_LDFLAGS = \ -- -version-info 7:0:2 \ -+ -version-info 5:0:2 \ +- -version-info 7:1:2 \ ++ -version-info 5:1:2 \ -Wl,--version-script=$(top_srcdir)/ini/libini_config.sym dist_noinst_DATA += \ +-- +2.9.5 + diff --git a/SPECS/ding-libs.spec b/SPECS/ding-libs.spec index d57c384..c0d02ae 100644 --- a/SPECS/ding-libs.spec +++ b/SPECS/ding-libs.spec @@ -1,22 +1,22 @@ Name: ding-libs -Version: 0.6.0 -Release: 27%{?dist} +Version: 0.6.1 +Release: 29%{?dist} Summary: "Ding is not GLib" assorted utility libraries Group: Development/Libraries License: LGPLv3+ -URL: http://fedorahosted.org/sssd/ -Source0: http://fedorahosted.org/releases/d/i/ding-libs/%{name}-%{version}.tar.gz +URL: https://pagure.io/SSSD/ding-libs +Source0: https://releases.pagure.org/SSSD/ding-libs/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # If a new upstream release changes some, but not all of these # version numbers, remember to keep the Release tag in order to # allow clean upgrades! %global path_utils_version 0.2.1 -%global dhash_version 0.4.3 -%global collection_version 0.6.2 +%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 ### Patches ### Patch0001: ding-libs-fake-soname.patch @@ -140,7 +140,7 @@ time properties %{_libdir}/libdhash.so %{_libdir}/pkgconfig/dhash.pc %doc dhash/README.dhash -%doc dhash/examples/ +%doc dhash/examples/*.c ############################################################################## @@ -357,6 +357,14 @@ rm -f */doc/html/installdox rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 27 2016 Michal Židek - 0.6.1-29 +- Fix rpmdiff failure for 'Binary stripping' +- Resolves: rhbz#1480270 - Rebase ding-libs to the latest upstream release + +* Mon Jun 27 2016 Michal Židek - 0.6.1-28 +- Re-add the soname hack +- Resolves: rhbz#1480270 - Rebase ding-libs to the latest upstream release + * Mon Jun 27 2016 Jakub Hrozek - 0.5.0.1-27 - Re-add the soname hack - Resolves: rhbz#1290382 - Rebase ding-libs to the latest available upstream