- up to 6.00

diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100644 (file)
index 994d71c..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-   case "${1}" in
-     -h | --help | --h* )                      # -h for help
-       echo "${usage}" 1>&2; exit 0 ;;
-     -m )                                      # -m PERM arg
-       shift
-       test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-       dirmode="${1}"
-       shift ;;
-     -- ) shift; break ;;                      # stop option processing
-     -* ) echo "${usage}" 1>&2; exit 1 ;;      # unknown option
-     * )  break ;;                             # first non-opt arg
-   esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-0) exit 0 ;;
-esac
-
-case $dirmode in
-'')
-  if mkdir -p -- . 2>/dev/null; then
-    echo "mkdir -p -- $*"
-    exec mkdir -p -- "$@"
-  fi ;;
-*)
-  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-    echo "mkdir -m $dirmode -p -- $*"
-    exec mkdir -m "$dirmode" -p -- "$@"
-  fi ;;
-esac
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-       echo "mkdir $pathcomp"
-
-       mkdir "$pathcomp" || lasterr=$?
-
-       if test ! -d "$pathcomp"; then
-         errstatus=$lasterr
-       else
-         if test ! -z "$dirmode"; then
-            echo "chmod $dirmode $pathcomp"
-
-            lasterr=""
-            chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-            if test ! -z "$lasterr"; then
-              errstatus=$lasterr
-            fi
-         fi
-       fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 3
-# End:
-# mkinstalldirs ends here

