diff --git a/xlockmore-5.26.1.tar.bz2 b/xlockmore-5.26.1.tar.bz2 deleted file mode 100644 index 64a7b9c..0000000 --- a/xlockmore-5.26.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:762e575ba95f96127a18ce0bc5ab9c0c685da5330105672bd7d36f5b0841a970 -size 1842373 diff --git a/xlockmore-5.28.tar.bz2 b/xlockmore-5.28.tar.bz2 new file mode 100644 index 0000000..e1af1fd --- /dev/null +++ b/xlockmore-5.28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9483efc940705f5fff8555eeeba6f3514ffee40a1b4222bdb7d8329759fd3fd7 +size 1901583 diff --git a/xlockmore-undefined-code.patch b/xlockmore-undefined-code.patch new file mode 100644 index 0000000..a36c7b4 --- /dev/null +++ b/xlockmore-undefined-code.patch @@ -0,0 +1,27 @@ +--- modes/fadeplot.c ++++ modes/fadeplot.c +@@ -207,11 +207,11 @@ + if ((fp->temps % (fp->angles / 2)) == 0) { + fp->temps = fp->temps % fp->angles * 5; + if ((fp->temps % (fp->angles)) == 0) +- fp->speed.y = (fp->speed.y++) % 30 + 1; ++ fp->speed.y = (fp->speed.y + 1) % 30 + 1; + if ((fp->temps % (fp->angles * 2)) == 0) + fp->speed.x = (fp->speed.x) % 20; + if ((fp->temps % (fp->angles * 3)) == 0) +- fp->step.y = (fp->step.y++) % 2 + 1; ++ fp->step.y = (fp->step.y + 1) % 2 + 1; + MI_CLEARWINDOWCOLORMAPFAST(mi, MI_GC(mi), MI_BLACK_PIXEL(mi)); + } + } +--- modes/swarm.c ++++ modes/swarm.c +@@ -339,7 +339,7 @@ + sp->yv[NRAND(sp->beecount)] += balance_rand(3); + } + /* <=- Bees -=> */ +- sp->tick = ++(sp->tick) % (sp->taillen); ++ sp->tick = (sp->tick + 1) % (sp->taillen); + prev = (sp->tick) ? sp->tick - 1 : sp->taillen - 1; + if (sp->tick == sp->taillen - 1) + sp->rolloverflag = 1; diff --git a/xlockmore-void-return.patch b/xlockmore-void-return.patch new file mode 100644 index 0000000..4c46c32 --- /dev/null +++ b/xlockmore-void-return.patch @@ -0,0 +1,11 @@ +--- modes/life3d.c ++++ modes/life3d.c +@@ -2271,7 +2271,7 @@ + return False; + } + +-static Bool populateGlider(life3dstruct * lp, char *glider, int offsetSwitch, ++static void populateGlider(life3dstruct * lp, char *glider, int offsetSwitch, + int hsp, int vsp, int asp, int hoff, int voff, int aoff) { + int x, y, z, temp; + diff --git a/xlockmore.changes b/xlockmore.changes index c1328ea..0c2a8f3 100644 --- a/xlockmore.changes +++ b/xlockmore.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 11 17:16:36 CEST 2009 - sbrabec@suse.cz + +- Updated to version 5.28: + * Inrovements in modes: ant3d, life3d, life, + * FTGL library support. + * PAM_putText() fix. + * configure checks for libXdpms + ------------------------------------------------------------------- Fri Nov 28 14:22:04 CET 2008 - sbrabec@suse.cz diff --git a/xlockmore.spec b/xlockmore.spec index 1aef86c..1324ef2 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ # -# spec file for package xlockmore (Version 5.26.1) +# spec file for package xlockmore (Version 5.28) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,14 +19,14 @@ Name: xlockmore -BuildRequires: bc esound-devel fdupes freeglut-devel freetype2-devel gcc-c++ gltt-devel libdrm-devel pkg-config +BuildRequires: bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ gltt-devel libdrm-devel pkg-config License: GPL v2 or later; X11/MIT Group: System/X11/Utilities Provides: xlock Obsoletes: xlock AutoReqProv: on -Version: 5.26.1 -Release: 9 +Version: 5.28 +Release: 1 Summary: Screen Saver and Locker for the X Window System Url: http://www.tux.org/~bagleyd/xlockmore.html Source: %{name}-%{version}.tar.bz2 @@ -44,6 +44,8 @@ Patch5: xlockmore-gltt-libttf.patch Patch6: xlockmore-gltt+ftgl.patch Patch7: xlockmore-strict-aliasing.patch Patch8: xlockmore-null-fontset.patch +Patch9: xlockmore-void-return.patch +Patch10: xlockmore-undefined-code.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,7 +56,7 @@ saver until a password is entered. Authors: -------- - David Albert Bagley + David Albert Bagley Patrick J. Naughton %if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr" @@ -98,6 +100,8 @@ chmod -x README docs/Revisions %patch6 %patch7 %patch8 +%patch9 +%patch10 %build %{?suse_update_config:%{suse_update_config -f}} @@ -149,6 +153,12 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_xorg7libs32}/xlock %changelog +* Thu Jun 11 2009 sbrabec@suse.cz +- Updated to version 5.28: + * Inrovements in modes: ant3d, life3d, life, + * FTGL library support. + * PAM_putText() fix. + * configure checks for libXdpms * Fri Nov 28 2008 sbrabec@suse.cz - Do not install compile time pixmaps (bnc#450061). * Wed Sep 03 2008 sbrabec@suse.cz