Hello community, here is the log from the commit of package budgie-screensaver for openSUSE:Factory checked in at 2020-09-22 21:11:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/budgie-screensaver (Old) and /work/SRC/openSUSE:Factory/.budgie-screensaver.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "budgie-screensaver" Tue Sep 22 21:11:53 2020 rev:2 rq:835894 version:20190923 Changes: -------- --- /work/SRC/openSUSE:Factory/budgie-screensaver/budgie-screensaver.changes 2020-08-31 16:49:32.848333978 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-screensaver.new.4249/budgie-screensaver.changes 2020-09-22 21:12:12.951983707 +0200 @@ -1,0 +2,5 @@ +Sat Sep 19 16:08:09 UTC 2020 - Callum Farmer <[email protected]> + +- Use a better format for testing gnome versions + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ budgie-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.hTUp6x/_old 2020-09-22 21:12:16.239986584 +0200 +++ /var/tmp/diff_new_pack.hTUp6x/_new 2020-09-22 21:12:16.243986587 +0200 @@ -16,7 +16,6 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define gnome_version %(rpm -q --queryformat='%%{VERSION}' libgnome-desktop-3-devel | sed 's/\.[0-9]*$//g') Name: budgie-screensaver Version: 20190923 Release: 0 @@ -35,9 +34,7 @@ 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 -%if "%{gnome_version}" >= "3.36" Patch5: gnome-desktop-3.36.patch -%endif BuildRequires: autoconf BuildRequires: automake BuildRequires: intltool @@ -61,16 +58,25 @@ Fork of GNOME Screensaver for Budgie 10 %prep -%autosetup -p1 +%setup -q +%patch -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +if pkg-config --atleast-version 3.36 gnome-desktop-3.0; then +%patch5 -p1 +fi %build touch ./config.rpath touch ./ABOUT-NLS -intltoolize --copy --force +mkdir m4 +intltoolize --copy --force --automake autoreconf -fiv %configure\ --libexecdir=%{_libexecdir}/gnome-screensaver\ - --with-pam-prefix=/etc\ + --with-pam-prefix=%{_sysconfdir}\ --enable-authentication-scheme=helper\ --with-passwd-helper="/sbin/unix2_chkpwd"\ --with-console-kit\ ++++++ remove-old-automake-macros.patch ++++++ --- /var/tmp/diff_new_pack.hTUp6x/_old 2020-09-22 21:12:16.287986626 +0200 +++ /var/tmp/diff_new_pack.hTUp6x/_new 2020-09-22 21:12:16.291986629 +0200 @@ -36,16 +36,15 @@ [3.6.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-screensaver]) -+AC_CONFIG_MACRO_DIRS([m4]) ++AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/gnome-screensaver.c) AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar]) -@@ -33,7 +34,7 @@ GETTEXT_PACKAGE=gnome-screensaver +@@ -33,7 +34,6 @@ 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]) GLIB_GSETTINGS # Dependencies @@ -56,3 +55,29 @@ -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 ++++ b/src/Makefile.am +@@ -5,7 +5,7 @@ NULL = + + saverdir = $(libexecdir)/gnome-screensaver + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I. \ + -I$(srcdir) \ + $(GNOME_SCREENSAVER_CFLAGS) \ +-- + +diff --git a/Makefile.am b/Makefile.am +index 4aa0deb..f7cb628 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -53,3 +53,4 @@ MAINTAINERCLEANFILES = \ + + + -include $(top_srcdir)/git.mk ++ACLOCAL_AMFLAGS = -I m4 +--
