[multitail] Update to 6.2.1.
Susi Lehtola
jussilehtola at fedoraproject.org
Tue Feb 18 09:36:33 UTC 2014
commit 05927e1b6a57ff8c8b528a4f08884634e4115b33
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date: Tue Feb 18 11:37:13 2014 +0200
Update to 6.2.1.
multitail.spec | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/multitail.spec b/multitail.spec
index dd5c6b8..957312e 100644
--- a/multitail.spec
+++ b/multitail.spec
@@ -1,18 +1,17 @@
Name: multitail
-Version: 6.0
+Version: 6.2.1
Release: 1%{?dist}
Summary: View one or multiple files like tail but with multiple windows
Group: Applications/Text
-# No license specified in source code, but GPLv2 COPYING attached.
-# According to Fedora policy license tag is
-License: GPL+
+# License GPLv2 specified in readme.txt
+License: GPLv2
URL: http://www.vanheusden.com/multitail/
Source: http://www.vanheusden.com/multitail/multitail-%{version}.tgz
-Patch0: Unversioned-doc-dir.patch
+Patch0: Unversioned-doc-dir.patch
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: ncurses-devel
-
# For unversioned doc dir
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -35,7 +34,7 @@ external software, MultiTail can mimic the functionality of tools like
%prep
%setup -q -n multitail-%{version}
-%patch0 -p1
+%patch0 -p1
%build
CFLAGS="%{optflags}" make %{?_smp_mflags}
@@ -53,25 +52,21 @@ chmod 644 convert-*.pl
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{_pkgdocdir}
-install -d -m0755 %{buildroot}%{_bindir} \
- %{buildroot}%{_mandir}/man1/ \
- %{buildroot}%{_sysconfdir} \
- %{buildroot}%{_pkgdocdir}
-make DESTDIR=%{buildroot} \
- DOCDIR=%{buildroot}%{_pkgdocdir} \
- install
-
+# Create necessary directories
+mkdir -p %{buildroot}/%{_pkgdocdir} %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1 %{buildroot}%{_sysconfdir} %{buildroot}%{_pkgdocdir}
+make DESTDIR=%{buildroot} DOCDIR=%{buildroot}%{_pkgdocdir} install
# move the configuration in the right place
-mv %{buildroot}%{_sysconfdir}/multitail.conf.new \
- %{buildroot}%{_sysconfdir}/multitail.conf
+mv %{buildroot}%{_sysconfdir}/multitail.conf{.new,}
# remove the examples (installed as docs)
rm %{buildroot}%{_sysconfdir}/multitail/colors-example.*
+%clean
+rm -rf %{buildroot}
%files
+%defattr(-,root,root,-)
%doc manual*.html Changes license.txt readme.txt colors-example.*
%config(noreplace) %{_sysconfdir}/multitail.conf
%{_sysconfdir}/multitail/
@@ -79,13 +74,17 @@ rm %{buildroot}%{_sysconfdir}/multitail/colors-example.*
%{_mandir}/man1/multitail.1*
%changelog
+* Tue Feb 18 2014 Susi Lehtola <jussilehtola at fedoraproject.org> - 6.2.1-1
+- Update to 6.2.1 (BZ #1064754).
+- Update license tag from GPL+ to GPLv2.
+- Revert "cleaning up" made in previous release to not break EPEL branches.
* Mon Dec 16 2013 Kashyap Chamarthy <kashyapc at fedoraproject.org> - 6.0-1
- New upstream release 6.0
Resolves: rhbz:1035637
- Add a patch to use unversioned doc dirs. Ref: http://fedoraproject.org/wiki/Changes/UnversionedDocdirs
- Remove BuildRoot tag.
-- Remove %clean section and remove the %defattr section from %files
+- Remove %%clean section and remove the %%defattr section from %%files
section.
* Fri Jul 26 2013 Susi Lehtola <jussilehtola at fedoraproject.org> - 5.2.13-1
More information about the scm-commits
mailing list