Fix -doc package for F20 UnversionedDocDirs (#993956)

- Add missing directory /usr/include/event2
- Fix directory ownership in -doc package
- Correct summary and description of -devel and -doc packages
- Set -doc package Group tag to "Documentation"
- Add %?_isa to -devel package base dependency
- Remove %defattr

libevent.spec

@@ -1,6 +1,12 @@
+%if 0%{fedora} && 0%{?fedora} >= 20
+%global develdocdir %{_docdir}/%{name}-devel
+%else
+%global develdocdir %{_docdir}/%{name}-devel-%{version}
+%endif
+
 Name:           libevent
 Version:        2.0.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Abstract asynchronous event notification library
 
 Group:          System Environment/Libraries
@@ -23,25 +29,21 @@ to call event_dispatch() and can then add or remove events dynamically
 without having to change the event loop.
 
 %package devel
-Summary: Header files, libraries and development documentation for %{name}
+Summary: Development files for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
-This package contains the header files, static libraries and development
-documentation for %{name}. If you like to develop programs using %{name},
-you will need to install %{name}-devel.
+This package contains the header files and libraries for developing
+with %{name}.
 
 %package doc
 Summary: Development documentation for %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Group: Documentation
 BuildArch: noarch
 
 %description doc
 This package contains the development documentation for %{name}.
-If you like to develop programs using %{name}-devel, you will
-need to install %{name}-doc.
 
 %prep
 %setup -q -n libevent-%{version}-stable
@@ -63,13 +65,13 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html
+mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/html
 (cd doxygen/html; \
-	install -p -m 644 *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html)
+	install -p -m 644 *.* $RPM_BUILD_ROOT/%{develdocdir}/html)
 
-mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample
+mkdir -p $RPM_BUILD_ROOT/%{develdocdir}/sample
 (cd sample; \
-	install -p -m 644 *.c Makefile* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample)
+	install -p -m 644 *.c Makefile* $RPM_BUILD_ROOT/%{develdocdir}/sample)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,7 +84,6 @@ make check
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc ChangeLog LICENSE README
 %{_libdir}/libevent-*.so.*
 %{_libdir}/libevent_core-*.so.*
@@ -91,12 +92,12 @@ make check
 %{_libdir}/libevent_pthreads-*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/event.h
 %{_includedir}/evdns.h
 %{_includedir}/evhttp.h
 %{_includedir}/evrpc.h
 %{_includedir}/evutil.h
+%dir %{_includedir}/event2
 %{_includedir}/event2/*.h
 %{_libdir}/libevent.so
 %{_libdir}/libevent_core.so
@@ -109,11 +110,18 @@ make check
 %{_bindir}/event_rpcgen.*
 
 %files doc
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-devel-%{version}/html/*
-%{_docdir}/%{name}-devel-%{version}/sample/*
+%{develdocdir}/
 
 %changelog
+* Sat Dec 21 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 2.0.21-4
+- Fix -doc package for F20 UnversionedDocDirs (#993956)
+- Add missing directory /usr/include/event2
+- Fix directory ownership in -doc package
+- Correct summary and description of -devel and -doc packages
+- Set -doc package Group tag to "Documentation"
+- Add %%?_isa to -devel package base dependency
+- Remove %%defattr
+
 * Wed Aug 21 2013 Steve Dickson <steved@redhat.com> 2.0.21-3
 - Removed rpmlint warnings