From cf39631fd3052f1786af1988c2237576c03d8f16 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Nov 11 2023 12:31:32 +0000
Subject: Remove long obsolete spec file options


[skip changelog]

Signed-off-by: Nils Philippsen <nils@tiptoe.de>

---

diff --git a/gimp.spec b/gimp.spec
index bc7e94e..778dfbc 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -2,25 +2,8 @@
 # Use the following --with/--without <option> switches to control how the
 # package will be built:
 #
-# mp:             multi processor support
-%bcond_without mp
-# static:         build static libraries
-%bcond_with static
 # default_binary: install unversioned binary
 %bcond_without default_binary
-# aalib:          build with AAlib (ASCII art gfx library)
-%if 0%{?rhel}
-# don't use aalib on RHEL
-%bcond_with aalib
-%else
-%bcond_without aalib
-%endif
-# don't build webkit-based help browser by default
-%bcond_with helpbrowser
-# hardcode python interpreter in python plug-ins
-%bcond_without hardcoded_python
-# webp support
-%bcond_without webp
 # libunwind support (only available on some architectures)
 %ifarch %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
 %bcond_without libunwind
@@ -28,29 +11,6 @@
 %bcond_with libunwind
 %endif
 
-# If Python plug-ins need to be byte-compiled separately
-%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} > 27 || 0%{?rhel} > 7
-%bcond_without python_separately_bytecompile
-%else
-%bcond_with python_separately_bytecompile
-%endif
-
-%if %{with python_separately_bytecompile}
-# Disable automatic compilation of Python files in extra directories
-%global _python_bytecompile_extra 0
-
-# Don't ask ...
-%if 0%{?!py_byte_compile:1}
-%global py_byte_compile()\
-python_binary="%1"\
-bytecode_compilation_path="%2"\
-find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -m py_compile\
-find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -m py_compile
-%endif
-# ... just remove after F28 EOL
-
-%endif
-
 # skip tests known to be problematic in a specific version
 #global skip_checks_version X.Y.Z
 #global skip_checks test1 test2 test3
@@ -77,9 +37,7 @@ Release:        %autorelease
 # plugin file-dds is GPL-2.0-or-later and plugins script-fu/{ftx,tinyscheme} are BSD-3-Clause
 License:        LGPL-3.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-3-Clause
 URL:            http://www.gimp.org/
-%if %{with aalib}
 BuildRequires:  aalib-devel
-%endif
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  atk-devel >= 2.2.0
 BuildRequires:  babl-devel >= 0.1.74
@@ -113,18 +71,12 @@ BuildRequires:  libtiff-devel
 %if %{with libunwind}
 BuildRequires:  libunwind-devel >= 1.1.0
 %endif
-%if %{with webp}
 BuildRequires:  libwebp-devel >= 0.6.0
-%endif
 BuildRequires:  libwmf-devel >= 0.2.8
 BuildRequires:  libmypaint-devel >= 1.3.0
 BuildRequires:  mypaint-brushes-devel >= 1.3.0
-%if 0%{?fedora} > 34
 BuildRequires:  openexr-devel
 BuildRequires:  imath-devel
-%else
-BuildRequires:  OpenEXR-devel >= 1.6.1
-%endif
 BuildRequires:  openjpeg2-devel >= 2.1.0
 BuildRequires:  pango-devel >= 1.29.4
 BuildRequires:  perl >= 5.10.0
@@ -134,9 +86,7 @@ BuildRequires:  pycairo-devel >= 1.0.2
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
 BuildRequires:  python2-devel >= 2.5.0
-%if %{with helpbrowser}
 BuildRequires:  webkitgtk-devel >= 1.6.1
-%endif
 BuildRequires:  xz-devel >= 5.0.0
 BuildRequires:  zlib-devel
 BuildRequires:  libX11-devel
@@ -166,12 +116,8 @@ Requires:       pango >= 1.29.4
 Requires:       pygtk2 >= 2.10.4
 Requires:       xdg-utils
 Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-%if %{with helpbrowser}
-Recommends:     %{name}-help-browser = %{epoch}:%{version}-%{release}
-%else
 Obsoletes:      %{name}-help-browser < %{epoch}:%{version}-%{release}
 Conflicts:      %{name}-help-browser < %{epoch}:%{version}-%{release}
-%endif
 
 #Demodularizing of gimp (#1772469)
 Obsoletes:	%{name} < %{epoch}:%{version}-%{release}
@@ -235,9 +181,8 @@ Obsoletes:      %{name}-devel < %{epoch}:%{version}-%{release}
 Conflicts:      %{name}-devel < %{epoch}:%{version}-%{release}
 
 %description devel
-The %{name}-devel package contains the static libraries and header files
-for writing GNU Image Manipulation Program (GIMP) plug-ins and
-extensions.
+The %{name}-devel package contains the files needed for writing GNU Image
+Manipulation Program (GIMP) plug-ins and extensions.
 
 %package devel-tools
 Summary:        GIMP plugin and extension development tools
