From 9585be7a95b741bffd89b69c5aae61269995b67b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 12 Jul 2014 10:47:39 -0400 Subject: [PATCH 1/2] fix license handling --- file.spec | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/file.spec b/file.spec index b03f26f..6421814 100644 --- a/file.spec +++ b/file.spec @@ -4,7 +4,7 @@ Summary: A utility for determining file types Name: file Version: 5.19 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -149,13 +149,17 @@ cd %{py3dir} %postun libs -p /sbin/ldconfig %files -%doc COPYING ChangeLog README +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc ChangeLog README %{_bindir}/* %{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/magic %files libs -%doc COPYING ChangeLog README +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc ChangeLog README %{_libdir}/*so.* %{_datadir}/magic* %{_mandir}/man5/* @@ -168,7 +172,9 @@ cd %{py3dir} %{_mandir}/man3/* %files -n python-magic -%doc python/README COPYING python/example.py +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc python/README python/example.py %{python_sitelib}/magic.py %{python_sitelib}/magic.pyc %{python_sitelib}/magic.pyo @@ -178,7 +184,9 @@ cd %{py3dir} %if %{with_python3} %files -n python3-magic -%doc python/README COPYING python/example.py +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc python/README python/example.py %{python3_sitelib}/magic.py %{python3_sitelib}/*egg-info %{python3_sitelib}/__pycache__/magic*.pyc @@ -186,6 +194,9 @@ cd %{py3dir} %endif %changelog +* Sat Jul 12 2014 Tom Callaway - 5.19-2 +- fix license handling + * Wed Jun 25 2014 Jan Kaluza - 5.19-1 - fix #1011789 - update to version 5.19 From 30a7e5d94294cafff4a1721591b4828e8765e0bb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 12:22:42 +0000 Subject: [PATCH 2/2] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- file.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/file.spec b/file.spec index 6421814..4add616 100644 --- a/file.spec +++ b/file.spec @@ -4,7 +4,7 @@ Summary: A utility for determining file types Name: file Version: 5.19 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -194,6 +194,9 @@ cd %{py3dir} %endif %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 5.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jul 12 2014 Tom Callaway - 5.19-2 - fix license handling