[thinkfan] Fix man pages and config file location (RHBZ#998110)

Matt Spaulding madsa at fedoraproject.org
Sun Aug 18 03:26:53 UTC 2013


commit b03cece29e1f848b8825778f033c3461b9abfeaa
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Sat Aug 17 20:26:18 2013 -0700

    Fix man pages and config file location (RHBZ#998110)

 thinkfan.spec |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/thinkfan.spec b/thinkfan.spec
index 1ad4858..f61774d 100644
--- a/thinkfan.spec
+++ b/thinkfan.spec
@@ -1,6 +1,6 @@
 Name:		thinkfan
 Version:	0.8.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A simple fan control program
 
 Group:		Applications/System
@@ -24,7 +24,10 @@ CPU power as possible.
 %setup -q
 
 # Make man page documentation UTF-8
-iconv -f ISO-8859-1 -t UTF-8 thinkfan.1 > thinkfan.1
+iconv -f ISO-8859-1 -t UTF-8 thinkfan.1 > thinkfan.1.new
+rm thinkfan.1
+mv thinkfan.1.new thinkfan.1
+
 
 %build
 CFLAGS="-ggdb" make %{?_smp_mflags}
@@ -36,8 +39,8 @@ install -d $RPM_BUILD_ROOT%{_unitdir}
 install -pm 0644 rcscripts/thinkfan.service $RPM_BUILD_ROOT%{_unitdir}
 
 # Install configuration file
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/thinkfan
-install -pm 0644 examples/thinkfan.conf.thinkpad $RPM_BUILD_ROOT%{_sysconfdir}/thinkfan/thinkfan.conf
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
+install -pm 0644 examples/thinkfan.conf.thinkpad $RPM_BUILD_ROOT%{_sysconfdir}/thinkfan.conf
 
 # Install modprobe configuration file
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
@@ -64,8 +67,7 @@ install -pm 0644 thinkfan.1 $RPM_BUILD_ROOT%{_mandir}/man1
 %files
 %{_sbindir}/thinkfan
 %{_unitdir}/thinkfan.service
-%dir %{_sysconfdir}/thinkfan
-%config(noreplace) %{_sysconfdir}/thinkfan/thinkfan.conf
+%config(noreplace) %{_sysconfdir}/thinkfan.conf
 %config(noreplace) %{_sysconfdir}/modprobe.d/thinkfan.conf
 %{_mandir}/man1/thinkfan.1.*
 %doc examples ChangeLog README NEWS COPYING
@@ -73,6 +75,10 @@ install -pm 0644 thinkfan.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 
 %changelog
+* Sat Aug 17 2013 Matt Spaulding <mspaulding06 at gmail.com> - 0.8.1-5
+- Fixed empty man pages
+- Fixed config in wrong location (RHBZ#998110)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list