[ilmbase] Fix spec issues, modernise spec

Peter Robinson pbrobinson at fedoraproject.org
Wed Aug 28 23:23:13 UTC 2013


commit f5055bc33e082313f13ef0c38a9e016ec15335eb
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Aug 29 00:22:57 2013 +0100

    Fix spec issues, modernise spec

 ilmbase.spec |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/ilmbase.spec b/ilmbase.spec
index 419186d..b650cbf 100644
--- a/ilmbase.spec
+++ b/ilmbase.spec
@@ -1,14 +1,12 @@
-
 Name:	 ilmbase 
 Version: 1.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Abstraction/convenience libraries
 
 Group:	 System Environment/Libraries
 License: BSD
 URL:	 http://www.openexr.com/
 Source0: https://github.com/downloads/openexr/openexr/ilmbase-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automake libtool
 BuildRequires: pkgconfig
@@ -60,9 +58,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %patch51 -p1 -b .no_undefined
 %patch52 -p1 -b .secondary
 %patch53 -p1 -b .pkgconfig
-%if %{__isa_bits} == 32
+%ifarch %{ix86} %{arm} ppc
 %patch100 -p1 -b .ucontext
 %endif
+
 ./bootstrap
 
 
@@ -75,11 +74,9 @@ make %{?_smp_mflags} PTHREAD_LIBS="-pthread -lpthread"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-rm -fv  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %check
@@ -93,15 +90,10 @@ make check
 %endif
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libHalf.so.6*
 %{_libdir}/libIex.so.6*
@@ -110,13 +102,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libImath.so.6*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/OpenEXR/
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/IlmBase.pc
 
 
 %changelog
+* Thu Aug 29 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.0.3-7
+- Fix spec issues, modernise spec
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list