From d61409a38faea72bd4bdd40fd493d745746dd78f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 14 Apr 2017 07:58:35 -0500 Subject: [PATCH] fix rpath, tighten subpkg dependencies, use %license --- LibRaw.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/LibRaw.spec b/LibRaw.spec index cd198f7..76e5c0d 100644 --- a/LibRaw.spec +++ b/LibRaw.spec @@ -1,7 +1,7 @@ Summary: Library for reading RAW files obtained from digital photo cameras Name: LibRaw Version: 0.18.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Development/Libraries URL: http://www.libraw.org @@ -28,7 +28,7 @@ drawbacks have already been eliminated and part will be fixed in future. %package devel Summary: LibRaw development libraries Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel LibRaw development libraries. @@ -39,6 +39,7 @@ against LibRaw. %package static Summary: LibRaw static development libraries Group: Development/Libraries +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description static LibRaw static development libraries. @@ -55,11 +56,16 @@ LibRaw sample programs %patch0 -p0 -b .pkgconfig %patch1 -p1 -b .CVE-2015-8366 -#%patch2 -p0 +#patch2 -p0 %build %configure --enable-examples=yes --enable-jasper --enable-lcms \ --enable-demosaic-pack-gpl2 --enable-demosaic-pack-gpl3 + +# https://fedoraproject.org/wiki/Packaging:Guidelines#Beware_of_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 + make %{?_smp_mflags} %install @@ -72,7 +78,8 @@ make install DESTDIR=%{buildroot} %files %defattr(-,root,root,-) -%doc LICENSE.CDDL LICENSE.LGPL COPYRIGHT Changelog.txt +%doc Changelog.txt +%license LICENSE.CDDL LICENSE.LGPL COPYRIGHT %{_libdir}/*.so.* %files static @@ -98,6 +105,9 @@ make install DESTDIR=%{buildroot} %postun -p /sbin/ldconfig %changelog +* Fri Apr 14 2017 Rex Dieter - 0.18.2-2 +- fix rpath, tighten subpkg dependencies, use %%license + * Thu Mar 09 2017 Jon Ciesla - 0.18.2-1 - 0.18.2.