Accepting request 320343 from home:kstreitova:branches:graphics

- use spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/320343
OBS-URL: https://build.opensuse.org/package/show/graphics/tiff?expand=0&rev=69
This commit is contained in:
Ismail Dönmez 2015-08-04 09:54:51 +00:00 committed by Git OBS Bridge
parent d1f6340de0
commit a09f62f264
2 changed files with 30 additions and 26 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 4 08:17:35 UTC 2015 - kstreitova@suse.com
- use spec-cleaner
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 1 07:17:13 UTC 2015 - pgajdos@suse.com Wed Jul 1 07:17:13 UTC 2015 - pgajdos@suse.com

View File

@ -17,26 +17,6 @@
Name: tiff Name: tiff
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
BuildRequires: libtool
%if 0%{?suse_version} > 1030
BuildRequires: lzma-devel
%endif
%if 0%{?suse_version} <= 1000
BuildRequires: pkgconfig
%endif
%if 0%{?suse_version} > 1000
BuildRequires: pkg-config
%endif
BuildRequires: zlib-devel
# bug437293
%ifarch ppc64
Obsoletes: tiff-64bit
%endif
%if 0%{?suse_version} > 1210
BuildRequires: libjbig-devel
%endif
Version: 4.0.4 Version: 4.0.4
Release: 0 Release: 0
Summary: Tools for Converting from and to the Tiff Format Summary: Tools for Converting from and to the Tiff Format
@ -49,11 +29,30 @@ Source3: baselibs.conf
Patch0: tiff-4.0.3-seek.patch Patch0: tiff-4.0.3-seek.patch
# http://bugzilla.maptools.org/show_bug.cgi?id=2442 # http://bugzilla.maptools.org/show_bug.cgi?id=2442
Patch1: tiff-4.0.3-compress-warning.patch Patch1: tiff-4.0.3-compress-warning.patch
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
BuildRequires: libtool
BuildRequires: zlib-devel
# FYI: this issue is solved another way # FYI: this issue is solved another way
# http://bugzilla.maptools.org/show_bug.cgi?id=1985#c1 # http://bugzilla.maptools.org/show_bug.cgi?id=1985#c1
# Patch9: tiff-%{version}-lzw-CVE-2009-2285.patch # Patch9: tiff-%{version}-lzw-CVE-2009-2285.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1030
BuildRequires: lzma-devel
%endif
%if 0%{?suse_version} <= 1000
BuildRequires: pkgconfig
%endif
%if 0%{?suse_version} > 1000
BuildRequires: pkg-config
%endif
# bug437293
%ifarch ppc64
Obsoletes: tiff-64bit
%endif
%if 0%{?suse_version} > 1210
BuildRequires: libjbig-devel
%endif
%description %description
This package contains the library and support programs for the TIFF This package contains the library and support programs for the TIFF
@ -97,13 +96,13 @@ the libtiff library.
%patch1 -p1 %patch1 -p1
%build %build
CFLAGS="$RPM_OPT_FLAGS -fPIE" CFLAGS="%{optflags} -fPIE"
%configure --disable-static --with-pic %configure --disable-static --with-pic
make %{?_smp_mflags} LDFLAGS="-pie" make %{?_smp_mflags} LDFLAGS="-pie"
%install %install
mkdir -p %{buildroot}/{%{_mandir}/{man1,man3},usr/{bin,lib,include}} mkdir -p %{buildroot}/{%{_mandir}/{man1,man3},usr/{bin,lib,include}}
%makeinstall make DESTDIR=%{buildroot} install %{?_smp_mflags}
for f in `find %{buildroot}/%{_mandir} -type f -print ` ; do for f in `find %{buildroot}/%{_mandir} -type f -print ` ; do
if [ `wc -l <$f` -eq 1 ] && grep -q "^\.so " $f ; then if [ `wc -l <$f` -eq 1 ] && grep -q "^\.so " $f ; then
linkto=`sed -e "s|^\.so ||" $f` linkto=`sed -e "s|^\.so ||" $f`
@ -113,7 +112,7 @@ done
cp %{SOURCE2} . cp %{SOURCE2} .
rm -rf %{buildroot}%{_datadir}/doc/tiff* rm -rf %{buildroot}%{_datadir}/doc/tiff*
rm -f %{buildroot}/%{_libdir}/*.la find %{buildroot} -type f -name "*.la" -delete -print
find html -name "Makefile*" | xargs rm find html -name "Makefile*" | xargs rm
%check %check
@ -129,7 +128,7 @@ make %{?_smp_mflags} check
%{_bindir}/* %{_bindir}/*
%doc html %doc html
%doc README COPYRIGHT VERSION ChangeLog TODO RELEASE-DATE %doc README COPYRIGHT VERSION ChangeLog TODO RELEASE-DATE
%doc %{_mandir}/man1/* %{_mandir}/man1/*
%files -n libtiff5 %files -n libtiff5
%defattr(-,root,root) %defattr(-,root,root)
@ -141,6 +140,6 @@ make %{?_smp_mflags} check
%{_includedir}/* %{_includedir}/*
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%doc %{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog