diff --git a/.gitignore b/.gitignore index 7a769e6..b8feb8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /thinkfan-0.8.1.tar.gz +/thinkfan-0.9.2.tar.gz diff --git a/sources b/sources index 2abc1a3..a29f2d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aaa6c88bab3b43756ac5a1638622828c thinkfan-0.8.1.tar.gz +4292633aebd61b91f04cd332c4d3e181 thinkfan-0.9.2.tar.gz diff --git a/thinkfan.spec b/thinkfan.spec index 5637fde..777f246 100644 --- a/thinkfan.spec +++ b/thinkfan.spec @@ -1,6 +1,6 @@ Name: thinkfan -Version: 0.8.1 -Release: 7%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: A simple fan control program Group: Applications/System @@ -9,6 +9,7 @@ URL: http://thinkfan.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: thinkfan.modprobe +BuildRequires: cmake BuildRequires: systemd-units Requires(post): systemd-units Requires(preun): systemd-units @@ -21,7 +22,7 @@ CPU power as possible. %prep -%setup -q +%setup -q -c # Make man page documentation UTF-8 iconv -f ISO-8859-1 -t UTF-8 thinkfan.1 > thinkfan.1.new @@ -30,17 +31,20 @@ mv thinkfan.1.new thinkfan.1 %build -CFLAGS="-ggdb" make %{?_smp_mflags} +%cmake +make %install +make install DESTDIR=%{buildroot} + # Install unit file 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} -install -pm 0644 examples/thinkfan.conf.thinkpad $RPM_BUILD_ROOT%{_sysconfdir}/thinkfan.conf +install -pm 0644 examples/thinkfan.conf.simple $RPM_BUILD_ROOT%{_sysconfdir}/thinkfan.conf # Install modprobe configuration file install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d @@ -70,11 +74,14 @@ install -pm 0644 thinkfan.1 $RPM_BUILD_ROOT%{_mandir}/man1 %config(noreplace) %{_sysconfdir}/thinkfan.conf %config(noreplace) %{_sysconfdir}/modprobe.d/thinkfan.conf %{_mandir}/man1/thinkfan.1.* -%doc examples ChangeLog README NEWS COPYING +%doc README NEWS COPYING %changelog +* Sun Dec 07 2014 Matt Spaulding - 0.9.2-1 +- Update to latest upstream version + * Mon Aug 18 2014 Fedora Release Engineering - 0.8.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild