Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package budgie-screensaver for openSUSE:Factory checked in at 2021-04-12 12:36:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/budgie-screensaver (Old) and /work/SRC/openSUSE:Factory/.budgie-screensaver.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "budgie-screensaver" Mon Apr 12 12:36:52 2021 rev:4 rq:884506 version:20201110 Changes: -------- --- /work/SRC/openSUSE:Factory/budgie-screensaver/budgie-screensaver.changes 2020-12-09 22:22:30.851741883 +0100 +++ /work/SRC/openSUSE:Factory/.budgie-screensaver.new.2401/budgie-screensaver.changes 2021-04-12 12:39:45.597536351 +0200 @@ -1,0 +2,10 @@ +Sun Apr 11 18:12:22 UTC 2021 - Callum Farmer <[email protected]> + +- Add GNOME-40.patch: to fix conflict with GNOME 40 + +------------------------------------------------------------------- +Fri Apr 9 18:01:56 UTC 2021 - Callum Farmer <[email protected]> + +- Prepare usrmerge + +------------------------------------------------------------------- New: ---- GNOME-40.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ budgie-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.BE9rBa/_old 2021-04-12 12:39:46.181537030 +0200 +++ /var/tmp/diff_new_pack.BE9rBa/_new 2021-04-12 12:39:46.185537034 +0200 @@ -1,7 +1,7 @@ # # spec file for package budgie-screensaver # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2020 Callum Farmer <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -17,6 +17,11 @@ # +%if 0%{?usrmerged} +%define chkpwd %{_sbindir}/unix2_chkpwd +%else +%define chkpwd /sbin/unix2_chkpwd +%endif Name: budgie-screensaver Version: 20201110 Release: 0 @@ -24,9 +29,9 @@ License: GPL-2.0-or-later Group: System/GUI/Other URL: https://github.com/getsolus/budgie-screensaver -Source: %{name}-%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE remove-old-automake-macros.patch -Patch: remove-old-automake-macros.patch +Patch0: remove-old-automake-macros.patch # PATCH-FEATURE-OPENSUSE gnome-screensaver-suse-pam.patch Patch1: gnome-screensaver-suse-pam.patch # PATCH-FIX-UPSTREAM gnome-screensaver-helper.patch bgo#640647 [email protected] -- Put back helper authentication, removed by upstream @@ -35,14 +40,14 @@ Patch3: gnome-screensaver-xvkbd-on-lock.patch # PATCH-FIX-UPSTREAM gnome-screensaver-multihead-unlock.patch bnc#444157 bgo#455118 [email protected] Patch4: gnome-screensaver-multihead-unlock.patch +Patch5: GNOME-40.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: gnome-common BuildRequires: intltool -BuildRequires: libXScrnSaver-devel -BuildRequires: libXext-devel -BuildRequires: libXxf86vm-devel BuildRequires: libtool BuildRequires: pam-devel +BuildRequires: pkgconfig BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) @@ -50,32 +55,34 @@ BuildRequires: pkgconfig(libgnomekbdui) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(x11) -Requires: /sbin/unix2_chkpwd - -%lang_package +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(xxf86vm) +Requires: pam +%if 0%{?suse_version} < 1550 +BuildRequires: pkgconfig(xxf86misc) +%endif %description Fork of GNOME Screensaver for Budgie 10 +%lang_package + %prep -%setup -q -%patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%autosetup -p1 %build -touch ./config.rpath +export AUTOPOINT='intltoolize --copy --automake' touch ./ABOUT-NLS mkdir m4 -intltoolize --copy --force --automake +mkdir build-aux +touch build-aux/config.rpath autoreconf -fiv %configure\ --libexecdir=%{_libexecdir}/gnome-screensaver\ --with-pam-prefix=%{_sysconfdir}\ --enable-authentication-scheme=helper\ - --with-passwd-helper="/sbin/unix2_chkpwd"\ + --with-passwd-helper="%{chkpwd}"\ --with-console-kit\ --with-systemd\ --disable-docbook-docs @@ -91,7 +98,7 @@ %{_bindir}/* %{_libexecdir}/gnome-screensaver %{_datadir}/applications/gnome-screensaver.desktop -%{_datadir}/dbus-1/services/org.gnome.ScreenSaver.service +%{_datadir}/dbus-1/services/us.getsol.budgie-screensaver.service %{_mandir}/man1/* %files lang -f gnome-screensaver.lang ++++++ GNOME-40.patch ++++++ >From 55d39a4ba9f58e019100a83b9872f63ecf92e62f Mon Sep 17 00:00:00 2001 From: Callum Farmer <[email protected]> Date: Sun, 11 Apr 2021 18:30:39 +0100 Subject: [PATCH 1/3] Change name to us.getsol.budgie-screensaver where conflicts --- configure.ac | 2 +- data/Makefile.am | 4 ++-- data/org.gnome.ScreenSaver.service.in | 2 +- doc/dbus-interface.xml | 22 +++++++++++----------- src/gs-bus.h | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index c573924..66013e2 100644 --- a/configure.ac +++ b/configure.ac @@ -768,7 +768,7 @@ po/Makefile.in src/Makefile src/gnome-screensaver.desktop.in data/Makefile -data/org.gnome.ScreenSaver.service +data/us.getsol.budgie-screensaver.service doc/Makefile doc/gnome-screensaver.xml ]) diff --git a/data/Makefile.am b/data/Makefile.am index 5c860a0..3d67025 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -8,12 +8,12 @@ man_MANS = \ @INTLTOOL_XML_NOMERGE_RULE@ dbussessionservicedir = $(DBUS_SESSION_SERVICE_DIR) -dbussessionservice_DATA = org.gnome.ScreenSaver.service +dbussessionservice_DATA = us.getsol.budgie-screensaver.service EXTRA_DIST = \ $(man_MANS) \ gnome-screensaver \ - org.gnome.ScreenSaver.service.in\ + us.getsol.budgie-screensaver.service.in\ $(NULL) DISTCLEANFILES = \ diff --git a/data/org.gnome.ScreenSaver.service.in b/data/org.gnome.ScreenSaver.service.in index d46e4f4..0f458e9 100644 --- a/data/org.gnome.ScreenSaver.service.in +++ b/data/org.gnome.ScreenSaver.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.gnome.ScreenSaver +Name=us.getsol.budgie-screensaver Exec=@EXPANDED_BINDIR@/gnome-screensaver --no-daemon diff --git a/doc/dbus-interface.xml b/doc/dbus-interface.xml index aca4e11..2469acf 100644 --- a/doc/dbus-interface.xml +++ b/doc/dbus-interface.xml @@ -22,15 +22,15 @@ <tbody> <row> <entry>DBUS Service:</entry> - <entry><literal>org.gnome.ScreenSaver</literal></entry> + <entry><literal>us.getsol.budgie-screensaver</literal></entry> </row> <row> <entry>DBUS Object Path:</entry> - <entry><literal>/org/gnome/ScreenSaver</literal></entry> + <entry><literal>/us/getsol/budgie-screensaver</literal></entry> </row> <row> <entry>DBUS Interface:</entry> - <entry><literal>org.gnome.ScreenSaver</literal></entry> + <entry><literal>us.getsol.budgie-screensaver</literal></entry> </row> </tbody> </tgroup> @@ -370,24 +370,24 @@ </para> <screen> dbus-send --session \ - --dest=org.gnome.ScreenSaver \ + --dest=us.getsol.budgie-screensaver \ --type=method_call \ --print-reply \ --reply-timeout=20000 \ - /org/gnome/ScreenSaver \ - org.gnome.ScreenSaver.GetSessionIdleTime + /us/getsol/budgie-screensaver \ + us.getsol.budgie-screensaver.GetSessionIdleTime </screen> <para> You can activate the screensaver like so: </para> <screen> dbus-send --session \ - --dest=org.gnome.ScreenSaver \ + --dest=us.getsol.budgie-screensaver \ --type=method_call \ --print-reply \ --reply-timeout=20000 \ - /org/gnome/ScreenSaver \ - org.gnome.ScreenSaver.SetActive \ + /us/getsol/budgie-screensaver \ + us.getsol.budgie-screensaver.SetActive \ boolean:true </screen> @@ -396,7 +396,7 @@ dbus-send --session \ </para> <screen> dbus-monitor --session \ - "type='signal',interface='org.gnome.ScreenSaver'" + "type='signal',interface='us.getsol.budgie-screensaver'" </screen> <para> @@ -404,7 +404,7 @@ dbus-monitor --session \ </para> <screen> dbus-monitor --session \ - "type='signal',interface='org.gnome.ScreenSaver',member='SessionIdleChanged'" + "type='signal',interface='us.getsol.budgie-screensaver',member='SessionIdleChanged'" </screen> </sect1> diff --git a/src/gs-bus.h b/src/gs-bus.h index fea13d3..1814a7d 100644 --- a/src/gs-bus.h +++ b/src/gs-bus.h @@ -47,9 +47,9 @@ #define DBUS_INTERFACE "org.freedesktop.DBus" /* Gnome Screensaver */ -#define GS_SERVICE "org.gnome.ScreenSaver" -#define GS_PATH "/org/gnome/ScreenSaver" -#define GS_INTERFACE "org.gnome.ScreenSaver" +#define GS_SERVICE "us.getsol.budgie-screensaver" +#define GS_PATH "/us/getsol/budgie-screensaver" +#define GS_INTERFACE "us.getsol.budgie-screensaver" /* Gnome Session Manager */ #define GSM_SERVICE "org.gnome.SessionManager" -- 2.30.2 >From 13f4bd1f52f2a5c83b2839da0a5a22e45e5230a0 Mon Sep 17 00:00:00 2001 From: Callum Farmer <[email protected]> Date: Sun, 11 Apr 2021 18:33:35 +0100 Subject: [PATCH 2/3] part 2 --- data/org.gnome.ScreenSaver.service.in | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 data/org.gnome.ScreenSaver.service.in diff --git a/data/org.gnome.ScreenSaver.service.in b/data/org.gnome.ScreenSaver.service.in deleted file mode 100644 index 0f458e9..0000000 --- a/data/org.gnome.ScreenSaver.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=us.getsol.budgie-screensaver -Exec=@EXPANDED_BINDIR@/gnome-screensaver --no-daemon -- 2.30.2 >From a5243d9ddd89eda09e11f98730ea990ba1e0ab07 Mon Sep 17 00:00:00 2001 From: Callum Farmer <[email protected]> Date: Sun, 11 Apr 2021 18:34:19 +0100 Subject: [PATCH 3/3] part 3 --- data/us.getsol.budgie-screensaver.service.in | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/us.getsol.budgie-screensaver.service.in diff --git a/data/us.getsol.budgie-screensaver.service.in b/data/us.getsol.budgie-screensaver.service.in new file mode 100644 index 0000000..0f458e9 --- /dev/null +++ b/data/us.getsol.budgie-screensaver.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=us.getsol.budgie-screensaver +Exec=@EXPANDED_BINDIR@/gnome-screensaver --no-daemon -- 2.30.2 ++++++ remove-old-automake-macros.patch ++++++ --- /var/tmp/diff_new_pack.BE9rBa/_old 2021-04-12 12:39:46.237537095 +0200 +++ /var/tmp/diff_new_pack.BE9rBa/_new 2021-04-12 12:39:46.237537095 +0200 @@ -32,30 +32,25 @@ index c573924..942457e 100644 --- a/configure.ac +++ b/configure.ac -@@ -5,6 +5,7 @@ AC_INIT([gnome-screensaver], +@@ -5,6 +5,8 @@ AC_INIT([gnome-screensaver], [3.6.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-screensaver]) +AC_CONFIG_MACRO_DIR([m4]) ++AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR(src/gnome-screensaver.c) AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar]) -@@ -33,7 +34,6 @@ GETTEXT_PACKAGE=gnome-screensaver +@@ -33,7 +34,8 @@ GETTEXT_PACKAGE=gnome-screensaver AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain]) -AM_GLIB_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.17]) GLIB_GSETTINGS # Dependencies -@@ -91,7 +92,6 @@ SAVER_LIBS="$ALL_X_LIBS" - - AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) - --GNOME_COMPILE_WARNINGS(yes) - - # Optional dependencies for the theme engines - diff --git a/src/Makefile.am b/src/Makefile.am index 4d594d7..6ac785b 100644 --- a/src/Makefile.am
