[e2fsprogs/f21] fix license handling

[Tom Callaway]

commit b0c6c845d9249e789247b18202326175f77fb368
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Sat Jul 12 10:32:37 2014 -0400

    fix license handling

 e2fsprogs.spec |   30 +++++++++++++++++++-----------
 sources        |    2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index b84407c..96bc3f0 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
-Version: 1.42.10
-Release: 5%{?dist}
+Version: 1.42.11
+Release: 2%{?dist}
 
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
@@ -11,8 +11,6 @@ Source1: ext2_types-wrapper.h
 Source2: e2fsck.conf
 
 Patch1: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch2: e2fsprogs-1.42.10-largefile.patch
-Patch3: e2fsprogs-1.42.10-quota-deps.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -152,8 +150,6 @@ It was originally inspired by the Multics SubSystem library.
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch1 -p1 -b .featurecheck
-%patch2 -p1
-%patch3 -p1
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
@@ -213,7 +209,9 @@ exit 0
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING README RELEASE-NOTES
+%doc README RELEASE-NOTES
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 
 %config(noreplace) /etc/mke2fs.conf
 %config(noreplace) /etc/e2fsck.conf
@@ -278,13 +276,15 @@ exit 0
 
 %files libs
 %defattr(-,root,root)
-%doc COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %{_libdir}/libe2p.so.*
 %{_libdir}/libext2fs.so.*
 
 %files static
 %defattr(-,root,root)
-%doc COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %{_libdir}/*.a
 
 %files devel
@@ -300,7 +300,8 @@ exit 0
 
 %files -n libcom_err
 %defattr(-,root,root)
-%doc COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %{_libdir}/libcom_err.so.*
 
 %files -n libcom_err-devel
@@ -316,7 +317,8 @@ exit 0
 
 %files -n libss
 %defattr(-,root,root)
-%doc COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %{_libdir}/libss.so.*
 
 %files -n libss-devel
@@ -329,6 +331,12 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
+* Sat Jul 12 2014 Tom Callaway <spot at fedoraproject.org> 1.42.11-2
+- fix license handling
+
+* Fri Jul 11 2014 Eric Sandeen <sandeen at redhat.com> 1.42.11-1
+- New upstream release
+
 * Tue Jul 01 2014 Dan Horák <dan at danny.cz> - 1.42.10-5
 - Rebuilt for buggy rpm 4.12 alpha -
   https://lists.fedoraproject.org/pipermail/devel/2014-June/200633.html
diff --git a/sources b/sources
index 481a9cb..7c8af55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eace3779a1ddc2a0d7886061ef8eade9  e2fsprogs-1.42.10.tar.xz
+cc267f88eaedf81709b144d1fe722f8c  e2fsprogs-1.42.11.tar.xz