rpms/OpenEXR/FC-5 OpenEXR-1.2.2-zlib.patch, 1.2, 1.3 OpenEXR.spec, 1.8, 1.9

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Oct 17 12:23:08 UTC 2006


Author: rdieter

Update of /cvs/extras/rpms/OpenEXR/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21568

Modified Files:
	OpenEXR-1.2.2-zlib.patch OpenEXR.spec 
Log Message:
* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
- own %_docdir/OpenEXR-devel-%version (#210997)
- devel: Requires: pkgconfig
- update zlib patch (use Libs.private)


OpenEXR-1.2.2-zlib.patch:

Index: OpenEXR-1.2.2-zlib.patch
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-5/OpenEXR-1.2.2-zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenEXR-1.2.2-zlib.patch	19 Feb 2006 04:23:12 -0000	1.2
+++ OpenEXR-1.2.2-zlib.patch	17 Oct 2006 12:22:37 -0000	1.3
@@ -1,11 +1,12 @@
---- OpenEXR-1.2.2/OpenEXR.pc.in.zlib	2005-08-13 10:33:18.000000000 -0400
-+++ OpenEXR-1.2.2/OpenEXR.pc.in	2005-08-13 10:33:30.000000000 -0400
-@@ -7,5 +7,5 @@
+--- OpenEXR-1.2.2/OpenEXR.pc.in.zlib    2005-03-09 13:37:46.000000000 -0600
++++ OpenEXR-1.2.2/OpenEXR.pc.in 2006-10-17 07:07:17.000000000 -0500
+@@ -7,5 +7,6 @@
  Name: OpenEXR
  Description: OpenEXR image library
  Version: @OPENEXR_VERSION@
 -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz
 +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex
++Libs.private: -lz
  Cflags: -I${OpenEXR_includedir}
 --- OpenEXR-1.2.2/Half/Makefile.am.165729	2004-02-05 23:22:01.000000000 -0600
 +++ OpenEXR-1.2.2/Half/Makefile.am	2006-02-09 22:42:18.000000000 -0600


Index: OpenEXR.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenEXR/FC-5/OpenEXR.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OpenEXR.spec	19 Feb 2006 04:23:12 -0000	1.8
+++ OpenEXR.spec	17 Oct 2006 12:22:37 -0000	1.9
@@ -1,17 +1,21 @@
+
 Name:           OpenEXR
 Version:        1.2.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A high dynamic-range (HDR) image file format
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.openexr.com/
-Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz
-Patch:          %{name}-1.2.2-zlib.patch
-Patch1:         %{name}-1.2.2-forwardfriend.patch
+Source0:        http://savannah.nongnu.org/download/openexr/OpenEXR-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fltk-devel >= 1.1 zlib-devel automake libtool autoconf
+Patch0:         OpenEXR-1.2.2-zlib.patch
+Patch1:         OpenEXR-1.2.2-forwardfriend.patch
+
+BuildRequires:  fltk-devel >= 1.1
+BuildRequires:  zlib-devel
+BuildRequires:  automake libtool
 
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
@@ -21,52 +25,75 @@
 %package        devel
 Summary:        Headers and libraries for building apps that use OpenEXR
 Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 %description    devel
 This package contains headers and libraries required to build applications that
 use the OpenEXR format.
 
+
 %prep
 %setup -q
-%patch -p1 -b .zlib
+
+%patch0 -p1 -b .zlib
 %patch1 -p1 -b .forwardfriend
 ./bootstrap
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name \*.la -exec rm \{\} \;
-install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-cp -a IlmImfExamples $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}
-rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples/.deps
+
+# unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+# prepare docs
+mkdir -p rpmdocs
+cp -a IlmImfExamples rpmdocs/examples
+rm -rf rpmdocs/examples/.deps
+
+
+%check
+# Not enabled, by default, takes a *very* long time. -- Rex
+%{?_with_check:make check}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog LICENSE NEWS README
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples
+%doc rpmdocs/examples 
 %{_datadir}/aclocal/*
-%{_includedir}/OpenEXR
-%{_libdir}/*.so
+%{_includedir}/OpenEXR/
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
+
 %changelog
+* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-8
+- own %%_docdir/OpenEXR-devel-%%version (#210997)
+- devel: Requires: pkgconfig
+- update zlib patch (use Libs.private)
+
 * Sat Feb 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.2-7
 - Further zlib fixes (#165729)
 




More information about the scm-commits mailing list