commit d9f68cb2f4f9122b1e614c567af2cda1b5d8169f
Author: Marcin Banasiak <[email protected]>
Date: Tue Mar 13 22:48:13 2018 +0100
Add -systemd.patch to fix build with new systemd. Release 9
gnome-screensaver-systemd.patch | 13 +++++++++++++
gnome-screensaver.spec | 6 ++++--
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index 93cded5..dc00803 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -2,13 +2,14 @@ Summary: GNOME screensaver
Summary(pl.UTF-8): Wygaszacz ekranu GNOME
Name: gnome-screensaver
Version: 3.6.1
-Release: 8
+Release: 9
License: GPL v2+
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver/3.6/%{name}-%{version}.tar.xz
# Source0-md5: 881cc58daa7cd8602737912ae5715cc8
Source1: %{name}.pamd
Patch0: am.patch
+Patch1: %{name}-systemd.patch
URL: http://live.gnome.org/GnomeScreensaver
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.10
@@ -53,6 +54,7 @@ xscreensaver.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__intltoolize}
@@ -93,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gnome-screensaver
%attr(755,root,root) %{_bindir}/gnome-screensaver
%attr(755,root,root) %{_bindir}/gnome-screensaver-command
-%attr(755,root,root) %{_libdir}/gnome-screensaver-dialog
+%attr(755,root,root) %{_libexecdir}/gnome-screensaver-dialog
%dir %{_libdir}/gnome-screensaver
%{_sysconfdir}/xdg/autostart/gnome-screensaver.desktop
%{_mandir}/man1/gnome-screensaver.1*
diff --git a/gnome-screensaver-systemd.patch b/gnome-screensaver-systemd.patch
new file mode 100644
index 0000000..c9dbb3f
--- /dev/null
+++ b/gnome-screensaver-systemd.patch
@@ -0,0 +1,13 @@
+--- gnome-screensaver-3.6.1/configure.ac.systemd 2018-03-13
22:36:05.069234255 +0100
++++ gnome-screensaver-3.6.1/configure.ac 2018-03-13 22:37:02.587176254
+0100
+@@ -602,7 +602,9 @@ AC_ARG_WITH(systemd,
+
+ PKG_CHECK_MODULES(SYSTEMD,
+ [libsystemd-login libsystemd-daemon],
+- [have_systemd=yes], [have_systemd=no])
++ [have_systemd=yes], [PKG_CHECK_MODULES(SYSTEMD,
++ [libsystemd],
++ [have_systemd=yes],
[have_systemd=no])])
+
+ if test "x$with_systemd" = "xauto" ; then
+ if test x$have_systemd = xno ; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-screensaver.git/commitdiff/d9f68cb2f4f9122b1e614c567af2cda1b5d8169f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
