jcapik pushed to sed (f22). "Merge branch 'f21'"

[notifications at fedoraproject.org]

From a96f2ea65a165097702226ecb4a28b99c8a722d0 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Mon, 4 Aug 2014 01:02:53 -0400
Subject: fix license handling


diff --git a/sed.spec b/sed.spec
index 87f6662..43a2d5d 100644
--- a/sed.spec
+++ b/sed.spec
@@ -6,7 +6,7 @@
 Summary: A GNU stream text editor
 Name: sed
 Version: 4.2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group: Applications/Text
 URL: http://sed.sourceforge.net/
@@ -65,12 +65,17 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc BUGS NEWS THANKS README AUTHORS sedfaq.txt.gz COPYING COPYING.DOC
+%{!?_licensedir:%global license %%doc}
+%license COPYING COPYING.DOC
+%doc BUGS NEWS THANKS README AUTHORS sedfaq.txt.gz
 %{_bindir}/sed
 %{_infodir}/*.info*
 %{_mandir}/man*/*
 
 %changelog
+* Mon Aug  4 2014 Tom Callaway <spot at fedoraproject.org> - 4.2.2-8
+- fix license handling
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


From f4a96edfc814288f6f1a889dbbebd31658d32692 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Mon, 18 Aug 2014 01:56:54 +0000
Subject: - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild


diff --git a/sed.spec b/sed.spec
index 43a2d5d..bebb5e5 100644
--- a/sed.spec
+++ b/sed.spec
@@ -6,7 +6,7 @@
 Summary: A GNU stream text editor
 Name: sed
 Version: 4.2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv3+
 Group: Applications/Text
 URL: http://sed.sourceforge.net/
@@ -73,6 +73,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Mon Aug  4 2014 Tom Callaway <spot at fedoraproject.org> - 4.2.2-8
 - fix license handling
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/sed.git/commit/?h=f22&id=634d9f6d0b20144bc53011e9e39005b00eb213ff