xscreensaver package update 5.43

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>

SPECS/xscreensaver.spec

@@ -1,60 +1,34 @@
-%define name          xscreensaver
+%define modular_conf             1
-
+%define split_getimage           1
-%define mainversion   5.42
+%global use_clang_as_cc          0
-%define beta_ver      %{nil}
+%global use_clang_analyze        0
-
+%global use_cppcheck             0
-
+%global use_gcc_strict_sanitize  0
-%define modular_conf  1
-%define split_getimage   0
-%if 0%{?fedora} >= 14
-%define split_getimage   1
-%endif
-
-%define fedora_rel    1
-
-%global use_clang_as_cc 0
-%global use_clang_analyze 0
-%global use_cppcheck   0
-%global use_gcc_strict_sanitize 0
 %global use_gcc_trap_on_sanitize 0
-%undefine extrarel
+%define default_text             %{_sysconfdir}/powerel-release
-
+%define default_URL              http://planet.powerel.org/rss20.xml
-# EPEL6
+%define pam_ver                  0.80-7
-%{!?__git:%define __git git}
+%define autoconf_ver             2.53
-
+%define update_po                1
-%if 0%{?fedora}
+%define build_tests              0
-%define default_text  %{_sysconfdir}/fedora-release
+%undefine _changelog_trimtime
-%else
+
-%define default_text  %{_sysconfdir}/system-release
+
-%endif
+Name:            xscreensaver
-%define default_URL   http://planet.fedoraproject.org/rss20.xml
+Version:         5.43
-
+Release:         1%{?dist}
-%define pam_ver       0.80-7
-%define autoconf_ver  2.53
-
-%define update_po     1
-%define build_tests   0
-
-%undefine        _changelog_trimtime
-
-Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Summary:         X screen saver and locker
-Name:            %{name}
-Version:         %{mainversion}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}
 Epoch:           1
 License:         MIT
+Summary:         X screen saver and locker
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
-Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz
+Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz
+Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
-%if 0%{?fedora} >= 12
 Source11:        xscreensaver-autostart
 Source12:        xscreensaver-autostart.desktop
-%endif
 ##
 ## Patches
 ##
@@ -86,7 +60,7 @@ Patch3604:       xscreensaver-5.36-0004-init_crystal-kill-gcc7-Wint-in-bool-cont
 # misc: kill gcc warn_unused_result warnings
 Patch3607:       xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch
 # fontglide.c: forbit C++ style comment
-Patch4201:       xscreensaver-5.42-0001-fontglide.c-forbit-C-style-comment.patch
+#Patch4201:       xscreensaver-5.42-0001-fontglide.c-forbit-C-style-comment.patch
 # 
 # Debugging patch
 # Not apply by default
@@ -131,9 +105,7 @@ BuildRequires:   sed
 # BuildRequires:   xdg-utils
 BuildRequires:   xorg-x11-proto-devel
 # extrusioni
-%if 0%{?fedora} >= 13
+#BuildRequires:   libgle-devel
-BuildRequires:   libgle-devel
-%endif
 BuildRequires:   libX11-devel
 BuildRequires:   libXScrnSaver-devel
 BuildRequires:   libXext-devel
@@ -329,7 +301,7 @@ This package contains cppcheck result of XScreenSaver.
 
 
 %prep
-%setup -q -n %{name}-%{mainversion}%{?beta_ver}
+%setup -q -n %{name}-%{version}
 
 cat > .gitignore <<EOF
 configure
@@ -347,7 +319,7 @@ rm -f driver/XScreenSaver_ad.h
 find . -name \*.c -exec chmod ugo-x {} \;
 
 %__git init
-%__git config user.email "xscreensaver-owner@fedoraproject.org"
+%__git config user.email "xscreensaver-owner@powerel.org"
 %__git config user.name "XScreenSaver owners"
 %__git add .
 %__git commit -m "base" -q
@@ -749,7 +721,7 @@ list_files() {
 
 # Generate three lists of files for the three packages.
 #
-dd=%{_builddir}/%{name}-%{mainversion}%{?beta_ver}
+dd=%{_builddir}/%{name}-%{version}
 
 # In case rpm -bi --short-circuit is tried multiple times:
 rm -f $dd/*.files