hobbes1069 pushed to flrig (master). "Use license macro where appropriate."

notifications at fedoraproject.org notifications at fedoraproject.org
Thu May 7 19:41:42 UTC 2015


From b07e9e08b3d18c16129b8793ee285993d8e7b88c Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Thu, 7 May 2015 14:38:19 -0500
Subject: Use license macro where appropriate.


diff --git a/flrig.spec b/flrig.spec
index a53a683..9bf83ac 100644
--- a/flrig.spec
+++ b/flrig.spec
@@ -25,6 +25,9 @@ available for the transceiver in use.
 %prep
 %setup -q
 
+# Remove bundled xmlrpc library.
+rm -rf src/xmlrpcpp
+
 
 %build
 %configure
@@ -38,7 +41,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %files
-%doc AUTHORS ChangeLog COPYING README
+%if 0%{?rhel} || 0%{?fedora} < 21
+%doc COPYING
+%else
+%license COPYING
+%endif
+%doc AUTHORS ChangeLog README
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
@@ -48,6 +56,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 * Tue May  5 2015 Richard Shaw <hobbes1069 at gmail.com> - 1.3.22-1
 - Update to latest upstream release.
 - Build with external xmlrpc library.
+- Update spec to use license macro where appropriate.
 
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 1.3.21-2
 - Rebuilt for GCC 5 C++11 ABI change
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/flrig.git/commit/?h=master&id=b07e9e08b3d18c16129b8793ee285993d8e7b88c


More information about the scm-commits mailing list