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

[notifications at fedoraproject.org]

From bd53687891218827657660d2beec0098dd774b45 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Fri, 11 Jul 2014 16:17:33 -0400
Subject: fix license marking


diff --git a/bzip2.spec b/bzip2.spec
index 53408d2..71d0b12 100644
--- a/bzip2.spec
+++ b/bzip2.spec
@@ -3,7 +3,7 @@
 Summary: A file compression utility
 Name: bzip2
 Version: 1.0.6
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 Group: Applications/File
 URL: http://www.bzip.org/
@@ -99,11 +99,14 @@ ln -s bzgrep.1 $RPM_BUILD_ROOT%{_mandir}/man1/bzfgrep.1
 
 %files
 %doc LICENSE CHANGES README
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
 %{_bindir}/*
 %{_mandir}/*/*
 
 %files libs
-%doc LICENSE
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
 %{_libdir}/libbz2.so.1*
 
 %files devel
@@ -112,6 +115,9 @@ ln -s bzgrep.1 $RPM_BUILD_ROOT%{_mandir}/man1/bzfgrep.1
 %{_libdir}/*.so
 
 %changelog
+* Fri Jul 11 2014 Tom Callaway <spot at fedoraproject.org> - 1.0.6-13
+- fix license marking
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


From 6cd2475804cca6150f839e72d596bc2279072042 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Fri, 15 Aug 2014 23:20:10 +0000
Subject: - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild


diff --git a/bzip2.spec b/bzip2.spec
index 71d0b12..4504258 100644
--- a/bzip2.spec
+++ b/bzip2.spec
@@ -3,7 +3,7 @@
 Summary: A file compression utility
 Name: bzip2
 Version: 1.0.6
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: BSD
 Group: Applications/File
 URL: http://www.bzip.org/
@@ -115,6 +115,9 @@ ln -s bzgrep.1 $RPM_BUILD_ROOT%{_mandir}/man1/bzfgrep.1
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Fri Jul 11 2014 Tom Callaway <spot at fedoraproject.org> - 1.0.6-13
 - fix license marking
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/bzip2.git/commit/?h=master&id=5092358e40d4b18785fce0034de14748c5c82588