@@ -251,29 +196,10 @@ Conflicts:      %{name}-devel-tools < %{epoch}:%{version}-%{release}
 The %{name}-devel-tools package contains gimptool, a helper program to
 build GNU Image Manipulation Program (GIMP) plug-ins and extensions.
 
-%if %{with helpbrowser}
-%package help-browser
-Summary:        GIMP help browser plug-in
-License:        GPLv3+
-Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-# Demodularizing of gimp (#1772469)
-Obsoletes:      %{name}-help-browser < %{epoch}:%{version}-%{release}
-Conflicts:      %{name}-help-browser < %{epoch}:%{version}-%{release}
-
-%description help-browser
-The %{name}-help-browser package contains a lightweight help browser plugin for
-viewing GIMP online help.
-%endif
-
 %prep
 cat << EOF
 --- 8< --- Build options ---------------------------------------------------
-MP support:                  %{with mp}
-build static libs:           %{with static}
 install default binary:      %{with default_binary}
-build ASCII art plugin       %{with aalib}
-build help browser:          %{with helpbrowser}
-hardcode python interpreter: %{with hardcoded_python}
 --- >8 ---------------------------------------------------------------------
 EOF
 
@@ -283,10 +209,7 @@ EOF
 %patch 2 -p1 -b .font-default
 %patch 3 -p1 -b .no-phone-home-default
 
-%if ! %{with helpbrowser}
 %patch 100 -p1 -b .external-help-browser
-%endif
-
 %patch 101 -p1 -b .configure-c99
 
 # Avoid re-running autotools.
@@ -303,37 +226,17 @@ export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
 %global _hardened_build 1
 %configure \
     --enable-python \
-%if %{with mp}
     --enable-mp \
-%else
-    --disable-mp \
-%endif
-%if %{with static}
-    --enable-static \
-%else
     --disable-static \
-%endif
     --with-print \
     --enable-gimp-console \
-%if %{with aalib}
     --with-aa \
-%else
-    --without-aa \
-%endif
     --with-gudev \
 %ifos linux
     --with-linux-input \
 %endif
-%if %{with helpbrowser}
-    --with-webkit \
-%else
     --without-webkit \
-%endif
-%if %{with webp}
     --with-webp \
-%else
-    --without-webp \
-%endif
 %if %{with default_binary}
     --enable-default-binary=yes \
 %else
@@ -415,13 +318,7 @@ for file in $(cat gimp-plugin-files-py); do
     done
 done >> gimp-plugin-files
 
-%if %{with python_separately_bytecompile}
 %py_byte_compile %{__python2} %{buildroot}%{_libdir}/gimp/%{lib_api_version}
-%endif
-
-%if %{with static}
-find %{buildroot}%{_libdir}/gimp/%{lib_api_version} -type f | sed "s@^%{buildroot}@@g" | grep '\.a$' > gimp-static-files
-%endif
 
 #
 # Auto detect the lang files.
@@ -450,7 +347,6 @@ ln -snf gimptool-%{lib_api_version}.1 %{buildroot}%{_mandir}/man1/gimptool.1
 ln -snf gimprc-%{binver}.5 %{buildroot}/%{_mandir}/man5/gimprc.5
 %endif
 
-%if %{with hardcoded_python}
 # Hardcode python interpreter in shipped python plug-ins. This actually has no
 # effect because gimp maps hashbangs with and without the /usr/bin/env detour
 # to the system python interpreter, but this will avoid false alarms.
@@ -461,7 +357,6 @@ grep -E -rl '^#!\s*/usr/bin/env\s+python' --include=\*.py "%{buildroot}" |
     done
 
 echo "%{__python2}=%{__python2}" >> %{buildroot}%{_libdir}/gimp/%{lib_api_version}/interpreters/pygimp.interp
-%endif
 
 %check
 # skip tests known to be problematic in a specific version
@@ -500,9 +395,6 @@ make check %{?_smp_mflags}
 %{_datadir}/gimp/%{lib_api_version}/ui/
 %dir %{_libdir}/gimp
 %dir %{_libdir}/gimp/%{lib_api_version}
-%if %{with helpbrowser}
-%exclude %{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser
-%endif
 
 %{_datadir}/gimp/%{lib_api_version}/brushes/
 %{_datadir}/gimp/%{lib_api_version}/fractalexplorer/
@@ -574,11 +466,7 @@ make check %{?_smp_mflags}
 %{_libdir}/libgimpwidgets-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
 %{_libdir}/libgimpwidgets-%{lib_api_version}.so.%{interface_age}
 
-%if %{with static}
-%files devel -f gimp-static-files
-%else
 %files devel
-%endif
 %doc HACKING README.i18n
 %doc %{_datadir}/gtk-doc
 
@@ -601,10 +489,5 @@ make check %{?_smp_mflags}
 %{_mandir}/man1/gimptool.1*
 %endif
 
-%if %{with helpbrowser}
-%files help-browser
-%{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser
-%endif
-
 %changelog
 %autochangelog