rpms/OpenEXR/F-8 OpenEXR-1.6.1-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 OpenEXR.spec, 1.17, 1.18 sources, 1.4, 1.5 openexr-1.6.0-pkgconfig.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/OpenEXR/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32029

Modified Files:
	.cvsignore OpenEXR.spec sources 
Added Files:
	OpenEXR-1.6.1-pkgconfig.patch 
Removed Files:
	openexr-1.6.0-pkgconfig.patch 
Log Message:
rawhide sync (1.6.1)


OpenEXR-1.6.1-pkgconfig.patch:

--- NEW FILE OpenEXR-1.6.1-pkgconfig.patch ---
diff -up openexr-1.6.1/OpenEXR.pc.in.pkgconfig openexr-1.6.1/OpenEXR.pc.in
--- openexr-1.6.1/OpenEXR.pc.in.pkgconfig	2007-03-30 12:14:05.000000000 -0500
+++ openexr-1.6.1/OpenEXR.pc.in	2008-01-09 10:08:53.000000000 -0600
@@ -7,5 +7,7 @@ OpenEXR_includedir=@includedir@/OpenEXR
 Name: OpenEXR
 Description: OpenEXR image library
 Version: @OPENEXR_VERSION@
-Libs: -L${libdir} @ILMBASE_LDFLAGS@ -lIlmImf -lz @ILMBASE_LIBS@
-Cflags: @ILMBASE_CXXFLAGS@ -I${OpenEXR_includedir}
+Requires: IlmBase
+Libs: -L${libdir} -lIlmImf
+Libs.private: -lz
+Cflags: -I${OpenEXR_includedir}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2007 13:05:32 -0000	1.4
+++ .cvsignore	14 Jan 2008 14:49:47 -0000	1.5
@@ -1,3 +1,2 @@
-openexr-1.4.0a.tar.gz
-openexr-1.6.0.tar.gz
-openexr-1.6.0.tar.gz.sig
+openexr-1.6.1.tar.gz
+openexr-1.6.1.tar.gz.sig


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR/F-8/OpenEXR.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- OpenEXR.spec	30 Oct 2007 13:04:07 -0000	1.17
+++ OpenEXR.spec	14 Jan 2008 14:49:47 -0000	1.18
@@ -1,7 +1,12 @@
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Name:	 OpenEXR
-Version: 1.6.0 
-Release: 5%{?dist}
+Version: 1.6.1
+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,15 @@
 %{_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
+
 * Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.6.0-5
 - multiarch conflicts in OpenEXR (#342781)
 - don't own %%_includedir/OpenEXR (leave that to ilmbase)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2007 13:05:32 -0000	1.4
+++ sources	14 Jan 2008 14:49:47 -0000	1.5
@@ -1,2 +1,2 @@
-2a5cd9002f8ec6055bf5ba13b6d57668  openexr-1.6.0.tar.gz
-c8d2c77d74f6191d0b72475061051cba  openexr-1.6.0.tar.gz.sig
+11951f164f9c872b183df75e66de145a  openexr-1.6.1.tar.gz
+2a45771c4d95eadbdf462561a70c24bb  openexr-1.6.1.tar.gz.sig


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