diff --git a/libsmbios.changes b/libsmbios.changes index 25e1f3d..036da48 100644 --- a/libsmbios.changes +++ b/libsmbios.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 10 21:44:30 UTC 2020 - Bjørn Lie + +- Move /usr/share/locale/en from the -lang package to the main + package: English is installed on all systems. This avoids + libsmbios-lang being triggered for installation on english-only + systems. +- Modernize spec. + ------------------------------------------------------------------- Wed Nov 21 13:49:06 UTC 2018 - Enno Gotthold diff --git a/libsmbios.spec b/libsmbios.spec index 26b9c52..098630e 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -1,7 +1,7 @@ # # spec file for package libsmbios # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Group: Hardware/Other URL: https://github.com/dell/libsmbios Source: %{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc + BuildRequires: autoconf BuildRequires: automake BuildRequires: chrpath @@ -121,19 +122,20 @@ This package contains the headers and .a files necessary to compile new client programs against libsmbios. %prep -%setup -q +%autosetup -p1 %build autoreconf -fvi export CFLAGS="%{optflags} -fPIE" export LDFLAGS="-pie" %configure \ - --disable-static \ - --enable-nls \ - --enable-python \ - --enable-as-needed \ - --enable-doxygen -make %{?_smp_mflags} + --disable-static \ + --enable-nls \ + --enable-python \ + --enable-as-needed \ + --enable-doxygen \ + %{nil} +%make_build %install %make_install @@ -171,8 +173,11 @@ make %{?_smp_mflags} check %license COPYING-GPL COPYING-OSL %license src/bin/getopts_LICENSE.txt %{_libdir}/libsmbios_c.so.* +%{_datadir}/locale/en/ %files lang -f %{name}.lang +# english locale should be in the main package +%exclude %{_datadir}/locale/en %files -n libsmbios-devel %{_includedir}/smbios