SPECS/autotrace.spec

@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        55%{?dist}
+Release:        65%{?dist}
 Summary:        Utility for converting bitmaps to vector graphics
 License:        GPLv2+ and LGPLv2+
 URL:            http://autotrace.sourceforge.net/
@@ -18,6 +18,10 @@ Patch9:         autotrace-0.31.1-CVE-2019-19005.patch
 # Upstream patch
 Patch10:        autotrace-0.31.1-CVE-2022-32323.patch
 
+BuildRequires:  gcc-c++
+%if ! 0%{?rhel}
+BuildRequires:  ImageMagick-devel
+%endif
 BuildRequires:  libpng-devel > 2:1.2
 BuildRequires:  libexif-devel
 BuildRequires:  libtiff-devel
@@ -26,25 +30,28 @@ BuildRequires:  libxml2-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  freetype-devel
 BuildRequires:  pstoedit-devel
-BuildRequires:  gcc-c++
-
 # For autoreconf
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	pstoedit-devel
+BuildRequires: make
 
 
 %description
 AutoTrace is a program for converting bitmaps to vector graphics.
 
-Supported input formats include BMP, TGA, PNM, PPM, PNG, whereas output
-can be produced in Postscript, SVG, xfig, SWF, and others.
+Supported input formats include BMP, TGA, PNM, PPM, and any format
+supported by ImageMagick, whereas output can be produced in
+Postscript, SVG, xfig, SWF, and others.
 
 %package devel
 Summary:        Header files for autotrace
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
+%if ! 0%{?rhel}
+Requires:       ImageMagick-devel
+%endif
 Requires:       pstoedit-devel
 
 
@@ -67,7 +74,11 @@ This package contains header files and development libraries for autotrace.
 autoreconf -ivf
 
 %build
+%if ! 0%{?rhel}
+%configure
+%else
 %configure --without-magick
+%endif
 
 # remove rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -77,18 +88,16 @@ make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
 
-%post -p /sbin/ldconfig
+%ldconfig_scriptlets
 
-%postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
-%license COPYING COPYING.LIB
+%doc AUTHORS COPYING COPYING.LIB ChangeLog FAQ NEWS README THANKS TODO
 %{_bindir}/autotrace
 %{_libdir}/*.so.*
 %{_mandir}/man[^3]/*
@@ -103,23 +112,55 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
 
 %changelog
-* Tue Sep 13 2022 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-55
-- Resolves: rhbz#2121827 Fix the gating tests by using only local test
+* Tue Sep 13 2022 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-65
+- Resolves: rhbz#2121828 Fix the gating tests by using only local test
   Upstream testsuite will not work as this package code is very old
 
-* Mon Sep 12 2022 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-54
-- Resolves: rhbz#2121827
+* Mon Sep 12 2022 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-64
+- Resolves: rhbz#2121828
   CVE-2022-32323 - heap-buffer overflow via the ReadImage() at input-bmp.c
 
-* Fri Apr 30 2021 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-53
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.31.1-63
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri May 21 2021 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-62
+- Resolves: rhbz#1961993 - Add gating tests from rhel-8
+
+* Fri Apr 30 2021 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-61
 - Resolves: CVE-2019-19004 : integer overflow in input-bmp.c
 - Resolves: CVE-2019-19005 : fix bitmap double free in main.c
 
-* Tue Aug 21 2018 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-52
-- Resolves:rh#1564990: Removed BR: ImageMagick-devel
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.31.1-60
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Thu May  3 2018 Jan Horak <jhorak@redhat.com> - 0.31.1-51
-- Resolves:rh#1564990: Removed ImageMagick support
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-59
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Oct 28 2020 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-58
+- Don't build with ImageMagick on EL
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-57
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-56
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-55
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-54
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Aug 28 2018 Michael Cronenworth <mike@cchtml.com> - 0.31.1-53
+- Rebuilt for new ImageMagick 6.9.10
+
+* Fri Jul 20 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 0.31.1-52
+- Fixed FTBFS by adding gcc-c++ requirement
+  Resolves: rhbz#1603443
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-51
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-50
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild