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 481aaec..0000000 Binary files a/add_manpage.patch and /dev/null differ 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 + +- Spec file cleanup. + ------------------------------------------------------------------- Tue Oct 5 10:01:33 UTC 2021 - Paolo Perego - 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}