Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hsetroot for openSUSE:Factory checked in at 2022-01-03 10:49:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hsetroot (Old) and /work/SRC/openSUSE:Factory/.hsetroot.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hsetroot" Mon Jan 3 10:49:26 2022 rev:2 rq:943339 version:1.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/hsetroot/hsetroot.changes 2021-10-06 19:49:47.108053895 +0200 +++ /work/SRC/openSUSE:Factory/.hsetroot.new.1896/hsetroot.changes 2022-01-03 10:50:00.603594018 +0100 @@ -1,0 +2,9 @@ +Fri Dec 31 16:51:38 UTC 2021 - Michal Suchanek <[email protected]> + +- Clean up build dependencies - make use of pkgconfig +- Refresh DESTDIR patch to upstream version + * add_destdir_support.patch +- Fix directory creation during installation + + hsetroot-Fix-installation.patch + +------------------------------------------------------------------- New: ---- hsetroot-Fix-installation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hsetroot.spec ++++++ --- /var/tmp/diff_new_pack.z1vlyC/_old 2022-01-03 10:50:02.019594560 +0100 +++ /var/tmp/diff_new_pack.z1vlyC/_new 2022-01-03 10:50:02.027594563 +0100 @@ -1,7 +1,7 @@ # # spec file for package hsetroot # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,18 +20,17 @@ Version: 1.0.5 Release: 0 Summary: Advanced wallpaper tool for X -License: GPL-2.0 +License: GPL-2.0-only Group: System/X11/Utilities -Url: https://github.com/himdel/hsetroot +URL: https://github.com/himdel/hsetroot Source: https://github.com/himdel/hsetroot/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: hsetroot.1 +Source1: %{name}.1 Patch0: add_destdir_support.patch -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: freetype2-devel -BuildRequires: imlib2-devel +Patch1: hsetroot-Fix-installation.patch BuildRequires: pkgconfig -BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(imlib2) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xinerama) Requires: imlib2-filters Requires: imlib2-loaders @@ -52,20 +51,21 @@ %prep %setup -q -%patch0 -p1 +%autopatch -p1 %build -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot}%{_bindir} install -install -p -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/hsetroot.1 - +export PREFIX=%{_prefix} +%make_install +install -p -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1 %files %{_bindir}/%{name} %{_bindir}/hsr-outputs %{_mandir}/man1/%{name}.1%{ext_man} +%license LICENSE %doc README.md %changelog ++++++ add_destdir_support.patch ++++++ --- /var/tmp/diff_new_pack.z1vlyC/_old 2022-01-03 10:50:02.055594574 +0100 +++ /var/tmp/diff_new_pack.z1vlyC/_new 2022-01-03 10:50:02.055594574 +0100 @@ -1,15 +1,38 @@ -diff --color -ruN hsetroot-1.0.5.ori/Makefile hsetroot-1.0.5/Makefile ---- hsetroot-1.0.5.ori/Makefile 2019-11-15 12:09:41.000000000 +0100 -+++ hsetroot-1.0.5/Makefile 2021-10-05 12:16:40.331730695 +0200 -@@ -30,8 +30,8 @@ +From 4d4cc8293c6b00c9b2977b3e71c526193a80ab44 Mon Sep 17 00:00:00 2001 +From: Jani Juhani Sinervo <[email protected]> +Date: Wed, 27 Oct 2021 16:05:20 +0300 +Subject: [PATCH] Add DESTDIR to help with packaging + +Git-commit: 4d4cc8293c6b00c9b2977b3e71c526193a80ab44 + +--- + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a1217d9..d485357 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,6 +5,7 @@ CFLAGS?=-g -O2 -Wall + LDFLAGS?= + + PREFIX?=/usr/local ++DESTDIR?= + + # arch hardening + #CPPFLAGS+=-D_FORTIFY_SOURCE=2 +@@ -34,8 +35,8 @@ hsetroot: hsetroot.o hsr-outputs: hsr-outputs.o install: hsetroot hsr-outputs - install -st $(PREFIX)/bin/ hsetroot - install -st $(PREFIX)/bin/ hsr-outputs -+ install -Dt $(DESTDIR) hsetroot -+ install -Dt $(DESTDIR) hsr-outputs ++ install -st $(DESTDIR)$(PREFIX)/bin/ hsetroot ++ install -st $(DESTDIR)$(PREFIX)/bin/ hsr-outputs clean: rm -f *.o hsetroot hsr-outputs +-- +2.33.1 + ++++++ hsetroot-Fix-installation.patch ++++++ >From 05c5920e69ae80e39c340b00400ae78b33515e85 Mon Sep 17 00:00:00 2001 From: Michal Suchanek <[email protected]> Date: Fri, 31 Dec 2021 17:22:22 +0100 Subject: [PATCH] Fix installation. [ 6s] + make install DESTDIR=/home/abuild/rpmbuild/BUILDROOT/hsetroot-1.0.4-0.x86_64 [ 6s] install -st /home/abuild/rpmbuild/BUILDROOT/hsetroot-1.0.4-0.x86_64/usr/bin/ hsetroot [ 6s] install: failed to access '/home/abuild/rpmbuild/BUILDROOT/hsetroot-1.0.4-0.x86_64/usr/bin/': No such file or directory Signed-off-by: Michal Suchanek <[email protected]> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d485357..9b682a3 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,8 @@ hsetroot: hsetroot.o hsr-outputs: hsr-outputs.o install: hsetroot hsr-outputs - install -st $(DESTDIR)$(PREFIX)/bin/ hsetroot - install -st $(DESTDIR)$(PREFIX)/bin/ hsr-outputs + install -Dst $(DESTDIR)$(PREFIX)/bin/ hsetroot + install -Dst $(DESTDIR)$(PREFIX)/bin/ hsr-outputs clean: rm -f *.o hsetroot hsr-outputs -- 2.33.1
