From 4658a4bab565b33c5cfe1f9f2d3d133e6d42997f38a01da7b05fbb1e1d39f71b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 28 Jan 2015 20:19:58 +0000 Subject: [PATCH] Accepting request 283246 from home:sbrabec:branches:X11:Utilities - Update to version 5.45: * Prevent pyro2 from X error. * Fix pentomino undefined behavior. * dilemma, voters, wator size fix for neighbors = 6. * Proper crediting for High Life part of life mode. * A few new gliders and patterns for life and life3d. - Enable Xinerama support (bsc#911133), gltt, xpm and ImageMagick support. OBS-URL: https://build.opensuse.org/request/show/283246 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=24 --- xlockmore-5.43.tar.bz2 | 3 --- xlockmore-5.43.tar.bz2.asc | 7 ------- xlockmore-5.45.tar.bz2 | 3 +++ xlockmore-5.45.tar.bz2.asc | 7 +++++++ xlockmore.changes | 12 ++++++++++++ xlockmore.spec | 18 +++++++++++++----- 6 files changed, 35 insertions(+), 15 deletions(-) delete mode 100644 xlockmore-5.43.tar.bz2 delete mode 100644 xlockmore-5.43.tar.bz2.asc create mode 100644 xlockmore-5.45.tar.bz2 create mode 100644 xlockmore-5.45.tar.bz2.asc diff --git a/xlockmore-5.43.tar.bz2 b/xlockmore-5.43.tar.bz2 deleted file mode 100644 index 352ce1b..0000000 --- a/xlockmore-5.43.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29911f21aaf682aa61f358ca36dadf20091ad919d19b4d55e3f4c8503ab266d0 -size 1965448 diff --git a/xlockmore-5.43.tar.bz2.asc b/xlockmore-5.43.tar.bz2.asc deleted file mode 100644 index b7020cb..0000000 --- a/xlockmore-5.43.tar.bz2.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.13 (Cygwin) - -iEYEABECAAYFAlHi5UsACgkQzxWXBzd5Ga68hgCeOTLLUl8+/dZPsnFVoAYU6A34 -bLwAn0l+67TkkSAhVPoaJ8uN90R9ji9a -=qibt ------END PGP SIGNATURE----- diff --git a/xlockmore-5.45.tar.bz2 b/xlockmore-5.45.tar.bz2 new file mode 100644 index 0000000..f5be827 --- /dev/null +++ b/xlockmore-5.45.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f81a80cb486c05269d71e9cc2d9c51645b59f09779fc24d01b858b7563015f7 +size 1968176 diff --git a/xlockmore-5.45.tar.bz2.asc b/xlockmore-5.45.tar.bz2.asc new file mode 100644 index 0000000..13db7dd --- /dev/null +++ b/xlockmore-5.45.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlR+bKwACgkQzxWXBzd5Ga4N6wCfXWEZIqecDE9189lrVP3D+79v +8AMAnjJNHn/J8L4tXn8jFZ4yaDrJ5ItQ +=+H9W +-----END PGP SIGNATURE----- diff --git a/xlockmore.changes b/xlockmore.changes index 0e7021e..b24f970 100644 --- a/xlockmore.changes +++ b/xlockmore.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jan 28 20:09:36 CET 2015 - sbrabec@suse.cz + +- Update to version 5.45: + * Prevent pyro2 from X error. + * Fix pentomino undefined behavior. + * dilemma, voters, wator size fix for neighbors = 6. + * Proper crediting for High Life part of life mode. + * A few new gliders and patterns for life and life3d. +- Enable Xinerama support (bsc#911133), gltt, xpm and ImageMagick + support. + ------------------------------------------------------------------- Mon Dec 16 12:00:12 EET 2013 - cougar@random.ee diff --git a/xlockmore.spec b/xlockmore.spec index 6cf114b..6476a22 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ # # spec file for package xlockmore # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,17 @@ Name: xlockmore -Version: 5.43 +Version: 5.45 Release: 0 Summary: Screen Saver and Locker for the X Window System License: GPL-2.0+ and MIT Group: System/X11/Utilities Url: http://www.tux.org/~bagleyd/xlockmore.html -Source: %{name}-%{version}.tar.bz2 +Source: http://www.tux.org/~bagleyd/xlock/%{name}-%{version}/%{name}-%{version}.tar.bz2 Source1: xlock.pamd Source2: xlock-wrapper Source3: xlock-wrapper_xorg6 -Source4: %{name}-%{version}.tar.bz2.asc +Source4: http://www.tux.org/~bagleyd/xlock/%{name}-%{version}/%{name}-%{version}.tar.bz2.asc Source5: %{name}.keyring # apply even patches when X.org < 7.0 else apply odd patches Patch1: %{name}-bitmaps.patch @@ -40,6 +40,7 @@ Patch8: xlockmore-no-copy-dt-needed-entries.patch # PATCH-FIX-UPSTREAM xlockmore-extend-freetype-include-search.patch -- search only for freetype.h, not the half path. Also, # extended list of directories where could freetype be found Patch9: xlockmore-extend-freetype-include-search.patch +BuildRequires: ImageMagick-devel BuildRequires: automake BuildRequires: bc BuildRequires: esound-devel @@ -48,8 +49,11 @@ BuildRequires: freeglut-devel BuildRequires: freetype2-devel BuildRequires: ftgl-devel BuildRequires: gcc-c++ +BuildRequires: gltt-devel BuildRequires: gpg-offline BuildRequires: libXdmcp-devel +BuildRequires: libXinerama-devel +BuildRequires: libXpm-devel BuildRequires: libXt-devel BuildRequires: libdrm-devel BuildRequires: pkg-config @@ -91,8 +95,12 @@ export CXXFLAGS="%{optflags}" ./configure \ --prefix=%{_xorg7_prefix}\ --with-libraries=%{_libdir}\ - --without-motif\ + --with-magick\ + --with-gltt\ + --with-xinerama\ + --with-xpm\ --without-gtk\ + --without-motif\ --with-passwd-helper=/sbin/unix2_chkpwd\ --disable-bomb\ --enable-vtlock\