1 changed files with 6 additions and 59 deletions
--- a/SPECS/xsane.spec
+++ b/SPECS/xsane.spec
@ -10,7 +10,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.999
-Release: 42%{?dist}
+Release: 30%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-256x256.png
 # use "xdg-open" instead of "netscape" to launch help browser
@ -74,12 +74,7 @@ URL: http://www.xsane.org/

 # gcc is no longer in buildroot by default
 BuildRequires: gcc
-# uses make
-BuildRequires: make
-%if 0%{?rhel} <= 8 || 0%{?fedora}
 BuildRequires: gimp-devel
-%endif
-BuildRequires: gtk2-devel
 BuildRequires: lcms2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@ -96,7 +91,6 @@ library, which provides access to scanners, digital cameras, and other
 capture devices. XSane is written in GTK+ and provides control for
 performing the scan and then manipulating the captured image.

-%if 0%{?rhel} <= 8 || 0%{?fedora}
 %package gimp
 Summary: GIMP plug-in providing the SANE scanner interface
 Requires: gimp >= 2:2.2.12-4
@ -106,7 +100,6 @@ Requires: xsane-common
 This package provides the regular XSane frontend for the SANE scanner
 interface, but it works as a GIMP plug-in. You must have GIMP
 installed to use this package.
-%endif

 %package common
 Summary: Common files for xsane packages
@ -153,12 +146,10 @@ mkdir build-without-gimp
 CFLAGS='%optflags -fno-strict-aliasing -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"'
 export CFLAGS

-%if 0%{?rhel} <= 8 || 0%{?fedora}
 pushd build-with-gimp
 %configure --enable-gimp
-%make_build
+make %{?_smp_mflags}
 popd
-%endif

 pushd build-without-gimp
 %configure --disable-gimp
@ -170,14 +161,12 @@ cp %{SOURCE1} src/
 %install

 pushd build-without-gimp
-%make_install
+make DESTDIR=%{buildroot} install
 popd

-%if 0%{?rhel} <= 8 || 0%{?fedora}
 # install GIMP plugin
 install -m 0755 -d %{buildroot}%{gimpplugindir}
 install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}
-%endif

 # install customized desktop file
 rm %{buildroot}%{_datadir}/applications/xsane.desktop
@ -230,13 +219,11 @@ EOF

 %find_lang %{name} XSANE.lang

-%if 0%{?rhel} <= 8 || 0%{?fedora}
 %pre gimp
 # remove obsolete gimp-plugin-mgr managed symlink
 if [ -L "%{gimpplugindir}/xsane" ]; then
    rm -f "%{gimpplugindir}/xsane"
 fi
-%endif

 %files -f XSANE.lang
 %doc xsane.ACCELKEYS xsane.AUTHOR xsane.BEGINNERS-INFO xsane.BUGS xsane.CHANGES xsane.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO
@ -253,10 +240,8 @@ fi
 %{_datadir}/pixmaps/xsane.xpm
 %{iconrootdir}/*/apps/%{name}.png

-%if 0%{?rhel} <= 8 || 0%{?fedora}
 %files gimp
 %{gimpplugindir}/xsane
-%endif

 %files common
 %doc xsane.AUTHOR
@ -265,50 +250,12 @@ fi
 %{_datadir}/sane/xsane

 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.999-42
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.999-41
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-39
- remove gimp plugin for eln, put explicit requirement for GTK2
+* Thu Aug 16 2018 Josef Ridky <jridky@redhat.com> - 0.999-30
+- rebuild for new GIMP module

-* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-38
- make is no longer in buildroot by default
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.999-36
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Apr 09 2019 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-33
- rebuilt again (because bodhi cannot remove builds from even unpushed updates)
-
-* Mon Apr 08 2019 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-32
- rebuilt for gimp-2.10.10
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-30
+* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-29
 - correcting license

-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.999-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Mon Apr 09 2018 Zdenek Dohnal <zdohnal@redhat.com> - 0.999-28
 - remove dependency on ImageMagick and netpbm-progs, because they were needed for
  tests during %%build phase, which were removed in commit SHA 0595c15da29