|
@@ -3,7 +3,7 @@
|
|
|
%define default_text %{_datadir}/doc/HTML/README-Accessibility
|
|
|
|
|
|
%define pam_ver 1.1
|
|
|
-%define autoconf_ver 2.65
|
|
|
+%define autoconf_ver 2.69
|
|
|
|
|
|
%define update_po 1
|
|
|
|
|
@@ -12,9 +12,9 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
Summary: X screen saver and locker
|
|
|
Summary(ja): X ウィンドウシステム・スクリーンセーバ
|
|
|
Name: xscreensaver
|
|
|
-Version: 5.26
|
|
|
+Version: 5.37
|
|
|
Release: 1%{?_dist_release}
|
|
|
-Epoch: 1
|
|
|
+Epoch: 1
|
|
|
License: BSD
|
|
|
Group: User Interface/X
|
|
|
URL: http://www.jwz.org/xscreensaver/
|
|
@@ -24,9 +24,32 @@ Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_
|
|
|
Source10: update-xscreensaver-hacks
|
|
|
%endif
|
|
|
Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
|
|
|
-Patch3: xscreensaver-5.05-addopts-jwz.patch
|
|
|
-Patch21: xscreensaver-5.05-webcollage-default-nonet.patch
|
|
|
-Patch22: xscreensaver-5.05-penetrate-font.patch
|
|
|
+# Patch3: xscreensaver-5.05-addopts-jwz.patch
|
|
|
+# Patch21: xscreensaver-5.05-webcollage-default-nonet.patch
|
|
|
+# Patch22: xscreensaver-5.05-penetrate-font.patch
|
|
|
+
|
|
|
+# Change webcollage not to access to net \
|
|
|
+# Also see bug 472061
|
|
|
+Patch31: xscreensaver-5.35-webcollage-default-nonet.patch
|
|
|
+# driver/test-passwd tty segfaults
|
|
|
+Patch51: xscreensaver-5.12-test-passwd-segv-tty.patch
|
|
|
+# patch to compile driver/test-xdpms
|
|
|
+Patch52: xscreensaver-5.12-tests-miscfix.patch
|
|
|
+
|
|
|
+# Enable double buffer on cubestorm
|
|
|
+Patch3204: xscreensaver-5.32-0004-cubestorm-enable-double-buffer-on-linux.patch
|
|
|
+# splodesic: avoid using "depth" name not to make X internal collision
|
|
|
+# reset_strip: kill gcc7 -Wint-in-bool-context
|
|
|
+Patch3607: xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch
|
|
|
+# store_saver_id: fix stack-use-after-scope
|
|
|
+Patch3701: xscreensaver-5.37-0001-store_saver_id-fix-stack-use-after-scope.patch
|
|
|
+# bsod: fix some stack-use-after-scope issues
|
|
|
+Patch3702: xscreensaver-5.37-0002-bsod-fix-some-stack-use-after-scope-issues.patch
|
|
|
+# vigilance: fix which camera to pay attention on tick_camera
|
|
|
+Patch3703: xscreensaver-5.37-0003-vigilance-fix-which-camera-to-pay-attention-on-tick_.patch
|
|
|
+# bsod: more stack-use-after-scope fix for utsname
|
|
|
+Patch3704: xscreensaver-5.37-0004-bsod-more-stack-use-after-scope-fix-for-utsname.patch
|
|
|
+
|
|
|
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
|
|
|
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
|
|
|
Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
|
|
@@ -53,7 +76,7 @@ BuildRequires: libXpm-devel
|
|
|
BuildRequires: libXt-devel
|
|
|
BuildRequires: libXxf86misc-devel
|
|
|
BuildRequires: libXxf86vm-devel
|
|
|
-BuildRequires: gtk2-devel
|
|
|
+BuildRequires: gtk2-devel
|
|
|
BuildRequires: libjpeg-devel
|
|
|
BuildRequires: libglade2-devel
|
|
|
Requires: %{_sysconfdir}/pam.d/system-auth
|
|
@@ -65,7 +88,8 @@ Requires: xorg-x11-fonts-ISO8859-1-100dpi
|
|
|
%package extras
|
|
|
Summary: An enhanced set of screensavers
|
|
|
Group: User Interface/Desktops
|
|
|
-BuildRequires: desktop-backgrounds
|
|
|
+# BuildRequires: desktop-backgrounds
|
|
|
+BuildRequires: mate-backgrounds
|
|
|
Requires: %{name}-base = %{epoch}:%{version}-%{release}
|
|
|
|
|
|
%package gl-base
|
|
@@ -90,13 +114,13 @@ Requires: %{name}-base = %{epoch}:%{version}-%{release}
|
|
|
Summary: Desktop files of extras for gnome-screensaver
|
|
|
Group: User Interface/Desktops
|
|
|
Requires: %{name}-extras = %{epoch}:%{version}-%{release}
|
|
|
-Requires: gnome-screensaver
|
|
|
+Requires: mate-screensaver
|
|
|
|
|
|
%package gl-extras-gss
|
|
|
Summary: Desktop files of gl-extras for gnome-screensaver
|
|
|
Group: User Interface/Desktops
|
|
|
Requires: %{name}-gl-extras = %{epoch}:%{version}-%{release}
|
|
|
-Requires: gnome-screensaver
|
|
|
+Requires: mate-screensaver
|
|
|
|
|
|
|
|
|
%description
|
|
@@ -147,6 +171,18 @@ for gnome-screensaver compatibility.
|
|
|
## %patch21 -p1 -b .nonet
|
|
|
## %patch22 -p1 -b .font
|
|
|
|
|
|
+%patch31 -p1
|
|
|
+%patch51 -p1
|
|
|
+%patch52 -p1
|
|
|
+
|
|
|
+%patch3204 -p1
|
|
|
+%patch3607 -p1
|
|
|
+%patch3701 -p1
|
|
|
+%patch3702 -p1
|
|
|
+%patch3703 -p1
|
|
|
+%patch3704 -p1
|
|
|
+
|
|
|
+
|
|
|
change_option(){
|
|
|
set +x
|
|
|
ADFILE=$1
|
|
@@ -266,6 +302,7 @@ CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}"
|
|
|
CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults"
|
|
|
CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd"
|
|
|
CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open"
|
|
|
+CONFIG_OPTS="$CONFIG_OPTS --with-record-animation"
|
|
|
|
|
|
# This is flaky:
|
|
|
# CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
|
|
@@ -275,7 +312,8 @@ ln -s ../configure .
|
|
|
rm -f configure
|
|
|
|
|
|
%if %{update_po}
|
|
|
-( cd po ; make generate_potfiles_in update-po )
|
|
|
+( cd po ; make generate_potfiles_in ; cp -p POTFILES.in .. ; export srcdir=.. ; make update-po ; rm -f ../POTFILES_in )
|
|
|
+( cp -p ../po/*.po po/)
|
|
|
%endif
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
@@ -436,7 +474,7 @@ for f in ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-getimage-* \
|
|
|
fi
|
|
|
done
|
|
|
|
|
|
-# create desktop entry for gnome-screensaver
|
|
|
+# create desktop entry for mate-screensaver
|
|
|
create_desktop(){
|
|
|
COMMAND=`cat $1 | sed -n -e 's|^<screen.*name=\"\([^ ][^ ]*\)\".*$|\1|p'`
|
|
|
NAME=`cat $1 | sed -n -e 's|^<screen.*_label=\"\(.*\)\">.*$|\1|p'`
|
|
@@ -462,7 +500,9 @@ create_desktop(){
|
|
|
echo "Exec=$COMMAND $ARG" >> $2
|
|
|
echo "StartupNotify=false" >> $2
|
|
|
echo "Type=Application" >> $2
|
|
|
- echo "Categories=GNOME;Screensaver;" >> $2
|
|
|
+ echo "Categories=MATE;Screensaver;" >> $2
|
|
|
+ # Add OnlyShowIn (bug 953558)
|
|
|
+ echo "OnlyShowIn=GNOME;MATE;" >> $2
|
|
|
}
|
|
|
|
|
|
cd $dd
|
|
@@ -493,6 +533,23 @@ for list in *extras.files ; do
|
|
|
set -x
|
|
|
done
|
|
|
|
|
|
+# Create wrapper script for webcollage to use nonet option
|
|
|
+# by default, and rename the original webcollage
|
|
|
+# (see bug 472061)
|
|
|
+pushd ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}
|
|
|
+mv -f webcollage webcollage.original
|
|
|
+
|
|
|
+cat > webcollage <<EOF
|
|
|
+#!/bin/sh
|
|
|
+PATH=%{_libexecdir}/%{name}:\$PATH
|
|
|
+exec webcollage.original \\
|
|
|
+ -directory %{_datadir}/backgrounds/images \\
|
|
|
+ "\$@"
|
|
|
+EOF
|
|
|
+chmod 0755 webcollage
|
|
|
+echo "%%{_libexecdir}/%%{name}/webcollage.original" >> \
|
|
|
+ $dd/extras.files
|
|
|
+
|
|
|
# Make sure all files are readable by all, and writable only by owner.
|
|
|
#
|
|
|
chmod -R a+r,u+w,og-w ${RPM_BUILD_ROOT}
|
|
@@ -506,6 +563,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
|
exit 0
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%files
|
|
|
%defattr(-,root,root,-)
|
|
|
|
|
@@ -529,7 +587,12 @@ exit 0
|
|
|
%files -f gnome-gl-extras.files gl-extras-gss
|
|
|
%defattr(-,root,root,-)
|
|
|
|
|
|
+
|
|
|
%changelog
|
|
|
+* Sun Aug 26 2018 Toshiaki Ara <ara_t@384.jp> 5.37-1
|
|
|
+- update to 5.37
|
|
|
+- apply patches of fodora
|
|
|
+
|
|
|
* Sun Jan 12 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.26-1
|
|
|
- new upstream release
|
|
|
|