diff --git a/xscreensaver-build.patch b/xscreensaver-build.patch
deleted file mode 100644 (file)
index 7924dd1..0000000
--- a/xscreensaver-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- xscreensaver-5.06/configure.in~    2009-07-26 20:25:37.933814582 +0200
-+++ xscreensaver-5.06/configure.in     2009-07-26 20:31:08.133988822 +0200
-@@ -315,7 +315,7 @@
- ###############################################################################
- 
- AC_DEFUN(AC_PROG_CC_ANSI,
-- [AC_PROG_CC
-+ [AC_REQUIRE([AC_PROG_CC])
- 
-   if test -z "$GCC"; then
-     # not using GCC
-@@ -472,6 +472,8 @@
- #
- ###############################################################################
- 
-+AM_PROG_INSTALL_SH
-+
- AC_DEFUN(AC_PROG_INSTALL_DIRS,
-  [AC_CACHE_CHECK([whether "\${INSTALL} -d" creates intermediate directories],
-     ac_cv_install_d_creates_dirs,
---- xscreensaver-5.11/Makefile.in.debug        2010-04-12 13:49:19.000000000 +0900
-+++ xscreensaver-5.11/Makefile.in      2010-04-12 20:36:05.000000000 +0900
-@@ -99,8 +99,8 @@
- # or later, feel free.  Personally, I can't be bothered.
- #
- configure::
--      autoconf263
--      autoheader263
-+      autoconf
-+      autoheader
-       @TMP=configure.$$$$ ;                                                \
-       echo "munging configure's --help message..." ;                       \
-       ( perl -e '                                                          \
---- xscreensaver-5.12/driver/test-xdpms.c.extra        2002-03-19 08:57:42.000000000 +0900
-+++ xscreensaver-5.12/driver/test-xdpms.c      2011-04-03 22:05:01.000000000 +0900
-@@ -29,7 +29,6 @@
- 
- #include <X11/Xproto.h>
- #include <X11/extensions/dpms.h>
--#include <X11/extensions/dpmsstr.h>
- 
- extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
- extern Bool DPMSCapable (Display *dpy);
---- xscreensaver-5.12/driver/Makefile.in       2011-04-03 22:49:32.000000000 +0900
-+++ xscreensaver-5.12/driver/Makefile.in.save  2011-04-03 22:49:32.000000000 +0900
-@@ -850,7 +850,7 @@
- test-mlstring: test-mlstring.o
-       $(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
- 
--TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
-+TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
- test-fade: test-fade.o $(UTILS_BIN)/fade.o
-       $(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
- 

diff --git a/xscreensaver-degnomify.patch b/xscreensaver-degnomify.patch
deleted file mode 100644 (file)
index d0cd0fe..0000000
--- a/xscreensaver-degnomify.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ruN xscreensaver-4.21./driver/XScreenSaver.ad.in xscreensaver-4.21/driver/XScreenSaver.ad.in
---- xscreensaver-4.21./driver/XScreenSaver.ad.in       2005-03-21 06:06:35.000000000 +0100
-+++ xscreensaver-4.21/driver/XScreenSaver.ad.in        2005-05-17 18:29:30.945724152 +0200
-@@ -94,15 +94,15 @@
- !
- !   Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
- !
--@GNOME24@*loadURL: @WITH_BROWSER@ '%s'
--@GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
--@GNOME24@             --command '/bin/sh -c "man %s; read foo"'
-+!@GNOME24@*loadURL: @WITH_BROWSER@ '%s'
-+!@GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
-+!@GNOME24@            --command '/bin/sh -c "man %s; read foo"'
- !
- !   Gnome 2.2:
- !
--@GNOME22@*loadURL: gnome-url-show '%s'
--@GNOME22@*manualCommand: gnome-terminal --title '%s manual' \
--@GNOME22@             --command '/bin/sh -c "man %s; read foo"'
-+!@GNOME22@*loadURL: gnome-url-show '%s'
-+!@GNOME22@*manualCommand: gnome-terminal --title '%s manual' \
-+!@GNOME22@            --command '/bin/sh -c "man %s; read foo"'
- !
- !   Gnome 1.4:
- !
-@@ -111,9 +111,9 @@
- !
- !   non-Gnome systems:
- !
--@NOGNOME@*loadURL: firefox '%s' || mozilla '%s' || netscape '%s'
--@NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
--@NOGNOME@                 -e /bin/sh -c 'man "%s" ; read foo'
-+*loadURL: firefox '%s' || mozilla '%s' || netscape '%s'
-+*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
-+                  -e /bin/sh -c 'man "%s" ; read foo'
- 
- 
- ! The format used for printing the date and time in the password dialog box

diff --git a/xscreensaver-test-passwd-segv-tty.patch b/xscreensaver-test-passwd-segv-tty.patch
deleted file mode 100644 (file)
index 73ced5d..0000000
--- a/xscreensaver-test-passwd-segv-tty.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xscreensaver-5.12/driver/passwd.c.debug2   2008-12-27 19:17:26.000000000 +0900
-+++ xscreensaver-5.12/driver/passwd.c  2011-04-03 21:55:26.000000000 +0900
-@@ -205,7 +205,7 @@
- {
- # ifdef HAVE_SYSLOG
-   struct passwd *pw = getpwuid (getuid ());
--  char *d = DisplayString (si->dpy);
-+  char *d = (si->dpy ? DisplayString (si->dpy) : 0);
-   char *u = (pw && pw->pw_name ? pw->pw_name : "???");
-   int opt = 0;
-   int fac = 0;

diff --git a/xscreensaver.spec b/xscreensaver.spec
index 6f6468940cfc3e9a8679d2f33cc250afaba15252..e3c9f02f4429a85127b3ab8d0afbf1840ef289ce 100644 (file)
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -8,36 +8,44 @@ Summary(ru.UTF-8):    Набор программ хранения экрана д
 Summary(uk.UTF-8):     Набір програм збереження екрану для X Window
 Summary(zh_CN.UTF-8):  X 窗口系统保护器
 Name:          xscreensaver
-Version:       5.13
-Release:       3
+Version:       6.00
+Release:       1
 Epoch:         1
 License:       BSD
 Group:         X11/Applications
 Source0:       http://www.jwz.org/xscreensaver/%{name}-%{version}.tar.gz
-# Source0-md5: a1a55b763e17c5c83a2b7cb5ddf23560
+# Source0-md5: 0c77c3d46a4b4d11fdef1d368349ed7a
 Source1:       %{name}-autostart.desktop
 Source2:       %{name}-lock.desktop
 Source3:       %{name}.pamd
-Source4:       mkinstalldirs
-Patch0:                %{name}-degnomify.patch
-Patch1:                %{name}-build.patch
-Patch2:                %{name}-test-passwd-segv-tty.patch
-Patch3:                %{name}-desktop.patch
+Patch0:                %{name}-desktop.patch
 URL:           http://www.jwz.org/xscreensaver/
-BuildRequires: OpenGL-devel
-BuildRequires: OpenGL-glut-devel
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLES-devel
+BuildRequires: Mesa-libGLU-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bc
+BuildRequires: gdk-pixbuf2-xlib-devel
 BuildRequires: gettext-tools
 BuildRequires: gle-devel
 BuildRequires: gtk+2-devel >= 1:2.0.3
 BuildRequires: intltool
-BuildRequires: libglade2-devel >= 2.0.0
+BuildRequires: libjpeg-devel
+BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.4.22
 BuildRequires: pam-devel >= 0.77.3
 BuildRequires: perl-base
 BuildRequires: pkgconfig
+BuildRequires: systemd-devel
+BuildRequires: xorg-lib-libICE-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXi-devel
+BuildRequires: xorg-lib-libXinerama-devel
+BuildRequires: xorg-lib-libXrandr-devel
+BuildRequires: xorg-lib-libXt-devel
+BuildRequires: xorg-lib-libXxf86vm-devel
 Requires:      %{name}-savers = %{epoch}:%{version}-%{release}
 Requires:      pam >= 0.77.3
 Requires:      xorg-lib-libXt >= 1.0.0
@@ -45,12 +53,12 @@ Requires:   xorg-lib-libXt >= 1.0.0
 Suggests:      perl-perldoc
 # for xscreensaver-text
 Suggests:      xorg-app-appres
-Obsoletes:     xscreensaver-gnome
+Obsoletes:     xscreensaver-gnome 
 Obsoletes:     xscreensaver-gnome1
 Obsoletes:     xscreensaver-gnome2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreqdep   libGL.so.1 libGLU.so.1 libGLcore.so.1
+%define                _noautoreqdep   libGL.so.1 libGLU.so.1
 %define                _sysconfdir     /etc/X11
 %define                _appdefsdir     /usr/share/X11/app-defaults
 
@@ -111,6 +119,8 @@ Summary:    Base X screen savers
 Summary(pl.UTF-8):     Podstawowe wygaszacze ekranu pod X Window
 Group:         X11/Applications
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      perl-HTML-Parser
+Requires:      perl-LWP-Protocol-https
 Provides:      %{name}-savers = %{epoch}:%{version}-%{release}
 
 %description base
@@ -154,42 +164,37 @@ Wygaszacze ekranu pod X Window używające OpenGL oraz GLE.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-install -m755 %{SOURCE4} .
 
 %build
-cp -f /usr/share/automake/{config.sub,install-sh} .
-%{__libtoolize}
-%{__intltoolize}
-%{__aclocal}
-%{__autoconf}
 %configure \
-       PERL=%{__perl} \
-%ifarch alpha
-       --without-xshm-ext \
-%endif
+       --with-x \
+       --with-dpms-ext \
+       --with-xf86vmode-ext \
        --with-xinerama-ext \
        --with-randr-ext \
-       --with-xf86vmode-ext \
+       --with-xinput-ext \
        --with-xf86gamma-ext \
-       --with-dpms-ext \
-       --with-mit-ext \
+       --with-xshm-ext \
+       --with-xdbe-ext \
+       --with-xkb-ext \
        --with-proc-interrupts \
+       --with-proc-oom \
+       --with-systemd \
        --with-pam \
        --with-shadow \
-       --without-motif \
-       --with-xml \
+       --with-gtk \
        --with-gl \
        --with-gle \
        --with-jpeg \
-       --with-xshm-ext \
-       --with-xdbe-ext \
+       --with-png \
+       --with-pixbuf \
+       --with-xft \
        --with-hackdir=%{_libdir}/xscreensaver \
        --with-configdir=%{_datadir}/xscreensaver \
-       --with-fortune=%{_bindir}/fortune \
-       --enable-locking
+       --enable-locking \
+       --without-login-manager \
+       --without-kerberos \
+       --without-motif
 
 %{__make} all
 
@@ -205,8 +210,8 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{/etc/{pam.d,xdg/autostart},%{_desktopdir}}
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 
 %{__make} -C driver install-pam \
        PAM_DIR=$RPM_BUILD_ROOT/etc/pam.d
@@ -271,27 +276,28 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/xscreensaver
 %attr(755,root,root) %{_bindir}/xscreensaver-command
 %attr(755,root,root) %{_bindir}/xscreensaver-demo
-%attr(755,root,root) %{_bindir}/xscreensaver-getimage*
-%attr(755,root,root) %{_bindir}/xscreensaver-text
+%attr(755,root,root) %{_bindir}/xscreensaver-settings
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xscreensaver
 /etc/xdg/autostart/xscreensaver-autostart.desktop
 %{_appdefsdir}/*
-%{_datadir}/%{name}/glade
 %{_desktopdir}/xscreensaver-properties.desktop
 %{_desktopdir}/xscreensaver-lock.desktop
 %{_mandir}/man1/xscreensaver.1*
 %{_mandir}/man1/xscreensaver-command.1*
 %{_mandir}/man1/xscreensaver-demo.1*
-%{_mandir}/man1/xscreensaver-getimage*.1*
-%{_mandir}/man1/xscreensaver-text.1*
+%{_mandir}/man1/xscreensaver-settings.1*
+%{_mandir}/man6/xscreensaver-command.6*
 %{_pixmapsdir}/*.xpm
+%dir %{_datadir}/%{name}/ui
+%{_datadir}/%{name}/ui/screensaver*.png
+%{_datadir}/%{name}/ui/xscreensaver.ui
 
 %files common
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/xscreensaver-gl-helper
-%{_mandir}/man6/xscreensaver-gl-helper.6*
 %dir %{_libdir}/%{name}
-%dir %{_datadir}/%{name}
+%dir %{_fontsdir}/xscreensaver
+%{_fontsdir}/xscreensaver/*.otf
+%{_fontsdir}/xscreensaver/*.ttf
 
 %files base -f files.base
 %defattr(644,root,root,755)