!17 fix incorrect writing when unpacking in spec

Merge pull request !17 from liuyumeng/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2021-12-14 08:26:56 +00:00 committed by Gitee
commit da9bc262e9

View File

@ -1,6 +1,6 @@
Name: libtiff Name: libtiff
Version: 4.3.0 Version: 4.3.0
Release: 2 Release: 3
Summary: TIFF Library and Utilities Summary: TIFF Library and Utilities
License: libtiff License: libtiff
URL: https://www.simplesystems.org/libtiff/ URL: https://www.simplesystems.org/libtiff/
@ -9,9 +9,6 @@ Source0: https://download.osgeo.org/libtiff/tiff-%{version}.tar.gz
BuildRequires: gcc gcc-c++ zlib-devel libjpeg-devel jbigkit-devel BuildRequires: gcc gcc-c++ zlib-devel libjpeg-devel jbigkit-devel
BuildRequires: libtool automake autoconf pkgconfig BuildRequires: libtool automake autoconf pkgconfig
Provides: %{name}-tools
Obsoletes: %{name}-tools
%description %description
This %{name} provides support for the Tag Image File Format (TIFF), a widely This %{name} provides support for the Tag Image File Format (TIFF), a widely
used format for storing image data. The latest version of the TIFF specification used format for storing image data. The latest version of the TIFF specification
@ -22,9 +19,6 @@ for manipulating TIFF format image files using the libtiff library.
Summary: Development files for %{name} library Summary: Development files for %{name} library
Requires: %{name} = %{version}-%{release} pkgconfig Requires: %{name} = %{version}-%{release} pkgconfig
Provides: %{name}-static
Obsoletes: %{name}-static
%description devel %description devel
This package contains the header files and documentation necessary for developing programs This package contains the header files and documentation necessary for developing programs
which will manipulate TIFF format image files using the libtiff library. which will manipulate TIFF format image files using the libtiff library.
@ -80,20 +74,7 @@ if test -n "$wordsize"
then then
mv %{buildroot}/%{_includedir}/tiffconf.h %{buildroot}/%{_includedir}/tiffconf-$wordsize.h mv %{buildroot}/%{_includedir}/tiffconf.h %{buildroot}/%{_includedir}/tiffconf-$wordsize.h
cat >%{buildroot}/%{_includedir}/tiffconf.h <<EOF cat >%{buildroot}/%{_includedir}/tiffconf.h <<EOF
#ifndef TIFFCONF_H_MULTILIB
#define TIFFCONF_H_MULTILIB
#include <bits/wordsize.h>
#if __WORDSIZE == 32
# include "tiffconf-32.h"
#elif __WORDSIZE == 64
# include "tiffconf-64.h"
#else
# error "unexpected value for __WORDSIZE macro"
#endif
#endif
EOF EOF
fi fi
@ -131,6 +112,9 @@ find html -name 'Makefile*' | xargs rm
%exclude %{_datadir}/html/man/tiffgt.1.html %exclude %{_datadir}/html/man/tiffgt.1.html
%changelog %changelog
* Mon Dec 13 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-3
- fix incorrect writing when unpacking in spec
* Mon Dec 06 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-2 * Mon Dec 06 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-2
- fix the date in the changelog - fix the date in the changelog