From 4d0a805976b8399a2c93628d079b0bbf5f49e7d5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Dec 10 2013 04:58:57 +0000 Subject: Update to 5.26 --- diff --git a/.gitignore b/.gitignore index 6f2260b..186ca0d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /xscreensaver-5.21.tar.gz /xscreensaver-5.22.tar.gz /xscreensaver-5.23.tar.gz +/xscreensaver-5.26.tar.gz diff --git a/sources b/sources index ca01b61..95e4c63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da1fa6978520fc45b87155480ab222c9 xscreensaver-5.23.tar.gz +dd4390f36b9c9d79b66d18b145ca62ad xscreensaver-5.26.tar.gz diff --git a/xscreensaver-5.11-conf264.patch b/xscreensaver-5.11-conf264.patch deleted file mode 100644 index 01a0aa5..0000000 --- a/xscreensaver-5.11-conf264.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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.11/configure.in.debug 2010-01-02 20:28:15.000000000 +0900 -+++ xscreensaver-5.11/configure.in 2010-04-12 20:40:46.000000000 +0900 -@@ -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 diff --git a/xscreensaver-5.16-webcollage-default-nonet.patch b/xscreensaver-5.16-webcollage-default-nonet.patch deleted file mode 100644 index 719f26a..0000000 --- a/xscreensaver-5.16-webcollage-default-nonet.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xscreensaver-5.16/hacks/config/webcollage.xml.nonet 2012-06-19 16:14:11.000000000 +0900 -+++ xscreensaver-5.16/hacks/config/webcollage.xml 2012-06-21 00:07:11.000000000 +0900 -@@ -28,8 +28,8 @@ - - - -- - --> -+ - - <_description> - This is what the Internet looks like. -@@ -47,6 +47,11 @@ - - See also http://www.jwz.org/webcollage/ - -+NOTE: -+Webcollage on Fedora does not connect to internet by default -+and uses image files on your local disk. If you want webcollage to -+search for image files on net, use webcollage.original . -+ - Written by Jamie Zawinski; 1999. - - ---- xscreensaver-5.16/hacks/webcollage.man.nonet 2009-10-14 06:12:31.000000000 +0900 -+++ xscreensaver-5.16/hacks/webcollage.man 2012-06-21 00:04:50.000000000 +0900 -@@ -178,6 +178,11 @@ - .TP 8 - .B \-fps - Display the current frame rate and CPU load (MacOS only). -+.SH NOTES FOR FEDORA USER -+Webcollage on Fedora uses '-directory' option by default, so it -+.B does not connect to internet -+and uses image files on your local disk. If you want webcollage to -+search for image files on net, use webcollage.original . - .SH ENVIRONMENT - .PP - .TP 8 diff --git a/xscreensaver-5.26-webcollage-default-nonet.patch b/xscreensaver-5.26-webcollage-default-nonet.patch new file mode 100644 index 0000000..7f6edfd --- /dev/null +++ b/xscreensaver-5.26-webcollage-default-nonet.patch @@ -0,0 +1,38 @@ +--- xscreensaver-5.26/hacks/config/webcollage.xml.nonet 2013-12-05 07:04:09.000000000 +0900 ++++ xscreensaver-5.26/hacks/config/webcollage.xml 2013-12-10 13:41:37.303883653 +0900 +@@ -28,8 +28,8 @@ + + + +- + --> ++ + + + +@@ -49,6 +49,11 @@ + + See also http://www.jwz.org/webcollage/ + ++NOTE: ++Webcollage on Fedora does not connect to internet by default ++and uses image files on your local disk. If you want webcollage to ++search for image files on net, use webcollage.original . ++ + Written by Jamie Zawinski; 1999. + + +--- xscreensaver-5.26/hacks/webcollage.man.nonet 2009-10-14 06:12:31.000000000 +0900 ++++ xscreensaver-5.26/hacks/webcollage.man 2013-12-10 13:40:38.139050305 +0900 +@@ -178,6 +178,11 @@ + .TP 8 + .B \-fps + Display the current frame rate and CPU load (MacOS only). ++.SH NOTES FOR FEDORA USER ++Webcollage on Fedora uses '-directory' option by default, so it ++.B does not connect to internet ++and uses image files on your local disk. If you want webcollage to ++search for image files on net, use webcollage.original . + .SH ENVIRONMENT + .PP + .TP 8 diff --git a/xscreensaver.spec b/xscreensaver.spec index c295a08..ecedf27 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -1,6 +1,6 @@ %define name xscreensaver -%define mainversion 5.23 +%define mainversion 5.26 %define beta_ver %{nil} @@ -55,12 +55,9 @@ Source12: xscreensaver-autostart.desktop Patch1: xscreensaver-5.00b5-sanitize-hacks.patch # Change webcollage not to access to net # Also see bug 472061 -Patch21: xscreensaver-5.16-webcollage-default-nonet.patch +Patch21: xscreensaver-5.26-webcollage-default-nonet.patch # ## Patches already sent to the upsteam -# Remove "AC_PROG_CC' was expanded before it was required" warning -Patch30: xscreensaver-5.11-conf264.patch -# ## Patches which must be discussed with upstream # # Update Japanese po file @@ -409,7 +406,7 @@ autoheader %build -archdir=`./config.guess` +archdir=`sh ./config.guess` [ -d $archdir ] || mkdir $archdir cd $archdir @@ -510,7 +507,7 @@ make tests -C driver %endif %install -archdir=`./config.guess` +archdir=`sh ./config.guess` cd $archdir rm -rf ${RPM_BUILD_ROOT} @@ -850,6 +847,9 @@ exit 0 %endif %changelog +* Tue Dec 10 2013 Mamoru TASAKA - 1:5.26-1 +- Update to 5.26 + * Wed Nov 13 2013 Mamoru TASAKA - 1:5.23-1 - Update to 5.23