diff --git a/libmaxminddb.pc.in b/libmaxminddb.pc.in deleted file mode 100644 index 00ced3b..0000000 --- a/libmaxminddb.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -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 400a8c6..e3c4fcd 100644 --- a/libmaxminddb.spec +++ b/libmaxminddb.spec @@ -1,40 +1,40 @@ Name: libmaxminddb Summary: C library for the MaxMind DB file format -Version: 1.2.0 -Release: 8%{?dist} +Version: 1.3.2 +Release: 1%{?dist} URL: https://maxmind.github.io/libmaxminddb -Source0: https://github.com/maxmind/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/maxmind/libmaxminddb/releases/download/%{version}/%{name}-%{version}.tar.gz # original libmaxminddb code is Apache Licence 2.0 # src/maxminddb-compat-util.h is BSD License: ASL 2.0 and BSD BuildRequires: gcc +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: perl-interpreter %description The package contains libmaxminddb library. %package devel -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig Summary: Development header files for libmaxminddb +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel The package contains development header files for the libmaxminddb library and the mmdblookup utility which allows IP address lookup in a MaxMind DB file. %prep -%setup -q +%autosetup +sed -i -e '/AM_CFLAGS=/d' common.mk +sed -i -e '/CFLAGS=/d' configure.ac %build +autoreconf -vfi %configure --disable-static -# remove embeded RPATH -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -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} +%make_build %check # tests are linked dynamically, preload the library as we have removed RPATH @@ -42,13 +42,11 @@ LD_PRELOAD=%{buildroot}%{_libdir}/libmaxminddb.so make check %install %make_install -rm -fv %{buildroot}%{_libdir}/*.la - -%ldconfig_scriptlets +rm -v %{buildroot}%{_libdir}/*.la %files %license LICENSE -%{_libdir}/libmaxminddb.so.* +%{_libdir}/libmaxminddb.so.0* %files devel %license NOTICE @@ -58,10 +56,13 @@ rm -fv %{buildroot}%{_libdir}/*.la %{_includedir}/maxminddb_config.h %{_libdir}/libmaxminddb.so %{_libdir}/pkgconfig/libmaxminddb.pc -%{_mandir}/man1/* -%{_mandir}/man3/* +%{_mandir}/man1/*.1* +%{_mandir}/man3/*.3* %changelog +* Mon Oct 21 2019 Igor Gnatenko - 1.3.2-1 +- Update to 1.3.2 + * Thu Jul 25 2019 Fedora Release Engineering - 1.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index b329ce1..94342f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fae9021779dffe1b87f038d21f8afd56 libmaxminddb-1.2.0.tar.gz +SHA512 (libmaxminddb-1.3.2.tar.gz) = 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115