make check moved to %check section (#1017070)
This commit is contained in:
parent
e1850a37f4
commit
bb6d775214
26
libtiff-make-check.patch
Normal file
26
libtiff-make-check.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff --git a/html/man/Makefile.am b/html/man/Makefile.am
|
||||||
|
index ca222de..c7421ac 100644
|
||||||
|
--- a/html/man/Makefile.am
|
||||||
|
+++ b/html/man/Makefile.am
|
||||||
|
@@ -85,7 +85,6 @@ docfiles = \
|
||||||
|
ras2tiff.1.html \
|
||||||
|
raw2tiff.1.html \
|
||||||
|
rgb2ycbcr.1.html \
|
||||||
|
- sgi2tiff.1.html \
|
||||||
|
thumbnail.1.html \
|
||||||
|
tiff2bw.1.html \
|
||||||
|
tiff2pdf.1.html \
|
||||||
|
@@ -96,12 +95,10 @@ docfiles = \
|
||||||
|
tiffcrop.1.html \
|
||||||
|
tiffdither.1.html \
|
||||||
|
tiffdump.1.html \
|
||||||
|
- tiffgt.1.html \
|
||||||
|
tiffinfo.1.html \
|
||||||
|
tiffmedian.1.html \
|
||||||
|
tiffset.1.html \
|
||||||
|
- tiffsplit.1.html \
|
||||||
|
- tiffsv.1.html
|
||||||
|
+ tiffsplit.1.html
|
||||||
|
|
||||||
|
dist_doc_DATA = $(indexfile) $(docfiles)
|
||||||
|
|
27
libtiff.spec
27
libtiff.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: Library of functions for manipulating TIFF format image files
|
Summary: Library of functions for manipulating TIFF format image files
|
||||||
Name: libtiff
|
Name: libtiff
|
||||||
Version: 4.0.3
|
Version: 4.0.3
|
||||||
Release: 11%{?dist}
|
Release: 12%{?dist}
|
||||||
|
|
||||||
License: libtiff
|
License: libtiff
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -20,6 +20,7 @@ Patch7: libtiff-manpage-update.patch
|
|||||||
Patch8: libtiff-CVE-2013-4231.patch
|
Patch8: libtiff-CVE-2013-4231.patch
|
||||||
Patch9: libtiff-CVE-2013-4232.patch
|
Patch9: libtiff-CVE-2013-4232.patch
|
||||||
Patch10: libtiff-CVE-2013-4244.patch
|
Patch10: libtiff-CVE-2013-4244.patch
|
||||||
|
Patch11: libtiff-make-check.patch
|
||||||
|
|
||||||
BuildRequires: zlib-devel libjpeg-devel jbigkit-devel
|
BuildRequires: zlib-devel libjpeg-devel jbigkit-devel
|
||||||
BuildRequires: libtool automake autoconf pkgconfig
|
BuildRequires: libtool automake autoconf pkgconfig
|
||||||
@ -81,6 +82,7 @@ image files using the libtiff library.
|
|||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
|
%patch11 -p1
|
||||||
|
|
||||||
# Use build system's libtool.m4, not the one in the package.
|
# Use build system's libtool.m4, not the one in the package.
|
||||||
rm -f libtool.m4
|
rm -f libtool.m4
|
||||||
@ -96,8 +98,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
|
|||||||
%configure --enable-ld-version-script
|
%configure --enable-ld-version-script
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH make check
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make DESTDIR=$RPM_BUILD_ROOT install
|
make DESTDIR=$RPM_BUILD_ROOT install
|
||||||
|
|
||||||
@ -107,15 +107,16 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/
|
|||||||
|
|
||||||
# no libGL dependency, please
|
# no libGL dependency, please
|
||||||
rm -f $RPM_BUILD_ROOT%{_bindir}/tiffgt
|
rm -f $RPM_BUILD_ROOT%{_bindir}/tiffgt
|
||||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tiffgt.1
|
|
||||||
rm -f html/man/tiffgt.1.html
|
|
||||||
|
|
||||||
# no sgi2tiff or tiffsv, either
|
# no sgi2tiff or tiffsv, either
|
||||||
rm -f $RPM_BUILD_ROOT%{_bindir}/sgi2tiff
|
rm -f $RPM_BUILD_ROOT%{_bindir}/sgi2tiff
|
||||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/sgi2tiff.1
|
|
||||||
rm -f html/man/sgi2tiff.1.html
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_bindir}/tiffsv
|
rm -f $RPM_BUILD_ROOT%{_bindir}/tiffsv
|
||||||
|
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tiffgt.1
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/sgi2tiff.1
|
||||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tiffsv.1
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tiffsv.1
|
||||||
|
rm -f html/man/tiffgt.1.html
|
||||||
|
rm -f html/man/sgi2tiff.1.html
|
||||||
rm -f html/man/tiffsv.1.html
|
rm -f html/man/tiffsv.1.html
|
||||||
|
|
||||||
# multilib header hack
|
# multilib header hack
|
||||||
@ -156,13 +157,16 @@ EOF
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# don't include documentation Makefiles, they are a multilib hazard
|
|
||||||
find html -name 'Makefile*' | xargs rm
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%check
|
||||||
|
LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH make check
|
||||||
|
|
||||||
|
# don't include documentation Makefiles, they are a multilib hazard
|
||||||
|
find html/man -name 'Makefile*' | xargs rm
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYRIGHT README RELEASE-DATE VERSION
|
%doc COPYRIGHT README RELEASE-DATE VERSION
|
||||||
%{_libdir}/libtiff.so.*
|
%{_libdir}/libtiff.so.*
|
||||||
@ -184,6 +188,9 @@ find html -name 'Makefile*' | xargs rm
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 16 2013 Petr Hracek <phracek@redhat.com> - 4.0.3-12
|
||||||
|
- make check moved to %check section (#1017070)
|
||||||
|
|
||||||
* Tue Oct 08 2013 Petr Hracek <phracek@redhat.com> - 4.0.3-11
|
* Tue Oct 08 2013 Petr Hracek <phracek@redhat.com> - 4.0.3-11
|
||||||
- Resolves: #510258, #510240 - man page corrections
|
- Resolves: #510258, #510240 - man page corrections
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user