pool/xlockmore
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1046688 from X11:Utilities

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1046688
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xlockmore?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger 2023-01-04 16:52:56 +00:00 committed by Git OBS Bridge
commit 567106b876
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xlockmore.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 3 15:28:45 UTC 2023 - Stefan Schubert <schubi@suse.com>
- Migration of PAM settings to /usr/lib/pam.d.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 15 10:25:00 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com> Thu Dec 15 10:25:00 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>

28
xlockmore.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xlockmore # spec file for package xlockmore
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -103,7 +103,6 @@ export CXXFLAGS="%{optflags}"
%make_build %make_build
%install %install
install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7bin}/ install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7bin}/
install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/app-defaults/ install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/app-defaults/
install -d -m 755 %{buildroot}%{_xorg7_mandir}/man1/ install -d -m 755 %{buildroot}%{_xorg7_mandir}/man1/
@ -111,7 +110,14 @@ install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libs32}/xlock
install -m 755 xlock/xlock %{buildroot}%{_prefix}/%{_xorg7libs32}/xlock/xlock 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.ad %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/app-defaults/XLock
install -m 644 xlock/xlock.man %{buildroot}%{_xorg7_mandir}/man1/xlock.1x install -m 644 xlock/xlock.man %{buildroot}%{_xorg7_mandir}/man1/xlock.1x
%if 0%{?suse_version} > 1500
install -d -m 755 %{buildroot}%{_pam_vendordir}
install -m 644 %{SOURCE1} %{buildroot}%{_pam_vendordir}/xlock
%else
install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/xlock install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/xlock
%endif
%if "%(pkg-config --variable prefix x11 || echo %{_prefix}/X11R6)" == "%{_prefix}" %if "%(pkg-config --variable prefix x11 || echo %{_prefix}/X11R6)" == "%{_prefix}"
install -m 755 %{SOURCE2} %{buildroot}%{_prefix}/%{_xorg7bin}/xlock install -m 755 %{SOURCE2} %{buildroot}%{_prefix}/%{_xorg7bin}/xlock
%else %else
@ -119,10 +125,28 @@ install -m 755 %{SOURCE3} %{buildroot}%{_prefix}/%{_xorg7bin}/xlock
%endif %endif
%fdupes %{buildroot}%{_prefix} %fdupes %{buildroot}%{_prefix}
%if 0%{?suse_version} > 1500
%pre
# Prepare for migration to /usr/lib; save any old .rpmsave
for i in pam.d/xlock ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
done
%posttrans
# Migration to /usr/lib, restore just created .rpmsave
for i in pam.d/xlock ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
done
%endif
%files %files
%doc %{_xorg7_mandir}/man1/xlock.1x.gz %doc %{_xorg7_mandir}/man1/xlock.1x.gz
%doc README docs/3d.howto docs/Purify docs/Revisions docs/TODO docs/cell_automata %doc README docs/3d.howto docs/Purify docs/Revisions docs/TODO docs/cell_automata
%if 0%{?suse_version} > 1500
%{_pam_vendordir}/xlock
%else
%config %{_sysconfdir}/pam.d/xlock %config %{_sysconfdir}/pam.d/xlock
%endif
%{_prefix}/%{_xorg7libshare}/X11/app-defaults %{_prefix}/%{_xorg7libshare}/X11/app-defaults
%{_prefix}/%{_xorg7bin}/xlock %{_prefix}/%{_xorg7bin}/xlock
%{_prefix}/%{_xorg7libs32}/xlock %{_prefix}/%{_xorg7libs32}/xlock