Remove package.cfg; Part of epel8-playground decommission

Remove appres from EL8 and EL7, because they don't have it.

xscreensaver.spec

@@ -6,11 +6,17 @@
 
 %define modular_conf  1
 %define split_getimage   0
-%if 0%{?fedora} >= 14
+%if 0%{?fedora} >= 14 || 0%{?el7} || 0%{?el8}
 %define split_getimage   1
 %endif
 
-%define fedora_rel    3
+%define enable_appres 1
+%if 0%{?el7} || 0%{?el8}
+# EL does not have appres
+%define enable_appres 0
+%endif
+
+%define fedora_rel    5
 
 %global use_clang_as_cc 0
 %global use_clang_analyze 0
@@ -46,14 +52,14 @@
 %define build_tests   0
 
 %global support_setcap 0
-%if 0%{?fedora} >= 31
-# TODO write selinux policy for selinux-policy-mls 
+%if 0%{?fedora} >= 31 || 0%{?el7} > 0|| 0%{?el8} > 0
+# TODO write selinux policy for selinux-policy-mls
 # (currently works with selinux-policy-targeted)
 #%%global support_setcap 1
 %endif
 # enable xscreensaver-systemd for F-33
 %global  support_systemd 0
-%if 0%{?fedora} >= 33
+%if 0%{?fedora} >= 33 || 0%{?el7} || 0%{?el8}
 %global  support_systemd 1
 %endif
 
@@ -71,7 +77,7 @@ Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?b
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?el7} || 0%{?el8}
 Source11:        xscreensaver-autostart
 Source12:        xscreensaver-autostart.desktop
 %endif
@@ -88,7 +94,7 @@ Patch1:          xscreensaver-5.45-0001-barcode-glsnake-sanitize-the-names-of-mo
 Patch21:         xscreensaver-5.35-webcollage-default-nonet.patch
 # Patch to compile driver/test-xdpms
 Patch52:         xscreensaver-5.44-0002-Patch-to-compile-driver-test-xdpms.patch
-# 
+#
 # misc: kill gcc warn_unused_result warnings
 Patch3607:       xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch
 # open new window for man when using gnome-terminal
@@ -208,7 +214,7 @@ Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
 # For xdg-open
 Requires:        xdg-utils
-%if ! %{split_getimage}
+%if (! %{split_getimage}) || 0%{?enable_appres}
 Requires:        appres
 %endif
 Requires:        xorg-x11-fonts-ISO8859-1-100dpi
@@ -224,7 +230,9 @@ Summary:         A base package for screensavers
 %if 0%{?fedora} < 19
 Requires:        %{name}-base = %{epoch}:%{version}-%{release}
 %endif
+%if 0%{?enable_appres}
 Requires:        appres
+%endif
 
 %package extras
 Summary:         An enhanced set of screensavers
@@ -297,7 +305,7 @@ This package contains the bare minimum needed to blank and
 lock your screen.  The graphical display modes are the
 "xscreensaver-extras" and "xscreensaver-gl-extras" packages.
 
-%description -l fr base 
+%description -l fr base
 Un économiseur d'écran modulaire pour le système X Window.
 Ce paquet contient le minimum vital pour éteindre et verouiller
 votre écran. Les modes d'affichages graphiques sont inclus
@@ -506,7 +514,7 @@ sed -i.manentry -e 's@man %%s@man 6x %%s 2>/dev/null || man 1 %%s @' \
 %__git commit -m "%PATCH_desc" -a
 
 # Suppress rpmlint warnings.
-# suppress about pam config (although this is 
+# suppress about pam config (although this is
 # not the fault of xscreensaver.pam ......).
 #
 # From xscreensaver-5.15-10, no longer do this
@@ -549,6 +557,11 @@ sed -i.delay -e 's| delay = 1| delay = 3|' driver/test-fade.c
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 %__git commit -m "%PATCH_desc" -a
 
