rpms/OpenEXR/devel OpenEXR.spec, 1.21, 1.22 openexr-1.6.0-pkgconfig.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/OpenEXR/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23470

Modified Files:
	OpenEXR.spec 
Removed Files:
	openexr-1.6.0-pkgconfig.patch 
Log Message:
* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.6.1-2
- hack to omit unused-direct-shlib-dependencies
- conditionalize -libs (f8+)



Index: OpenEXR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR/devel/OpenEXR.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- OpenEXR.spec	7 Jan 2008 14:39:43 -0000	1.21
+++ OpenEXR.spec	14 Jan 2008 13:58:08 -0000	1.22
@@ -1,7 +1,12 @@
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Name:	 OpenEXR
 Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A high dynamic-range (HDR) image file format
 
 Group:	 System Environment/Libraries
@@ -14,13 +19,17 @@
 Obsoletes: openexr < %{version}-%{release}
 Provides:  openexr = %{version}-%{release}
 
-# Use Libs.private
-Patch2: openexr-1.6.0-pkgconfig.patch
+Patch1: OpenEXR-1.6.1-pkgconfig.patch
 
 BuildRequires:  ilmbase-devel
 BuildRequires:  zlib-devel
 
+%if 0%{?libs}
 Requires: %{name}-libs = %{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{version}-%{release}
+Provides:  %{name}-libs = %{version}-%{release}
+%endif
 
 # until when/if openexr_viewers gets build for fedora
 Obsoletes: %{name}-utils < %{version}-%{release}
@@ -51,12 +60,15 @@
 %prep
 %setup -q -n openexr-%{version}
 
-%patch2 -p1 -b .pkgconfig
+%patch1 -p1 -b .pkgconfig
 
 
 %build
 %configure --disable-static
 
+# hack to omit unused-direct-shlib-dependencies
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
+
 make %{?_smp_mflags}
 
 
@@ -65,6 +77,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -83,15 +96,28 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
+%else
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+%endif
 
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%doc AUTHORS ChangeLog LICENSE NEWS README
+%{_libdir}/lib*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 #omit for now, they're mostly useless, and include multilib conflicts (#342781)
@@ -101,13 +127,12 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
-%files libs
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE NEWS README
-%{_libdir}/lib*.so.*
-
 
 %changelog
+* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.6.1-2
+- hack to omit unused-direct-shlib-dependencies
+- conditionalize -libs (f8+)
+
 * Mon Jan 07 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.6.1-1
 - openexr-1.6.1
 


--- openexr-1.6.0-pkgconfig.patch DELETED ---