[packages/libconfig] - new Source URL, updated to 1.6 - added soname patch (fix soversion change, do not decrease soname)

qboosh qboosh at pld-linux.org
Thu Oct 6 05:54:41 CEST 2016


commit 37623e97c8f4341e9d640284e90ec7661ba784a9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Oct 6 05:56:37 2016 +0200

    - new Source URL, updated to 1.6
    - added soname patch (fix soversion change, do not decrease soname)

 libconfig-soname.patch | 15 +++++++++++++++
 libconfig.spec         | 25 ++++++++++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)
---
diff --git a/libconfig.spec b/libconfig.spec
index ec021a8..a933147 100644
--- a/libconfig.spec
+++ b/libconfig.spec
@@ -1,16 +1,19 @@
 Summary:	C Configuration File Library
 Summary(pl.UTF-8):	Biblioteka C do plików konfiguracyjnych
 Name:		libconfig
-Version:	1.5
-Release:	2
+Version:	1.6
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://www.hyperrealm.com/libconfig/%{name}-%{version}.tar.gz
-# Source0-md5:	a939c4990d74e6fc1ee62be05716f633
+#Source0Download: https://github.com/hyperrealm/libconfig/releases
+Source0:	https://github.com/hyperrealm/libconfig/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	2ccd24b6a2ee39f7ff8a3badfafb6539
 Patch0:		%{name}-info.patch
+Patch1:		%{name}-soname.patch
 URL:		http://www.hyperrealm.com/main.php?s=libconfig
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	flex
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2.0
 BuildRequires:	texinfo
@@ -35,7 +38,7 @@ Jest bardzo mała, dzięki czemu dobrze nadaje się do systemów
 ograniczonych pamięciowo, takich jak palmtopy.
 
 Biblioteka ma dowiązania do języków C i C++. Działa na systemach
-unikowych zgodnych z POSIX (GNU/Linux, Mac OS X, Solaris, FreeBSD)
+uniksowych zgodnych z POSIX (GNU/Linux, Mac OS X, Solaris, FreeBSD)
 oraz Windows (2000, XP i późniejszych).
 
 %package devel
@@ -103,6 +106,10 @@ Statyczna biblioteka libconfig++.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
+# force regeneration, included files are outdated
+%{__rm} lib/scanner.[ch]
 
 %build
 %{__libtoolize}
@@ -110,8 +117,10 @@ Statyczna biblioteka libconfig++.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
-%{__make}
+%configure \
+	--disable-silent-rules
+# -j1 to workaround flex rebuild race
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -147,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libconfig.la
 %{_includedir}/libconfig.h
 %{_pkgconfigdir}/libconfig.pc
+%{_libdir}/cmake/libconfig
 %{_infodir}/libconfig.info*
 
 %files static
@@ -164,6 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libconfig++.la
 %{_includedir}/libconfig.h++
 %{_pkgconfigdir}/libconfig++.pc
+%{_libdir}/cmake/libconfig++
 
 %files c++-static
 %defattr(644,root,root,755)
diff --git a/libconfig-soname.patch b/libconfig-soname.patch
new file mode 100644
index 0000000..b08fa73
--- /dev/null
+++ b/libconfig-soname.patch
@@ -0,0 +1,15 @@
+Library interface has changed, but in compatible manner, so versioning
+should be changed from 11:0:2 (.so.9.2.0) to 12:0:3 (.so.9.3.0) instead
+of 11:1:3 (.so.8.3.1).
+
+--- libconfig-1.6/lib/Makefile.am.orig	2015-12-31 21:46:42.000000000 +0100
++++ libconfig-1.6/lib/Makefile.am	2016-10-06 05:37:00.327475124 +0200
+@@ -18,7 +18,7 @@
+ #
+ # For more info see section 6.3 of the GNU Libtool Manual.
+ 
+-VERINFO = -version-info 11:1:3
++VERINFO = -version-info 12:0:3
+ 
+ ## Flex
+ PARSER_PREFIX = libconfig_yy
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libconfig.git/commitdiff/37623e97c8f4341e9d640284e90ec7661ba784a9



More information about the pld-cvs-commit mailing list