+# Well, clang misinterpretates how gcc / autoconf uses -Wunknown-warning-option ....
+sed -i 's|-Wunknown-warning-option|-Wfoo-bar-baz|' ax_pthread.m4
+%__git commit -m "Really use unknowing warning option" -a
+
+
 aclocal
 autoconf
 autoheader
@@ -945,13 +958,13 @@ popd
 # Leave autostart stuff installed (at least useful for LXDE),
 # but not show them by default for all DE
 # (bug 1266521) for F-27+
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?el7} || 0%{?el8}
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
 install -cpm 0755 %{SOURCE11} ${RPM_BUILD_ROOT}%{_libexecdir}/
 desktop-file-install \
    --vendor "" \
    --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?el8}
    --add-only-show-in=X-NODEFAULT \
 %else
    --add-only-show-in=GNOME \
@@ -1067,7 +1080,7 @@ chmod -R a+r,u+w,og-w ${RPM_BUILD_ROOT}
 %{_sbindir}/update-xscreensaver-hacks
 %endif
 
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?el8}
 # In the case that pam setting is edited locally by sysadmin:
 if ! grep -q '^account' %{_sysconfdir}/pam.d/xscreensaver
 then
@@ -1126,6 +1139,16 @@ exit 0
 %endif
 
 %changelog
+* Tue Mar 02 2021 Ding-Yi Chen <dchen@redhat.com> - 1:5.45-5
+- Fix EPEL 8 & EPEL 7 build
+- Remove appres from EL8 and EL7, because they don't have it.
+
+* Sat Jan 30 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:5.45-4
+- Bump release and rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.45-3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Dec 28 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:5.45-3
 - Fix up gcc -Wstringop or -Wformat-overflow warnings
 - Make xscreensaver logo or ok button appear on lock screen
@@ -1523,7 +1546,7 @@ exit 0
 
 * Wed Oct 24 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1:5.20-2
 - Kill dependency of -gss subpackages for gnome-screensaver
-  to make MATE desktop happy 
+  to make MATE desktop happy
 
 * Wed Oct 17 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1:5.20-1
 - Update to 5.20
@@ -1571,7 +1594,7 @@ exit 0
 - Update to 5.17
 
 * Thu Jun 21 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1:5.16-1
-- Update to 5.16 
+- Update to 5.16
 
 * Mon Jun 18 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1:5.15-10
 - Enable account type pam validation on F-18+ (debian bug 656766)
@@ -1607,7 +1630,7 @@ exit 0
 
 * Fri Sep 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1:5.15-1
 - Update to 5.15
- 
+
 * Sat May 21 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1:5.14-1
 - 5.14 is released, with just fixing 5.13 DPMS issue
 
@@ -1854,7 +1877,7 @@ exit 0
   fix bug 336331).
 
 * Thu Oct 18 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.03-12
-- Create -gl-base subpackage and split xscreensaver-gl-helper 
+- Create -gl-base subpackage and split xscreensaver-gl-helper
   into -gl-base subpackage so that external GL screensavers can
   use it (bug 336331)
 
@@ -1965,7 +1988,7 @@ exit 0
 
 * Fri Aug 18 2006 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.00-17
 - Very nasty segv problem was brought by me. Fixing......
