Accepting request 925679 from home:dirkmueller:Factory

- update to 5.67:
  * Fixing specified bound equals destination size warning in iostuff.c.
  * Port updated for xscreensaver-6.01.  With help from EoflaOE ViceCity.
  * maze3d.c updated for VMS as CRTL now contains more standard functions

OBS-URL: https://build.opensuse.org/request/show/925679
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=48

xlockmore-5.66.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5976a5c3662828d14522c90e06f28ddcfc8e57788fde08eb8b7a70e9ef3bab71
-size 1995064

xlockmore-5.66.tar.xz.asc

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQQbechHjyNtza3A1qzPFZcHN3kZrgUCX5bn0gAKCRDPFZcHN3kZ
-rifIAJ4z8HNpx00JS4GUvubthlD6MBLFuACglELWFhT1p91yR9+DkZIPw5fKzKE=
-=QavT
------END PGP SIGNATURE-----

xlockmore-5.67.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8607e170e0df4af8f707d3b38f7ceb0d0e128773d7e175e202092695f7f234c
+size 2000040

xlockmore-5.67.tar.xz.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQQbechHjyNtza3A1qzPFZcHN3kZrgUCYSwxBgAKCRDPFZcHN3kZ
+rj6QAKCQNpfysxU2i55n4JsfR26bOCle+QCgi8Xf4LcsWwH1ydY57VMURk/w6Yk=
+=Aiqi
+-----END PGP SIGNATURE-----

xlockmore.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Oct 16 12:09:39 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 5.67:
+  * Fixing specified bound equals destination size warning in iostuff.c.
+  * Port updated for xscreensaver-6.01.  With help from EoflaOE ViceCity.
+  * maze3d.c updated for VMS as CRTL now contains more standard functions
+
 -------------------------------------------------------------------
 Fri Nov 20 02:55:13 UTC 2020 - Wang Jun <jgwang@suse.com>
 

xlockmore.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xlockmore
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:           xlockmore
-Version:        5.66
+Version:        5.67
 Release:        0
 Summary:        Screen Saver and Locker for the X Window System
 License:        MIT
 Group:          System/X11/Utilities
-URL:            http://sillycycle.com/xlockmore.html
+URL:            https://sillycycle.com/xlockmore.html
-Source:         http://sillycycle.com/xlock/%{name}-%{version}.tar.xz
+Source:         https://sillycycle.com/xlock/%{name}-%{version}.tar.xz
 Source1:        xlock.pamd
 Source2:        xlock-wrapper
 Source3:        xlock-wrapper_xorg6
@@ -53,8 +53,7 @@ BuildRequires:  libXpm-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libdrm-devel
 BuildRequires:  pam-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The xlock utility locks your X Window System session and runs a screen
@@ -66,11 +65,11 @@ saver until a password is entered.
 %define _xorg7_mandir %{_mandir}
 %define _xorg7pixmaps include
 %define _xorg7libshare share
-%define _xorg7_xkb /usr/share/X11/xkb
+%define _xorg7_xkb %{_datadir}/X11/xkb
-%define _xorg7_termcap /usr/lib/X11/etc
+%define _xorg7_termcap %{_prefix}/lib/X11%{_sysconfdir}
-%define _xorg7_serverincl /usr/include/xorg
+%define _xorg7_serverincl %{_includedir}/xorg
-%define _xorg7_fonts /usr/share/fonts
+%define _xorg7_fonts %{_datadir}/fonts
-%define _xorg7_prefix /usr
+%define _xorg7_prefix %{_prefix}
 
 %prep
 %setup -q
@@ -101,7 +100,7 @@ export CXXFLAGS="%{optflags}"
 	--disable-allow-root\
 	--x-includes=%{_xorg7_prefix}/include\
 	--x-libraries=%{_xorg7_prefix}/%{_lib}
-make %{?_smp_mflags}
+%make_build
 
 %install
 install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
@@ -113,18 +112,14 @@ install -m 755 xlock/xlock %{buildroot}%{_prefix}/%{_xorg7libs32}/xlock/xlock
 install -m 644 xlock/XLock.ad %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/app-defaults/XLock
 install -m 644 xlock/xlock.man %{buildroot}%{_xorg7_mandir}/man1/xlock.1x
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/xlock
-%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr"
+%if "%(pkg-config --variable prefix x11 || echo %{_prefix}/X11R6)" == "%{_prefix}"
 install -m 755 %{SOURCE2} %{buildroot}%{_prefix}/%{_xorg7bin}/xlock
 %else
 install -m 755 %{SOURCE3} %{buildroot}%{_prefix}/%{_xorg7bin}/xlock
 %endif
-%fdupes %{buildroot}/usr
+%fdupes %{buildroot}%{_prefix}
-
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root)
 %doc %{_xorg7_mandir}/man1/xlock.1x.gz
 %doc README docs/3d.howto docs/Purify docs/Revisions docs/TODO docs/cell_automata
 %config %{_sysconfdir}/pam.d/xlock