diff --git a/innoextract.changes b/innoextract.changes index 07829b6..46d00a6 100644 --- a/innoextract.changes +++ b/innoextract.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Apr 12 11:18:14 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Remove workarounds for unsupported releases +- Use %cmake macros +- Update dependencies + ------------------------------------------------------------------- Mon Apr 8 21:10:02 UTC 2013 - pascal.bleser@opensuse.org diff --git a/innoextract.spec b/innoextract.spec index 869ae4e..825b2c5 100644 --- a/innoextract.spec +++ b/innoextract.spec @@ -1,5 +1,7 @@ -# vim: set sw=4 ts=4 et nu: - +# +# spec file for package innoextract +# +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -12,22 +14,25 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# -Name: innoextract -Version: 1.4 -Release: 0 -Summary: A tool to extract Inno Setup installers under non-windows systems -Source: https://github.com/dscharrer/innoextract/archive/%{version}.tar.gz -URL: https://github.com/dscharrer/InnoExtract/ -Group: Productivity/Archiving/Backup -License: Zlib -BuildRoot: %{_tmppath}/build-%{name}-%{version} -BuildRequires: python -BuildRequires: boost-devel -BuildRequires: xz-devel xz -BuildRequires: gcc-c++ -BuildRequires: cmake >= 2.8.0 -BuildRequires: glibc-devel pkgconfig + +Name: innoextract +Version: 1.4 +Release: 0 +Summary: A tool to extract Inno Setup installers under non-windows systems +License: Zlib +Group: Productivity/Archiving/Backup +Url: https://github.com/dscharrer/InnoExtract/ +Source: https://github.com/dscharrer/innoextract/archive/%{version}.tar.gz +BuildRequires: boost-devel +BuildRequires: cmake >= 2.8.0 +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: pkg-config +BuildRequires: python +BuildRequires: pkgconfig(liblzma) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Inno Setup is a tool to create installers for Microsoft Windows applications. @@ -37,40 +42,13 @@ supports installers created by Inno Setup 1.2.10 to 5.4.3. %prep %setup -q -# how awesome, on 12.1 the shlib symlink of liblzma is broken -# => crude workaround: -%if 0%{?suse_version} == 1210 -%__install -d lzma/lib -matches=$(/bin/ls -1 /%{_lib}/liblzma.so.*.*.* %{_libdir}/liblzma.so.*.*.* | wc -l) -[ $matches -gt 0 ] || { echo 'ERROR: failed to find any match for /%{_lib}/liblzma.so.*.*.*' >&2; exit 1; } -[ $matches -gt 1 ] && { echo 'ERROR: found too many matches for /%{_lib}/liblzma.so.*.*.*' >&2; exit 1; } -#' -%__ln_s $(/bin/ls -1 /%{_lib}/liblzma.so.*.*.*) lzma/lib/liblzma.so -%endif %build -LZMALIB="$PWD/lzma/lib" -%__install -d build -pushd build -cmake \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \ -%if 0%{?suse_version} == 1210 - -DCMAKE_LIBRARY_PATH="$LZMALIB" \ -%endif - .. -%__make %{?_smp_mflags} -popd +%cmake +make %{?_smp_mflags} %install -pushd build -%makeinstall -popd - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%cmake_install %files %defattr(-,root,root)