From 910f2e2b07f29b56c0edb59b20534739332e6c77 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Apr 01 2020 02:51:00 +0000
Subject: Clean up spec file, add missing link to Xft library.


---

diff --git a/slim.spec b/slim.spec
index 3a7e214..5ce95d4 100644
--- a/slim.spec
+++ b/slim.spec
@@ -1,10 +1,9 @@
-%global _hardened_build 1
-
 Name:           slim
 Version:        1.3.6
 Release:        16%{?dist}
 Summary:        Simple Login Manager
 License:        GPLv2+
+
 URL:            http://slim.berlios.de/
 Source0:        http://download.berlios.de/slim/%{name}-%{version}.tar.gz
 # stolen from xdm
@@ -17,6 +16,7 @@ Source4:        slim-fedora.txt
 Source5:        slim.logrotate.d
 Source6:        slim-tmpfiles.conf
 Source7:        slim.service
+
 # Fedora-specific patches
 Patch1:         slim-1.3.3-fedora.patch
 Patch2:         slim-1.3.2-selinux.patch
@@ -28,6 +28,7 @@ BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
 BuildRequires:  perl-generators
 BuildRequires:  pkgconfig gettext libselinux-devel pam-devel cmake
 BuildRequires:  xwd xterm freeglut-devel libXrandr-devel
+
 Requires:       xwd xterm /sbin/shutdown
 Requires:       %{_sysconfdir}/pam.d
 # we use 'include' in the pam file, so
@@ -38,9 +39,7 @@ Requires:       desktop-backgrounds-basic
 Provides:       service(graphical-login)
 
 BuildRequires:    systemd
-Requires(post):   systemd
-Requires(preun):  systemd
-Requires(postun): systemd
+BuildRequires:    systemd-rpm-macros
 
 %description
 SLiM (Simple Login Manager) is a graphical login manager for X11.
@@ -61,11 +60,12 @@ before launching slim.
 cp -p %{SOURCE4} README.Fedora
 
 %build
-CXXFLAGS="%{optflags}" cmake -DUSE_PAM=yes -DCMAKE_INSTALL_PREFIX=%{_prefix} .
-make %{?_smp_mflags}
+export LDFLAGS="%{optflags} -lXft"
+%cmake -DUSE_PAM=yes .
+%make_build
 
 %install
-make install DESTDIR=%{buildroot} INSTALL='install -p'
+%make_install
 install -p -m755 %{SOURCE2} %{buildroot}%{_bindir}/update_slim_wmlist
 install -p -m755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}-dynwm
 chmod 0644 %{buildroot}%{_sysconfdir}/%{name}.conf
@@ -78,9 +78,7 @@ ln -s ../../../backgrounds/tiles/default_blue.jpg %{buildroot}%{_datadir}/%{name
 # install logrotate entry
 install -m0644 -D %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
-%if 0%{?fedora} >= 15
 install -p -D %{SOURCE6} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
 
 mkdir -p %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/%{name}.service
@@ -94,18 +92,17 @@ rm %{buildroot}/lib/systemd/system/%{name}.service
 rm %{buildroot}/%{_libdir}/lib%{name}.so
 
 %post
-/sbin/ldconfig
 %systemd_post %{name}.service
 
 %preun
 %systemd_preun %{name}.service
 
 %postun
-/sbin/ldconfig
-%systemd_postun
+%systemd_postun %{name}.service
 
 %files
-%doc COPYING ChangeLog README* THEMES TODO
+%doc ChangeLog README* THEMES TODO
+%license COPYING
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/logrotate.d/%{name}
@@ -117,10 +114,8 @@ rm %{buildroot}/%{_libdir}/lib%{name}.so
 %{_datadir}/%{name}/themes/
 %{_unitdir}/%{name}.service
 %{_libdir}/lib%{name}.so.%{version}
-
-%if 0%{?fedora} >= 15
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
+
 
 %changelog
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org>