diff --git a/.ding-libs.metadata b/.ding-libs.metadata index 7806d17..b877381 100644 --- a/.ding-libs.metadata +++ b/.ding-libs.metadata @@ -1 +1 @@ -da27caf664d696b011924a799117fb39ef357653 SOURCES/ding-libs-0.5.0.tar.gz +c8ec86cb93a26e013a13b12a7b0b3fbc1bca16c1 SOURCES/ding-libs-0.6.0.tar.gz diff --git a/.gitignore b/.gitignore index 6895e27..5002c37 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ding-libs-0.5.0.tar.gz +SOURCES/ding-libs-0.6.0.tar.gz diff --git a/SOURCES/ding-libs-fake-soname.patch b/SOURCES/ding-libs-fake-soname.patch index 42bedd3..7ffaf13 100644 --- a/SOURCES/ding-libs-fake-soname.patch +++ b/SOURCES/ding-libs-fake-soname.patch @@ -1,7 +1,7 @@ -diff -up ding-libs-0.5.0/Makefile.am.soname ding-libs-0.5.0/Makefile.am ---- ding-libs-0.5.0/Makefile.am.soname 2015-06-23 20:40:31.768363383 +0200 -+++ ding-libs-0.5.0/Makefile.am 2015-06-23 20:41:13.996493605 +0200 -@@ -142,7 +142,7 @@ libcollection_la_SOURCES = \ +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 = \ trace/trace.h libcollection_la_DEPENDENCIES = collection/libcollection.sym libcollection_la_LDFLAGS = \ @@ -10,11 +10,11 @@ diff -up ding-libs-0.5.0/Makefile.am.soname ding-libs-0.5.0/Makefile.am -Wl,--version-script=$(top_srcdir)/collection/libcollection.sym check_PROGRAMS += \ -@@ -268,7 +268,7 @@ libini_config_la_LIBADD = \ +@@ -276,7 +276,7 @@ libini_config_la_LIBADD = \ libref_array.la \ libbasicobjects.la libini_config_la_LDFLAGS = \ -- -version-info 6:0:1 \ +- -version-info 7:0:2 \ + -version-info 5:0:2 \ -Wl,--version-script=$(top_srcdir)/ini/libini_config.sym diff --git a/SPECS/ding-libs.spec b/SPECS/ding-libs.spec index 8a631f4..d57c384 100644 --- a/SPECS/ding-libs.spec +++ b/SPECS/ding-libs.spec @@ -1,6 +1,6 @@ Name: ding-libs -Version: 0.5.0 -Release: 25%{?dist} +Version: 0.6.0 +Release: 27%{?dist} Summary: "Ding is not GLib" assorted utility libraries Group: Development/Libraries License: LGPLv3+ @@ -16,7 +16,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %global collection_version 0.6.2 %global ref_array_version 0.1.5 %global basicobjects_version 0.1.1 -%global ini_config_version 1.2.0 +%global ini_config_version 1.3.0 ### Patches ### Patch0001: ding-libs-fake-soname.patch @@ -357,6 +357,13 @@ rm -f */doc/html/installdox rm -rf $RPM_BUILD_ROOT %changelog +* 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 + +* Wed Jun 22 2016 Jakub Hrozek - 0.5.0.1-26 +- Resolves: rhbz#1290382 - Rebase ding-libs to the latest available upstream + * Tue Jun 23 2015 Jakub Hrozek - 0.5.0.1-25 - Resolves: rhbz#1205557 - Include the latest upstream ding-libs release in 7.2 - Port the SONAME hack