From 864ebd17a170e7ebcfd9e19c964aafefe0ab3c09 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Tue, 15 Sep 2015 15:42:35 +0200 Subject: [PATCH] add pkg-config from upcoming upstream version --- libmaxminddb.pc.in | 11 +++++++++++ libmaxminddb.spec | 21 +++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 libmaxminddb.pc.in diff --git a/libmaxminddb.pc.in b/libmaxminddb.pc.in new file mode 100644 index 0000000..00ced3b --- /dev/null +++ b/libmaxminddb.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libmaxminddb +Description: C library for the MaxMind DB file format +URL: http://maxmind.github.io/libmaxminddb/ +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lmaxminddb +Cflags: -I${includedir} diff --git a/libmaxminddb.spec b/libmaxminddb.spec index d0b58ae..859ae7d 100644 --- a/libmaxminddb.spec +++ b/libmaxminddb.spec @@ -1,10 +1,14 @@ Name: libmaxminddb Summary: C library for the MaxMind DB file format Version: 1.1.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: https://maxmind.github.io/libmaxminddb Source0: https://github.com/maxmind/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz +# Add pkg-config from the upcomming release: +# https://github.com/maxmind/libmaxminddb/commit/9b788d0492e6149d01a1088ca15c85315a8113d0 +Source1: libmaxminddb.pc.in + # original libmaxminddb code is Apache Licence 2.0 # src/maxminddb-compat-util.h is BSD License: ASL 2.0 and BSD @@ -14,6 +18,7 @@ The package contains libmaxminddb library. %package devel Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig Summary: Development header files for libmaxminddb %description devel @@ -31,6 +36,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # link only requried libraries sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} +# generate pkg-config file +sed -e 's;@prefix@;%{_prefix};g' \ + -e 's;@libdir@;%{_libdir};g' \ + -e 's;@includedir@;%{_includedir};g' \ + -e 's;@PACKAGE_VERSION@;%{version};g' \ + %{SOURCE1} > %{name}.pc %check # tests are linked dynamically, preload the library as we have removed RPATH @@ -39,6 +50,9 @@ LD_PRELOAD=%{buildroot}%{_libdir}/libmaxminddb.so make check %install %make_install rm -fv %{buildroot}%{_libdir}/*.la +# install generated pkg-config +mkdir -p %{buildroot}%{_libdir}/pkgconfig +install -m 0644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/ %post -p /sbin/ldconfig @@ -55,11 +69,14 @@ rm -fv %{buildroot}%{_libdir}/*.la %{_includedir}/maxminddb.h %{_includedir}/maxminddb_config.h %{_libdir}/libmaxminddb.so +%{_libdir}/pkgconfig/libmaxminddb.pc %{_mandir}/man1/* %{_mandir}/man3/* - %changelog +* Tue Sep 15 2015 Jan Vcelak 1.1.1-5 +- add pkg-config file from the upcoming upstream version + * Mon Sep 14 2015 Jan Vcelak 1.1.1-4 - remove utils subpackage and place mmdblookup into devel subpackage - remove Group from the spec file