diff --git a/LibRaw-0.11.3-configure.patch b/LibRaw-0.11.3-configure.patch new file mode 100644 index 0000000..1e8dffd --- /dev/null +++ b/LibRaw-0.11.3-configure.patch @@ -0,0 +1,11 @@ +--- LibRaw-0.11.3/configure 2010-11-17 14:11:26.000000000 +0530 ++++ LibRaw-0.9.1/configure 2010-12-12 11:03:02.949717114 +0530 +@@ -5,7 +5,7 @@ + CXX="g++" + enable_lcms="no" + enable_openmp="no" +-CFLAGS="-O4 -I. -w" ++CFLAGS="-O4 -I. -w $CFLAGS" + LDFLAGS= + DESTDIR="" + PREFIX="/usr/local" diff --git a/LibRaw.spec b/LibRaw.spec index 82238bd..5a23a10 100644 --- a/LibRaw.spec +++ b/LibRaw.spec @@ -5,8 +5,8 @@ Summary: Library for reading RAW files obtained from digital photo cameras Name: LibRaw -Version: 0.9.1 -Release: 9%{?dist} +Version: 0.11.3 +Release: 1%{?dist} License: LGPLv2 or CDDL Group: Development/Libraries URL: http://www.libraw.org @@ -16,13 +16,7 @@ URL: http://www.libraw.org Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz # Configuration support. Patch sent upstream -Patch0: %{name}-0.9.1-configure.patch - -# Use optflags for build -Patch1: %{name}-0.9.1-configure-optflags.patch - -# Don't impose -O4 and -w -Patch2: %{name}-0.9.1-configure-default-cflags.patch +Patch0: %{name}-0.11.3-configure.patch %description LibRaw is a library for reading RAW files obtained from digital photo @@ -47,13 +41,11 @@ against LibRaw. LibRaw does not provide dynamic libraries. %setup -q %patch0 -p1 -b .configure -%patch1 -p1 -b .configure-optflags -%patch2 -p1 -b .configure-default-cflags %build # This is not the autotools generated configure script CFLAGS="%{optflags} -fPIC" sh configure -P %{_prefix} -make %{?_smp_mflags} +make %{?_smp_mflags} library %install cp -pr doc manual @@ -62,13 +54,14 @@ cp -pr doc manual chmod 644 LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf # The Libraries -make install DESTDIR=%{buildroot} LIBDIR=%{_lib} +make install-library DESTDIR=%{buildroot} LIBDIR=%{_lib} %files devel %defattr(-,root,root,-) %doc LICENSE.CDDL LICENSE.LGPL COPYRIGHT Changelog.txt Changelog.rus %doc manual +%doc samples %dir %{_includedir}/libraw %{_includedir}/libraw/*.h @@ -76,6 +69,9 @@ make install DESTDIR=%{buildroot} LIBDIR=%{_lib} %{_libdir}/libraw_r.a %changelog +* Sun Dec 12 2010 Siddhesh Poyarekar 0.11.3-1 +- upstream 0.11.3 + * Sat Nov 13 2010 Siddhesh Poyarekar 0.9.1-9 - Build position independent object code