- 
+
 * Thu Aug 10 2006 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.00-16
 - Move man entry to 6x (bug #197741)
 
@@ -2010,7 +2033,7 @@ exit 0
   from current mock.
 
 * Wed Jun  7 2006 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.00-6
-- Another fixes of config files for ifsmap as reported to jwz 
+- Another fixes of config files for ifsmap as reported to jwz
   livejournal page.
 - Update Japanese translation.
 - Locale fix for xscreensaver-text.
@@ -2067,10 +2090,10 @@ exit 0
 * Wed Sep 28 2005 Ray Strode <rstrode@redhat.com> 1:4.22-18
 - accept zero timeout values for suspend and off.
   Patch from Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
-  (bug 157501). 
+  (bug 157501).
 
 * Fri Sep 23 2005 Ray Strode <rstrode@redhat.com> 1:4.22-17
-- remove explicit dependency on xscreensaver-base for 
+- remove explicit dependency on xscreensaver-base for
   extras and gl-extras packages
 
 * Fri Sep 16 2005 Ray Strode <rstrode@redhat.com> 1:4.22-16
@@ -2096,10 +2119,10 @@ exit 0
 - ignore unprintable characters in password dialog (bug 135966).
 
 * Thu Aug 25 2005 Ray Strode <rstrode@redhat.com> 1:4.22-10
-- Move man pages to section 6 (bug 166441). 
+- Move man pages to section 6 (bug 166441).
 
 * Wed Aug 24 2005 Ray Strode <rstrode@redhat.com> 1:4.22-9
-- The only legitimate way to call realpath is with NULL 
+- The only legitimate way to call realpath is with NULL
   buffer (bug 165270).
 
 * Fri Aug 19 2005 Ray Strode <rstrode@redhat.com> 1:4.22-8
@@ -2115,11 +2138,11 @@ exit 0
 - Update to xscreensaver 4.22.
 
 * Sun Jun 19 2005 Ray Strode <rstrode@redhat.com> 1:4.21-5
-- Add build requires for desktop-file-utils (bug 160980). 
+- Add build requires for desktop-file-utils (bug 160980).
 
 * Wed May 11 2005 Ray Strode <rstrode@redhat.com> 1:4.21-4
 - Allow configuration gui to support hacks with absolute paths
-  (bug 157417). 
+  (bug 157417).
 
 * Mon May 09 2005 Ray Strode <rstrode@redhat.com> 1:4.21-3
 - Use @libexecdir@/xscreensaver instead of @HACKDIR@ in
@@ -2160,7 +2183,7 @@ exit 0
 - Add utility xscreensaver-config-tool to make changing settings
   easier (replaces the short lived xscreensaver-register-hack
   program).  Use xscreensaver-config-tool to set default settings
-  instead of using patches. 
+  instead of using patches.
 - Split up xscreensaver (fixes 121693).
 - Make preferences dialog slightly more pretty
 - Make lock dialog slightly more pretty
@@ -2168,7 +2191,7 @@ exit 0
 * Fri Nov 26 2004 Than Ngo <than@redhat.com> 1:4.18-13
 - add patch to fix vroot bug and make xscreensaver working in KDE again.
 - get rid of webcollage, which often download porn images
- 
+
 * Wed Nov 10 2004 Ray Strode <rstrode@redhat.com> 1:4.18-11
 - Add xscreensaver-register-hack program to make
   installing and uninstalling screensavers easier
@@ -2179,7 +2202,7 @@ exit 0
   (bug 100641)
 
 * Wed Nov 10 2004 Ray Strode <rstrode@redhat.com> 1:4.18-9
-- Call pam_acct_mgmt() (might fix bug 137195) 
+- Call pam_acct_mgmt() (might fix bug 137195)
 
 * Tue Nov 9 2004 Ray Strode <rstrode@redhat.com> 1:4.18-8
 - Give vidwhacker screensaver working defaults
@@ -2229,7 +2252,7 @@ exit 0
 * Wed May  5 2004 Bill Nottingham <notting@redhat.com> 4.14-5
 - config tweaks
 
-* Wed Mar 31 2004 Karsten Hopp <karsten@redhat.de> 4.14-4 
+* Wed Mar 31 2004 Karsten Hopp <karsten@redhat.de> 4.14-4
 - fix fortune stand-in (#115369)
 
 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
@@ -2356,7 +2379,7 @@ exit 0
 - Bump release + rebuild.
 
 * Tue May 22 2001 Havoc Pennington <hp@redhat.com>
-- putting in tree for David 
+- putting in tree for David
 
 * Tue May 22 2001 David Sainty <dsainty@redhat.com>
 - added DPMS options to command line help
@@ -2495,7 +2518,7 @@ exit 0
 * Mon Apr  5 1999 Bill Nottingham <notting@redhat.com>
 - remove setuid bit. Really. I mean it.
 
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
 - auto rebuild in the new build environment (release 3)
 
 * Fri Mar 19 1999 Bill Nottingham <notting@redhat.com>