upstream 0.11.3

This commit is contained in:
Siddhesh Poyarekar 2010-12-12 12:06:38 +05:30
parent d47b20ea68
commit cf2fa2ebf2
2 changed files with 20 additions and 13 deletions

View File

@ -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"

View File

@ -5,8 +5,8 @@
Summary: Library for reading RAW files obtained from digital photo cameras Summary: Library for reading RAW files obtained from digital photo cameras
Name: LibRaw Name: LibRaw
Version: 0.9.1 Version: 0.11.3
Release: 9%{?dist} Release: 1%{?dist}
License: LGPLv2 or CDDL License: LGPLv2 or CDDL
Group: Development/Libraries Group: Development/Libraries
URL: http://www.libraw.org URL: http://www.libraw.org
@ -16,13 +16,7 @@ URL: http://www.libraw.org
Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz
# Configuration support. Patch sent upstream # Configuration support. Patch sent upstream
Patch0: %{name}-0.9.1-configure.patch Patch0: %{name}-0.11.3-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
%description %description
LibRaw is a library for reading RAW files obtained from digital photo 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 %setup -q
%patch0 -p1 -b .configure %patch0 -p1 -b .configure
%patch1 -p1 -b .configure-optflags
%patch2 -p1 -b .configure-default-cflags
%build %build
# This is not the autotools generated configure script # This is not the autotools generated configure script
CFLAGS="%{optflags} -fPIC" sh configure -P %{_prefix} CFLAGS="%{optflags} -fPIC" sh configure -P %{_prefix}
make %{?_smp_mflags} make %{?_smp_mflags} library
%install %install
cp -pr doc manual cp -pr doc manual
@ -62,13 +54,14 @@ cp -pr doc manual
chmod 644 LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf chmod 644 LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf
# The Libraries # The Libraries
make install DESTDIR=%{buildroot} LIBDIR=%{_lib} make install-library DESTDIR=%{buildroot} LIBDIR=%{_lib}
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE.CDDL LICENSE.LGPL COPYRIGHT Changelog.txt Changelog.rus %doc LICENSE.CDDL LICENSE.LGPL COPYRIGHT Changelog.txt Changelog.rus
%doc manual %doc manual
%doc samples
%dir %{_includedir}/libraw %dir %{_includedir}/libraw
%{_includedir}/libraw/*.h %{_includedir}/libraw/*.h
@ -76,6 +69,9 @@ make install DESTDIR=%{buildroot} LIBDIR=%{_lib}
%{_libdir}/libraw_r.a %{_libdir}/libraw_r.a
%changelog %changelog
* Sun Dec 12 2010 Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> 0.11.3-1
- upstream 0.11.3
* Sat Nov 13 2010 Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> 0.9.1-9 * Sat Nov 13 2010 Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> 0.9.1-9
- Build position independent object code - Build position independent object code