jcapik pushed to diffutils (master). "Merge branch 'f21'"

[notifications at fedoraproject.org]

From 9f25f6e3a47ed1828312c2541e65e2852aeb5892 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Fri, 11 Jul 2014 17:46:09 -0400
Subject: fix license handling


diff --git a/diffutils.spec b/diffutils.spec
index 8e59ad4..828c79d 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -1,7 +1,7 @@
 Summary: A GNU collection of diff utilities
 Name: diffutils
 Version: 3.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/Text
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
@@ -78,12 +78,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING NEWS README
+%doc NEWS README
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %{_bindir}/*
 %{_mandir}/*/*
 %{_infodir}/diffutils.info*gz
 
 %changelog
+* Fri Jul 11 2014 Tom Callaway <spot at fedoraproject.org> - 3.3-8
+- fix license handling
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


From a33fe8d70cf55745128ec849582822b9da1fc9ae Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sat, 16 Aug 2014 02:50:17 +0000
Subject: - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild


diff --git a/diffutils.spec b/diffutils.spec
index 828c79d..c43dff5 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -1,7 +1,7 @@
 Summary: A GNU collection of diff utilities
 Name: diffutils
 Version: 3.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: Applications/Text
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/diffutils.info*gz
 
 %changelog
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Fri Jul 11 2014 Tom Callaway <spot at fedoraproject.org> - 3.3-8
 - fix license handling
 
-- 
cgit v0.10.2


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