Accepting request 761208 from home:embar-:branches:Base:System

- Clean-up.

OBS-URL: https://build.opensuse.org/request/show/761208
OBS-URL: https://build.opensuse.org/package/show/Base:System/earlyoom?expand=0&rev=2

earlyoom.spec

@@ -1,51 +1,52 @@
-%define realname earlyoom
-%define srcext   tar.bz2
+#
+# spec file for package earlyoom
+#
+# Copyright (c) 2020 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
-%if 0%{?suse_version} >= 1230 || 0%{?rhel} >= 7
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+%if 0%{?suse_version} >= 1230
 %bcond_without systemd
 %else
 %bcond_with systemd
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} == 6
-%bcond_without upstart
-%else
-%bcond_with upstart
-%endif
-
-%if ! 0%{?_fillupdir:1}
-%global _fillupdir /var/adm/fillup-templates
-%endif
-
 %global rpm_version %(rpm -q --qf %%{version} rpm)
-
+%if ! 0%{?_fillupdir:1}
+%global _fillupdir %{_localstatedir}/adm/fillup-templates
+%endif
 # Common info
-Name:          %{realname}
-Version:       0
-Release:       wiz%{?extraver:0.}1%{?dist}
-License:       MIT
-Group:         System/Daemons
-URL:           https://github.com/rfjakob/earlyoom
-Summary:       Early OOM Daemon for Linux
-
-# Install-time parameters
-Conflicts:     oomd
-%if %{lua:print(rpm.vercmp(rpm.expand('%rpm_version'), '4.13'))} >= 0
-Recommends:    libnotify%{?suse_version:-tools}
-%endif
-Requires(post): insserv-compat
-
+Name:           earlyoom
+Version:        1.3
+Release:        0%{?extraver:0.}1%{?dist}
+Summary:        Early OOM Daemon for Linux
+License:        MIT
+Group:          System/Daemons
+URL:            https://github.com/rfjakob/earlyoom
+Source0:        %{name}-%{version}.tar.bz2
+Source11:       earlyoom.sysconfig
+Source12:       earlyoom.init
 # Build-time parameters
-BuildRequires: pandoc
-%if %{with systemd}
-BuildRequires: pkgconfig(systemd)
+BuildRequires:  pandoc
+Requires(post): insserv-compat
+# Install-time parameters
+Conflicts:      oomd
+%if %{lua:print(rpm.vercmp(rpm.expand('%{rpm_version}'), '4.13'))} >= 0
+Recommends:     libnotify%{?suse_version:-tools}
+%endif
+%if %{with systemd}
+BuildRequires:  pkgconfig(systemd)
 %endif
-BuildRoot:     %{_tmppath}/%{name}-root
-ExclusiveOS:   Linux
-Source0:       %{realname}-%{version}.%{srcext}
-Source11:      earlyoom.sysconfig
-Source12:      earlyoom.init
-Source13:      earlyoom.upstart
 
 %description
 earlyoom checks the amount of available memory and free swap, and if both are
@@ -53,70 +54,49 @@ below critical level, it will kill the largest process (highest oom_score).
 
 # Preparation step (unpackung and patching if necessary)
 %prep
-%setup -q -n %{realname}-%{version}%{?extraver}
+%setup -q -n %{name}-%{version}%{?extraver}
 # Fix defaults file location
-%{__sed} -i 's|/default/|/sysconfig/|' earlyoom.service.in
+sed -i 's|/default/|/sysconfig/|' earlyoom.service.in
 # CentOS' gzip does not have option `-k`
-%{__sed} -i 's|gzip -f -k.*$|gzip -c $< > $@|' Makefile
+sed -i 's|gzip -f -k.*$|gzip -c $< > $@|' Makefile
 # Fix LDFLAGS handling
-%{__sed} -ri '/LDFLAGS/ s|$| -lrt|' Makefile
+sed -ri '/LDFLAGS/ s|$| -lrt|' Makefile
 
 # Build step (compile/build binaries, documentation, etc)
 %build
 _CFLAGS='%{optflags} %{?gcc_lto} -Wall -Wextra -DVERSION=\"%{version}\" -fstack-protector-all -std=gnu99'
 _LDFLAGS='-Wl,--as-needed -Wl,--strip-all %{?gcc_lto}'
-%{__make} %{?_smp_mflags} \
+make %{?_smp_mflags} \
   CFLAGS="$_CFLAGS" \
   LDFLAGS="$_LDFLAGS"
 
 # Install built stuff
 %install
-%{__make} install DESTDIR=%{buildroot} \
+make install DESTDIR=%{buildroot} \
 %if %{with systemd}
   SYSTEMDUNITDIR=%{_unitdir} \
 %endif
-  PREFIX=%{_prefix}
-%if 0%{?suse_version}
-%{__install} -D -m644 %{S:11} %{buildroot}%{_fillupdir}/sysconfig.%{name}
-%else
-%{__install} -D -m644 %{S:11} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-%endif
+PREFIX=%{_prefix}
+install -D -m644 %{SOURCE11} %{buildroot}%{_fillupdir}/sysconfig.%{name}
 %if ! %{with systemd}
-%if %{with upstart}
-%{__install} -D -m644 %{S:13} %{buildroot}%{_sysconfdir}/init/%{name}
-%else
-%{__install} -D -m755 %{S:12} %{buildroot}%{_initrddir}/%{name}
+install -D -m755 %{SOURCE12} %{buildroot}%{_initddir}/%{name}
 %endif
-%endif
-
-# Cleanup
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
 
 # Files list
 %files
-%defattr(-,root,root)
-%doc LICENSE MANPAGE.md README.md
+%license LICENSE
+%doc MANPAGE.md README.md
 %{_bindir}/earlyoom
 %if %{with systemd}
 %{_unitdir}/%{name}.service
 %else
-%if %{with upstart}
-%{_sysconfdir}/init/%{name}
-%else
-%{_initrddir}/%{name}
-%endif
+%{_initddir}/%{name}
 %exclude %{_sysconfdir}/systemd/system/earlyoom.service
 %endif
 %exclude %{_sysconfdir}/default/earlyoom
-%if 0%{?suse_version}
 %{_fillupdir}/sysconfig.%{name}
-%else
-%{_sysconfdir}/sysconfig/%{name}
-%endif
-%doc %{_mandir}/man1/earlyoom.1*
+%{_mandir}/man1/earlyoom.1%{?ext_man}
 
-%if 0%{?suse_version}
 
 %if 0%{?_unitdir:1}
 %pre
@@ -144,7 +124,6 @@ _LDFLAGS='-Wl,--as-needed -Wl,--strip-all %{?gcc_lto}'
 %else
 %{restart_on_update %{name}}
 %endif
-%{insserv_cleanup}
+%insserv_cleanup
 
-%endif
 %changelog