From e7258893d8e00605e72ed8314f45e97e53751b59 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 30 Oct 2018 08:52:59 -0500 Subject: [PATCH] 0.8alpha use %make_build %make_install %ldconfig_scriptlets %license devel: use %{?_isa} to tighten dep on main pkg drop deprecated Group: tag %files: tighten to include library soname --- libmspack.spec | 38 ++++++++++++++++++++++++-------------- sources | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/libmspack.spec b/libmspack.spec index 8d7973f..45f4b88 100644 --- a/libmspack.spec +++ b/libmspack.spec @@ -1,19 +1,20 @@ Name: libmspack -Version: 0.7 +Version: 0.8 Release: 0.1.alpha%{?dist} Summary: Library for CAB and related files compression and decompression -Group: System Environment/Libraries License: LGPLv2 URL: http://www.cabextract.org.uk/libmspack/ -#Source0: http://www.cabextract.org.uk/libmspack/%{name}-%{version}alpha.tar.gz -Source0: https://github.com/kyz/libmspack/archive/v0.7alpha/%{name}-v0.7alpha.tar.gz +Source0: http://www.cabextract.org.uk/libmspack/%{name}-%{version}alpha.tar.gz +#Source0: https://github.com/kyz/libmspack/archive/v%{version}alpha/%{name}-v%{version}alpha.tar.gz + Patch0: %{name}-0.4alpha-doc.patch + BuildRequires: doxygen BuildRequires: gcc # Temporarily while building from github tarball: -BuildRequires: autoconf, automake, libtool +#BuildRequires: autoconf, automake, libtool %description @@ -22,8 +23,7 @@ some loosely related file formats used by Microsoft. %package devel Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: %{name}-doc < 0.2 %description devel @@ -32,28 +32,28 @@ for developing applications that use %{name}. %prep -%setup -q -n %{name}-%{version}alpha/libmspack +%setup -q -n %{name}-%{version}alpha %patch0 -p1 chmod a-x mspack/mspack.h # Temporarily while building from github tarball: -autoreconf -i +#autoreconf -fi %build -CFLAGS="%{optflags} -fno-strict-aliasing" \ %configure --disable-static --disable-silent-rules # disable rpath the hard way 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 -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +%make_install + rm $RPM_BUILD_ROOT%{_libdir}/libmspack.la iconv -f ISO_8859-1 -t utf8 ChangeLog --output Changelog.utf8 @@ -67,13 +67,16 @@ rm -f html/installdox popd +%ldconfig_scriptlets + %files -%doc README TODO COPYING.LIB ChangeLog AUTHORS +%doc README TODO ChangeLog AUTHORS +%license COPYING.LIB %{_bindir}/cabrip %{_bindir}/chmextract %{_bindir}/msexpand %{_bindir}/oabextract -%{_libdir}/%{name}.so.* +%{_libdir}/%{name}.so.0* %files devel %doc doc/html @@ -83,6 +86,13 @@ popd %changelog +* Tue Oct 30 2018 Rex Dieter - 0.8-0.1.alpha +- 0.8alpha +- use %%make_build %%make_install %%ldconfig_scriptlets %%license +- devel: use %%{?_isa} to tighten dep on main pkg +- drop deprecated Group: tag +- %%files: tighten to include library soname + * Wed Aug 01 2018 Richard W.M. Jones - 0.7-0.1.alpha - New upstream version 0.7alpha. - No tarball was uploaded so temporarily use tarball from github. diff --git a/sources b/sources index 5f4461f..d1ac588 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmspack-v0.7alpha.tar.gz) = f8118b61d223acbe983a2c1cfb4703b7b906232ce86be916b70f6920a05aa342dcd2ca91f3aa9610a16eb7cb3102e9484c78ba08adbc6a7c0521e895f2bbf231 +SHA512 (libmspack-0.8alpha.tar.gz) = d178afc4d2eded204594c81af1c91be17d3be4f1a09829e08c103023aa7badc6b2595e9ec13cc7f77e3262d2cd874ed40ce6da01695c5c839682562740d2bf0a