From 19d3823b1b7202d32a141af9ba3ce5d1f16101ec Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 10:53:20 +0000 Subject: import LibRaw-0.19.2-1.el7 --- diff --git a/.LibRaw.metadata b/.LibRaw.metadata index f86b6c6..875f5bb 100644 --- a/.LibRaw.metadata +++ b/.LibRaw.metadata @@ -1,3 +1 @@ -49cc14fb4710d32212844116f7a505f5d64f1a60 SOURCES/LibRaw-98d925.tar.gz -66775c1e6c30857bb2e6529056586551b77fc674 SOURCES/LibRaw-demosaic-pack-GPL2-0.14.8.tar.gz -9c6d8429a3ad417514f6af7293ff8b38c4e22b3a SOURCES/LibRaw-demosaic-pack-GPL3-0.14.8.tar.gz +8753c4a6ba0dc5182bcb531c44920d3ad084128a SOURCES/LibRaw-0.19.2.tar.gz diff --git a/.gitignore b/.gitignore index dca4de2..8e1bce3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -SOURCES/LibRaw-98d925.tar.gz -SOURCES/LibRaw-demosaic-pack-GPL2-0.14.8.tar.gz -SOURCES/LibRaw-demosaic-pack-GPL3-0.14.8.tar.gz +SOURCES/LibRaw-0.19.2.tar.gz diff --git a/SOURCES/LibRaw-0.6.0-pkgconfig.patch b/SOURCES/LibRaw-0.6.0-pkgconfig.patch new file mode 100644 index 0000000..7cabd6b --- /dev/null +++ b/SOURCES/LibRaw-0.6.0-pkgconfig.patch @@ -0,0 +1,42 @@ +--- libraw.pc.in~ 2014-01-17 07:38:31.000000000 -0600 ++++ libraw.pc.in 2014-02-20 14:18:20.559279964 -0600 +@@ -7,5 +7,6 @@ + Description: Raw image decoder library (non-thread-safe) + Requires: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ ++Libs: -L${libdir} -lraw@PC_OPENMP@ ++Libs.private: -lstdc++ + Cflags: -I${includedir}/libraw +--- libraw_r.pc.in~ 2014-01-17 07:38:31.000000000 -0600 ++++ libraw_r.pc.in 2014-02-20 14:20:35.740276947 -0600 +@@ -7,5 +7,6 @@ + Description: Raw image decoder library (thread-safe) + Requires: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ ++Libs: -L${libdir} -lraw_r@PC_OPENMP@ ++Libs.private: -lstdc++ + Cflags: -I${includedir}/libraw +--- libraw_r.pc.in~ 2014-02-20 14:22:36.000000000 -0600 ++++ libraw_r.pc.in 2014-02-20 14:27:24.454267828 -0600 +@@ -5,7 +5,7 @@ + + Name: libraw + Description: Raw image decoder library (thread-safe) +-Requires: @PACKAGE_REQUIRES@ ++Requires.private: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lraw_r@PC_OPENMP@ + Libs.private: -lstdc++ +--- libraw.pc.in~ 2014-02-20 14:22:36.000000000 -0600 ++++ libraw.pc.in 2014-02-20 14:27:18.368267964 -0600 +@@ -5,7 +5,7 @@ + + Name: libraw + Description: Raw image decoder library (non-thread-safe) +-Requires: @PACKAGE_REQUIRES@ ++Requires.private: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lraw@PC_OPENMP@ + Libs.private: -lstdc++ diff --git a/SPECS/LibRaw.spec b/SPECS/LibRaw.spec index bc8d3e2..ea3673b 100644 --- a/SPECS/LibRaw.spec +++ b/SPECS/LibRaw.spec @@ -1,27 +1,19 @@ - Summary: Library for reading RAW files obtained from digital photo cameras Name: LibRaw -Version: 0.14.8 -Release: 5%{?dist}.20120830git98d925 -License: GPLv3+ -Group: Development/Libraries +Version: 0.19.2 +Release: 1%{?dist} +License: BSD and (CDDL or LGPLv2) URL: http://www.libraw.org -BuildRequires: lcms2-devel -BuildRequires: jasper-devel - +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(jasper) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: autoconf automake libtool -#Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz -# git clone https://github.com/LibRaw/LibRaw.git -# git checkout 0.14-stable -# rm -rf .git -# ./mkdist.sh -# cd .. ; mv LibRaw/ LibRaw-98d925/ -# tar -czf LibRaw-98d925.tar.gz LibRaw-98d925/ -Source0: LibRaw-98d925.tar.gz -#Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz -Source1: http://www.libraw.org/data/%{name}-demosaic-pack-GPL2-%{version}.tar.gz -Source2: http://www.libraw.org/data/%{name}-demosaic-pack-GPL3-%{version}.tar.gz +Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz +Patch0: LibRaw-0.6.0-pkgconfig.patch +Provides: bundled(dcraw) = 9.25 %description LibRaw is a library for reading RAW files obtained from digital photo @@ -32,8 +24,7 @@ drawbacks have already been eliminated and part will be fixed in future. %package devel Summary: LibRaw development libraries -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel LibRaw development libraries. @@ -43,51 +34,100 @@ against LibRaw. %package static Summary: LibRaw static development libraries -Group: Development/Libraries +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description static LibRaw static development libraries. +%if 0%{?rhel} != 7 +%package samples +Summary: LibRaw sample programs +Requires: %{name} = %{version}-%{release} + +%description samples +LibRaw sample programs +%endif + %prep -%setup -q -a1 -a2 -n LibRaw-98d925 +%setup -q + +%patch0 -p0 -b .pkgconfig %build -%configure --enable-examples=no --enable-jasper --enable-lcms \ - --enable-demosaic-pack-gpl2 --enable-demosaic-pack-gpl3 -make %{?_smp_mflags} +autoreconf -if +%configure \ +%if 0%{?rhel} == 7 + --enable-examples=no \ +%else + --enable-examples=yes \ +%endif + --enable-jasper \ + --enable-jpeg \ + --enable-lcms \ + --enable-openmp + +# https://fedoraproject.org/wiki/Packaging:Guidelines#Beware_of_Rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +%make_build %install cp -pr doc manual -chmod 644 LICENSE.CDDL LICENSE.LGPL COPYRIGHT Changelog.txt Changelog.rus +chmod 644 LICENSE.CDDL LICENSE.LGPL COPYRIGHT Changelog.txt chmod 644 manual/*.html # The Libraries -make install DESTDIR=%{buildroot} +%make_install + +rm -rfv samples/.deps +rm -fv samples/.dirstamp +rm -fv samples/*.o + +rm -fv %{buildroot}%{_libdir}/lib*.la + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc LICENSE.CDDL LICENSE.LGPL COPYRIGHT Changelog.txt Changelog.rus -%{_libdir}/*.so.* +%doc Changelog.txt +%license LICENSE.CDDL LICENSE.LGPL COPYRIGHT +%{_libdir}/libraw.so.19* +%{_libdir}/libraw_r.so.19* %files static -%defattr(-,root,root,-) -%{_libdir}/*.a +%{_libdir}/libraw.a +%{_libdir}/libraw_r.a %files devel -%defattr(-,root,root,-) %doc manual %doc samples -%dir %{_includedir}/libraw -%{_includedir}/libraw/*.h -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%exclude %{_libdir}/*.la +%{_includedir}/libraw/ +%{_libdir}/libraw.so +%{_libdir}/libraw_r.so +%{_libdir}/pkgconfig/libraw.pc +%{_libdir}/pkgconfig/libraw_r.pc %exclude %{_docdir}/libraw/* -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%if 0%{?rhel} != 7 +%files samples +%{_bindir}/* +%endif + %changelog +* Wed Jan 2 2019 Debarshi Ray - 0.19.2-1 +- Update to 0.19.2 +- Resolves: #1543597 + +* Wed Jan 2 2019 Debarshi Ray - 0.19.1-2 +- Remove the samples subpackage from RHEL 7 +- Resolves: #1543597 + +* Mon Dec 17 2018 Debarshi Ray - 0.19.1-1 +- Update to 0.19.1 +- Resolves: #1543597 + * Fri Jan 24 2014 Daniel Mach - 0.14.8-5.20120830git98d925 - Mass rebuild 2014-01-24 @@ -150,10 +190,10 @@ make install DESTDIR=%{buildroot} * Sat Nov 13 2010 Siddhesh Poyarekar 0.9.1-9 - Build position independent object code -* Sun Jul 08 2010 Siddhesh Poyarekar 0.9.1-8 +* Thu Jul 08 2010 Siddhesh Poyarekar 0.9.1-8 - Remove LibRaw license since we're not distributing LibRaw under its terms -* Sun Jul 07 2010 Siddhesh Poyarekar 0.9.1-7 +* Wed Jul 07 2010 Siddhesh Poyarekar 0.9.1-7 - Buildroot is unnecessary - Corrected license to LGPLv2 or CDDL @@ -175,7 +215,7 @@ make install DESTDIR=%{buildroot} - Remove the clean section since it is not needed in F-13 and later - Correct installation of docs into defaultdocdir instead of docdir -* Fri Jun 10 2010 Siddhesh Poyarekar 0.9.1-2 +* Thu Jun 10 2010 Siddhesh Poyarekar 0.9.1-2 - Disable lcms and openmp support by default so that we're in line with upstream default