[multitail] Update to 5.2.13 with fixed license tag.
Susi Lehtola
jussilehtola at fedoraproject.org
Fri Jul 26 16:58:48 UTC 2013
commit 451f3f7733eb063b979c6f4d272fd0c00391c304
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date: Fri Jul 26 19:58:36 2013 +0300
Update to 5.2.13 with fixed license tag.
multitail.spec | 31 ++++++++++++++++++++-----------
sources | 2 +-
2 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/multitail.spec b/multitail.spec
index 2d5c2e1..d39c956 100644
--- a/multitail.spec
+++ b/multitail.spec
@@ -1,10 +1,12 @@
Name: multitail
-Version: 5.2.12
+Version: 5.2.13
Release: 1%{?dist}
Summary: View one or multiple files like tail but with multiple windows
Group: Applications/Text
-License: GPLv2
+# No license specified in source code, but GPLv2 COPYING attached.
+# According to Fedora policy license tag is
+License: GPL+
URL: http://www.vanheusden.com/multitail/
Source: http://www.vanheusden.com/multitail/multitail-%{version}.tgz
@@ -34,13 +36,14 @@ external software, MultiTail can mimic the functionality of tools like
%setup -q -n multitail-%{version}
%build
-CFLAGS="%{optflags}" %{__make} %{?_smp_mflags}
+CFLAGS="%{optflags}" make %{?_smp_mflags}
# Fix up doc encoding
-iconv -f ISO88592 -t UTF8 < Changes > Changes.UTF8
-mv Changes.UTF8 Changes
-iconv -f ISO88592 -t UTF8 < readme.txt > readme.txt.UTF8
-mv readme.txt.UTF8 readme.txt
+for f in Changes readme.txt; do
+ iconv -f ISO88592 -t UTF8 < $f > $f.utf8 && \
+ touch -r $f $f.utf8 && \
+ mv $f.utf8 $f
+done
# Fix up examples permissions
chmod 644 colors-example.*
@@ -59,19 +62,25 @@ mv %{buildroot}%{_sysconfdir}/multitail.conf.new \
# remove the examples (installed as docs)
rm %{buildroot}%{_sysconfdir}/multitail/colors-example.*
-rm %{buildroot}%{_sysconfdir}/multitail/convert-*.pl
%clean
rm -rf %{buildroot}
%files
-%defattr(-, root, root, 0755)
-%doc *.conf *.html Changes license.txt readme.txt colors-example.* convert-*.pl
+%defattr(-, root, root, -)
+%doc manual*.html Changes license.txt readme.txt colors-example.*
%config(noreplace) %{_sysconfdir}/multitail.conf
+%{_sysconfdir}/multitail/
%{_bindir}/multitail
%{_mandir}/man1/multitail.1*
%changelog
+* Fri Jul 26 2013 Susi Lehtola <jussilehtola at fedoraproject.org> - 5.2.13-1
+- Keep the conversion scripts in %%{_sysconfdir}, as they may be
+ called by the configuration (see multitail.conf).
+- Update to 5.2.13.
+- Fixed license tag.
+
* Tue Feb 26 2013 Fabio M. Di Nitto <fdinitto at redhat.com> - 5.2.12-1
- New upstream release
Resolves: rhbz#915221
@@ -85,7 +94,7 @@ rm -rf %{buildroot}
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-* Mon Jun 2 2011 Kashyap Chamarthy <kashyapc at fedoraproject.org> - 5.2.8-1
+* Thu Jun 2 2011 Kashyap Chamarthy <kashyapc at fedoraproject.org> - 5.2.8-1
- New upstream release 5.2.8
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.6-2
diff --git a/sources b/sources
index b3a6527..7dbdda5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15fc4a54778327192b0b5f1c0005a1b3 multitail-5.2.12.tgz
+71a774b6d6bb430672c8a9252baac6e6 multitail-5.2.13.tgz
More information about the scm-commits
mailing list