diff --git a/.ding-libs.metadata b/.ding-libs.metadata index 5720122..7806d17 100644 --- a/.ding-libs.metadata +++ b/.ding-libs.metadata @@ -1 +1 @@ -38d9ebb0e44dfb7a8d97c2f650a586260c8909f9 SOURCES/ding-libs-0.4.0.tar.gz +da27caf664d696b011924a799117fb39ef357653 SOURCES/ding-libs-0.5.0.tar.gz diff --git a/.gitignore b/.gitignore index 4af5c97..6895e27 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ding-libs-0.4.0.tar.gz +SOURCES/ding-libs-0.5.0.tar.gz diff --git a/SOURCES/ding-libs-fake-soname.patch b/SOURCES/ding-libs-fake-soname.patch index 6eb0abd..42bedd3 100644 --- a/SOURCES/ding-libs-fake-soname.patch +++ b/SOURCES/ding-libs-fake-soname.patch @@ -1,20 +1,20 @@ -diff -up ding-libs-0.4.0/Makefile.am.soname ding-libs-0.4.0/Makefile.am ---- ding-libs-0.4.0/Makefile.am.soname 2014-09-11 17:41:13.694991377 +0200 -+++ ding-libs-0.4.0/Makefile.am 2014-09-11 17:42:03.082015455 +0200 +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 = \ trace/trace.h libcollection_la_DEPENDENCIES = collection/libcollection.sym libcollection_la_LDFLAGS = \ -- -version-info 4:0:0 \ +- -version-info 5:0:1 \ + -version-info 3:0:1 \ -Wl,--version-script=$(top_srcdir)/collection/libcollection.sym check_PROGRAMS += \ -@@ -263,7 +263,7 @@ libini_config_la_LIBADD = \ +@@ -268,7 +268,7 @@ libini_config_la_LIBADD = \ libref_array.la \ libbasicobjects.la libini_config_la_LDFLAGS = \ -- -version-info 5:0:0 \ +- -version-info 6:0:1 \ + -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 b339b08..8a631f4 100644 --- a/SPECS/ding-libs.spec +++ b/SPECS/ding-libs.spec @@ -1,6 +1,6 @@ Name: ding-libs -Version: 0.4.0 -Release: 24%{?dist} +Version: 0.5.0 +Release: 25%{?dist} Summary: "Ding is not GLib" assorted utility libraries Group: Development/Libraries License: LGPLv3+ @@ -14,9 +14,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %global path_utils_version 0.2.1 %global dhash_version 0.4.3 %global collection_version 0.6.2 -%global ref_array_version 0.1.4 +%global ref_array_version 0.1.5 %global basicobjects_version 0.1.1 -%global ini_config_version 1.1.0 +%global ini_config_version 1.2.0 ### Patches ### Patch0001: ding-libs-fake-soname.patch @@ -308,6 +308,7 @@ structure %defattr(-,root,root,-) %{_includedir}/ini_config.h %{_includedir}/ini_comment.h +%{_includedir}/ini_configmod.h %{_includedir}/ini_configobj.h %{_includedir}/ini_valueobj.h %{_libdir}/libini_config.so @@ -356,6 +357,10 @@ rm -f */doc/html/installdox rm -rf $RPM_BUILD_ROOT %changelog +* 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 + * Thu Sep 11 2014 Jakub Hrozek - 0.4.0.1-24 - Fix ABI breakage that affected gssproxy - Related: rhbz#1109856 - Rebase ding-libs to 0.4.0