From 3e073195a9fb645ac4ae2281c73a9e58487c6faf0a767829e29d1874115e95e7 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.com>
Date: Tue, 5 Oct 2021 16:38:09 +0000
Subject: [PATCH] - Spec file cleanup. - Remove upstreamed patches:   -
 hsetroot-1.0.2_01_fix-no-display-crash.patch   -
 hsetroot-1.0.2_02_extend-mode.patch   - hsetroot-1.0.2_03_cover-mode.patch  
 - hsetroot-1.0.2_04_link-to-X11.patch - Updated man page

OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/hsetroot?expand=0&rev=3
---
 add_destdir_support.patch |   4 ++--
 add_manpage.patch         | Bin 1198 -> 0 bytes
 hsetroot.changes          |  13 +++++++++++--
 hsetroot.spec             |  12 +-----------
 4 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 add_manpage.patch

diff --git a/add_destdir_support.patch b/add_destdir_support.patch
index 8bf7a75..29782c4 100644
--- a/add_destdir_support.patch
+++ b/add_destdir_support.patch
@@ -7,8 +7,8 @@ diff --color -ruN hsetroot-1.0.5.ori/Makefile hsetroot-1.0.5/Makefile
  install: hsetroot hsr-outputs
 -	install -st $(PREFIX)/bin/ hsetroot
 -	install -st $(PREFIX)/bin/ hsr-outputs
-+	install -st $(DESTDIR) hsetroot
-+	install -st $(DESTDIR) hsr-outputs
++	install -Dt $(DESTDIR) hsetroot
++	install -Dt $(DESTDIR) hsr-outputs
  
  clean:
  	rm -f *.o hsetroot hsr-outputs
