diff --git a/.gitignore b/.gitignore index 6b83c18..783bfa1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /inih-r36.tar.gz +/inih-r49.tar.gz diff --git a/inih.spec b/inih.spec index 852aadf..670c522 100644 --- a/inih.spec +++ b/inih.spec @@ -1,8 +1,6 @@ -%global sover 0 - Name: inih -Version: 36 -Release: 13%{?dist} +Version: 49 +Release: 1%{?dist} Summary: Simple INI file parser library License: BSD @@ -10,6 +8,8 @@ URL: https://github.com/benhoyt/inih Source0: %{url}/archive/r%{version}/%{name}-r%{version}.tar.gz BuildRequires: gcc +BuildRequires: g++ +BuildRequires: meson %description @@ -32,38 +32,38 @@ embedded systems. %prep -%setup -q -n %{name}-r%{version} +%autosetup -n %{name}-r%{version} %build -gcc -c -fPIC %{optflags} ini.c -gcc -shared %{?__global_ldflags} -o lib%{name}.so.%{sover}.%{version} -Wl,-soname,lib%{name}.so.%{sover} ini.o +%meson -Ddefault_library=shared -Ddistro_install=true +%meson_build %install -install -d %{buildroot}%{_libdir} -install -D -p -m 644 ini.h %{buildroot}%{_includedir}/ini.h -install -p -m 755 lib%{name}.so* %{buildroot}%{_libdir}/ -ln -s lib%{name}.so.%{sover}.%{version} %{buildroot}%{_libdir}/lib%{name}.so.%{sover} -ln -s lib%{name}.so.%{sover}.%{version} %{buildroot}%{_libdir}/lib%{name}.so - - -%ldconfig_scriptlets +%meson_install %files %license LICENSE.txt %doc README.md -%{_libdir}/lib%{name}.so.%{sover}.%{version} -%{_libdir}/lib%{name}.so.%{sover} +%{_libdir}/lib%{name}.so.%{version} +%{_libdir}/lib%{name}.so.0 %files devel %{_includedir}/ini.h +%{_libdir}/pkgconfig/inih.pc %{_libdir}/lib%{name}.so %changelog +* Wed Jun 3 2020 Christian Kellner - 49-1 +- New upstream release 49 +- Switch to meson build system. +- Ship the pkg-config file. +- Remove ldconfig scriptlets. + * Wed Jan 29 2020 Fedora Release Engineering - 36-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index ed3bfe4..64f3f94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31f158046e7d7659912d92e3b8457b4b inih-r36.tar.gz +SHA512 (inih-r49.tar.gz) = 43f7f624977e46578d1576441d8523aee08eb5fecba1dc0fffbebbd5543314ba93c19a7617aa53bbe53d00c8964bdb070064dc663617ae980d8eecf04af9f067