Accepting request 1068710 from graphics

- clean up old conditionals

OBS-URL: https://build.opensuse.org/request/show/1068710
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/GraphicsMagick?expand=0&rev=84

GraphicsMagick.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar  2 13:45:30 UTC 2023 - pgajdos@suse.com
+
+- clean up old conditionals
+
 -------------------------------------------------------------------
 Tue Feb  7 12:36:21 UTC 2023 - pgajdos@suse.com
 

GraphicsMagick.spec

@@ -18,7 +18,6 @@
 
 %define asan_build    0
 %define debug_build   0
-
 %define quant 16
 %define base_version 1.3
 %define so_ver          3
@@ -39,13 +38,10 @@ BuildRequires:  dcraw
 BuildRequires:  gcc-c++
 BuildRequires:  ghostscript
 BuildRequires:  ghostscript-fonts-std
-%if 0%{?suse_version} >= 1315
 BuildRequires:  libjbig-devel
+BuildRequires:  libjpeg-devel
 BuildRequires:  libltdl-devel
-%endif
 BuildRequires:  libwmf-devel
-%if 0%{?suse_version} >= 1315
-BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(freetype2)
@@ -58,13 +54,6 @@ BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(zlib)
-%else
-BuildRequires:  freetype2-devel
-BuildRequires:  libbz2-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  libxml-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%endif
 %if 0%{?suse_version} > 1500
 BuildRequires:  pkgconfig(libjxl)
 %endif
@@ -229,7 +218,7 @@ export CXXFLAGS="%{optflags} -O0"
 	--docdir=%{_defaultdocdir}/%{name} \
 	--with-x \
 	--x-libraries=%{_libdir} \
-	--x-includes=%{_prefix}/include
+	--x-includes=%{_includedir}
 %if %{asan_build}
 sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \
        -e 's/\(^LIBS =.*\)/\1 -lasan/' \
@@ -246,22 +235,16 @@ if [ ! -z "$GS_ENABLED" ]; then
 fi
 
 %if !%{debug_build}
-make %{?_smp_mflags} LDFLAGS="-pie"
+%make_build LDFLAGS="-pie"
 %else
-make %{?_smp_mflags}
+%make_build
 %endif
 cd PerlMagick
 perl Makefile.PL
-make %{?_smp_mflags} LD_RUN_PATH="%{_libdir}"
+%make_build LD_RUN_PATH="%{_libdir}"
 
 %install
-%if 0%{?suse_version} >= 1315
 %make_install
-%else
-make install \
-     DESTDIR=%{buildroot} \
-     pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/
-%endif
 rm -f %{buildroot}%{_libdir}/libGraphicsMagick.la
 rm -f %{buildroot}%{_libdir}/libGraphicsMagick++.la
 rm -f %{buildroot}%{_libdir}/libGraphicsMagickWand.la
@@ -282,14 +265,14 @@ rm -f %{buildroot}%{_localstatedir}/adm/perl-modules/GraphicsMagick
 # ASAN needs /proc to be mounted
 exit 0
 %endif
-make %{?_smp_mflags} check
+%make_build check
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs
 export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs
 export MAGICK_CONFIGURE_PATH=$PWD/config
 cd PerlMagick
 # bsc#1105592
 rm -r t/ps
-make test
+%make_build test
 
 %post -n libGraphicsMagick-Q%{quant}-%{so_ver} -p /sbin/ldconfig
 %postun -n libGraphicsMagick-Q%{quant}-%{so_ver} -p /sbin/ldconfig
@@ -299,22 +282,16 @@ make test
 %postun -n libGraphicsMagick++-Q%{quant}-%{pp_so_ver} -p /sbin/ldconfig
 
 %files
-%if 0%{?suse_version} < 1315
-%defattr(-,root,root)
-%endif
 %docdir %{_defaultdocdir}/%{name}
 %{_defaultdocdir}/%{name}
 %doc %{_datadir}/%{name}-%{version}
 %exclude %{_datadir}/%{name}-%{version}/config
 %attr(755, root, root) %{_bindir}/gm
-%{_mandir}/man1/gm.1%{ext_man}
+%{_mandir}/man1/gm.1%{?ext_man}
 %{_mandir}/man4/*%{ext_man}
 %{_mandir}/man5/*%{ext_man}
 
 %files -n libGraphicsMagick-Q%{quant}-%{so_ver}
-%if 0%{?suse_version} < 1315
-%defattr(-,root,root)
-%endif
 %{_libdir}/lib%{name}-Q%{quant}.so.*
 %dir %{_libdir}/%{name}-%{version}
 %if !%{debug_build}
@@ -326,24 +303,15 @@ make test
 %endif
 
 %files -n libGraphicsMagick%{so_ver}-config
-%if 0%{?suse_version} < 1315
-%defattr(-,root,root)
-%endif
 %dir %{_libdir}/%{name}-%{version}/config
 %{_libdir}/%{name}-%{version}/config/*.mgk
 %dir %{_datadir}/%{name}-%{version}
 %{_datadir}/%{name}-%{version}/config
 
 %files -n libGraphicsMagickWand-Q%{quant}-%{wand_so_ver}
-%if 0%{?suse_version} < 1315
-%defattr(-,root,root)
-%endif
 %{_libdir}/lib%{name}Wand-Q%{quant}.so.*
 
 %files devel
-%if 0%{?suse_version} < 1315
-%defattr(-,root,root)
-%endif
 %dir %{_includedir}/%{name}
 %dir %{_includedir}/%{name}/wand
 %{_includedir}/%{name}/wand/*
@@ -358,8 +326,8 @@ make test
 %{_libdir}/pkgconfig/%{name}Wand.pc
 %attr(755, root, root) %{_bindir}/%{name}-config
 %attr(755, root, root) %{_bindir}/%{name}Wand-config
-%{_mandir}/man1/%{name}-config.1%{ext_man}
-%{_mandir}/man1/%{name}Wand-config.1%{ext_man}
+%{_mandir}/man1/%{name}-config.1%{?ext_man}
+%{_mandir}/man1/%{name}Wand-config.1%{?ext_man}
 
 %files -n perl-GraphicsMagick
 %dir %{perl_vendorarch}/Graphics
@@ -370,15 +338,9 @@ make test
 %{_mandir}/man3/*%{ext_man}
 
 %files -n libGraphicsMagick++-Q%{quant}-%{pp_so_ver}
-%if 0%{?suse_version} < 1315
-%defattr(-,root,root)
-%endif
 %{_libdir}/lib%{name}++-Q%{quant}.so.*
 
 %files -n libGraphicsMagick++-devel
-%if 0%{?suse_version} < 1315
-%defattr(-,root,root)
-%endif
 %dir %{_includedir}/%{name}
 %dir %{_includedir}/%{name}/Magick++
 %{_includedir}/%{name}/Magick++.h
@@ -386,6 +348,6 @@ make test
 %{_libdir}/lib%{name}++.so
 %{_libdir}/pkgconfig/%{name}++.pc
 %attr(755, root, root) %{_bindir}/%{name}++-config
-%{_mandir}/man1/%{name}++-config.1%{ext_man}
+%{_mandir}/man1/%{name}++-config.1%{?ext_man}
 
 %changelog