diff --git a/add_manpage.patch b/add_manpage.patch
deleted file mode 100644
index 481aaecae26677b1b43010cdcca015386510b81f578ef773241feca982f6a1e6..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1198
zcmYevOiNSH)lJUN$uCmSEh_a(RLCe!Eh);+FVQvBGte{DhjH}`_0p@*B=vIhQ!>*s
zQ&Uh?ap~&nqNzkxz-ee{ZlG&m2t*17hE@g!K%{2?0}9#(h6V;)+S=M^hTyP{)5yTc
zP}dM>ps9kPiItI=m9deYnX!?PnWee01<*7jplJ>c3c3b51`67SI+h9!4qV#u-5eYh
zE-{Hr%m^PcObxxCf7?u;?s|OThhXj{hwd!T<!DmPjry%vm{576EscLm$)p_tDvm)L
z@9wWFUm|leS8dIQX3cxG^6!tAr|gS7uxQ8KHQ}py&m@-R&)ax=QS;C9;vfDk|Ea%O
zM_;U<zP5b!R=H+lwF8f>EfN?O`evLgRiCoy&?T>k)hU`yCRT^K_P-0~Kf39}CuxgC
zoAm=`trOlg>#(@Mx{sCf4&VP$ZMetY++|h&_M`1zKP7ICx!d39!OzrW$faGjRwsIa
z!<lo34}RHlI_Fx2%;V1=(!>hG-dQL9eUlp|&0ha(1J4C6ZMEPOQ&Wl4mK6b?I1esd
zcfs?n!($iKK=yjZdm51!_rGyzmfKc)LS?E;<!4`!5<S^VjH+t6>s^%0q?}G4Y@OE8
z+5Si)TCq}kx6TZ<o!ctU)QVnSrX|LD#%}Sl1h0st0`*JTa^*H1|Ml#n?DKCC>o@m0
z3odvaIw4Fk<WjUM-xRs|-5aLz{<x%=RiP}MD|6^x;7!>Xb~o&PY*$YG^!W&v_Vl3k
z)oUIc<Nx6IL)~xVcZ(xsYtCneELx?s$K=$G)o*sKQqYt1JZ|Pup{Lg>*`g=-Ed55X
zL5$p7wTe^s*e~zB(3^7novRa*MpESQd;3hv7JLx%j`Uumu&Y;Osnf$9N8~FG?v+aF
zU|gakvZm)Ulgr9E(-JH~R0Mg`jjmVZeetRB4wJYN^e{5gn@d|fHjAgaXNy&*&?NSW
z6K@0^_Pb#6+@52Z{lbi95xJ;?QQ<aP%@f@Wi;|}HFK6M>u6iY~EqrnHU2W5+_d55!
z`PEnAQ_7{S%=f*~=D+=?CZ3q2>V}<n4_~t=<9pQkX@zWNd-cSIIYGzf^I6aG%bT*`
zWtC==*@n<XHBufn(FeDuE%!g=uy^*E)9mf3(mO=%eAs<?_M<IN9r+%~mTX!0e#yam
zmSOozr2lST<!_r-`u(5Q?uEUY4f(B`SDZI+y*0aOsvEodAA^XwFMlrDvF_hO$Ckyt
zOFzXYTHV~@xcK{e!JccJU2Yc+f0VM4a(HOGinC(vlG<k*|G9L(H)a)bTu|=2^04Ky
zxd*l!JGp+!pYJQOm_j`-O3XC~<i0dLefr8xZ&!D^9iE_JpB1QN$E9s+8>oEz+{p>Y
zCh3dnT1|Q)zvsKJPRaUB&NWTz>hJ4>y;h2rnUiwvw3%+*Vv!f0YK}D*gyzK*mok<&
zty-FRkV`x0=KjD6KGq}-1_rJe1;2cSywviX%)C^E#1e(nycC7}G=;RxoK!9VUh@c*

diff --git a/hsetroot.changes b/hsetroot.changes
index bfff05a..a2d16fb 100644
--- a/hsetroot.changes
+++ b/hsetroot.changes
@@ -1,9 +1,18 @@
+-------------------------------------------------------------------
+Tue Oct  5 16:37:05 UTC 2021 - Michal Suchanek <msuchanek@suse.com>
+
+- Spec file cleanup.
+
 -------------------------------------------------------------------
 Tue Oct  5 10:01:33 UTC 2021 - Paolo Perego <paolo.perego@suse.com>
 
 - Package updated to 1.0.5
-- All patches were removed since included in upstream
-- Updated man page distributed via separate patch
+- Remove upstreamed patches:
+  - hsetroot-1.0.2_01_fix-no-display-crash.patch
+  - hsetroot-1.0.2_02_extend-mode.patch
+  - hsetroot-1.0.2_03_cover-mode.patch
+  - hsetroot-1.0.2_04_link-to-X11.patch
+- Updated man page
 
 -------------------------------------------------------------------
 Thu Sep  8 11:46:45 UTC 2016 - msuchanek@suse.de
diff --git a/hsetroot.spec b/hsetroot.spec
index 13c2437..3e8bbcb 100644
--- a/hsetroot.spec
+++ b/hsetroot.spec
@@ -19,12 +19,9 @@
 Name:           hsetroot
 Version:        1.0.5
 Release:        0
-#
 Summary:        Advanced wallpaper tool for X
-#
 License:        GPL-2.0
 Group:          System/X11/Utilities
-#
 Url:            http://thegraveyard.org/hsetroot.php
 Source:         %{name}-%{version}.tar.gz
 Source1:        hsetroot.1
@@ -37,8 +34,6 @@ BuildRequires:  pkgconfig
 BuildRequires:  xorg-x11-devel
 Requires:       imlib2-filters
 Requires:       imlib2-loaders
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 hsetroot is a tool which allows you to compose wallpapers ("root pixmaps") for
@@ -63,16 +58,11 @@ hsetroot also supports alpha-channels when rendering things.
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_bindir}/
-mkdir -p %{buildroot}%{_mandir}/man1/
-
 make DESTDIR=%{buildroot}%{_bindir} install
-cp %{SOURCE1} %{buildroot}%{_mandir}/man1/
+install -p -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/hsetroot.1
 
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_bindir}/hsr-outputs
 %{_mandir}/man1/%{name}.1%{ext_man}