From dce12f9e42be5943f70fef7a50863df3b456eae3 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Mon, 21 Mar 2016 12:35:21 +0100 Subject: [PATCH] rebase to new version --- libmaxminddb.spec | 20 +++++--------------- sources | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/libmaxminddb.spec b/libmaxminddb.spec index a073f33..310ae8e 100644 --- a/libmaxminddb.spec +++ b/libmaxminddb.spec @@ -1,14 +1,10 @@ Name: libmaxminddb Summary: C library for the MaxMind DB file format -Version: 1.1.1 -Release: 6%{?dist} +Version: 1.1.5 +Release: 1%{?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 @@ -36,12 +32,6 @@ 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 @@ -50,9 +40,6 @@ 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 @@ -74,6 +61,9 @@ install -m 0644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/ %{_mandir}/man3/* %changelog +* Mon Mar 21 2016 Jan Vcelak 1.1.5-1 +- rebase to new version + * Thu Feb 04 2016 Fedora Release Engineering - 1.1.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 801429b..989de2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36c31f0814dbf71b210ee57c2b9ef98c libmaxminddb-1.1.1.tar.gz +4085bdcc243cdf91e61c2155e5e5c157 libmaxminddb-1.1.5.tar.gz