[clutter-gtkmm] Fix doc packaging for UnversionedDocdirs (#993704)

[Michael Schwendt]

commit 68b71464ee1a99a5ba5bec210049fda990f42f90
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Mon Dec 23 13:20:22 2013 +0100

    Fix doc packaging for UnversionedDocdirs (#993704)
    
    - Add %?_isa to -devel base package dep
    - Remove %defattr

 clutter-gtkmm.spec |   43 +++++++++++++++++++++++++++++++------------
 1 files changed, 31 insertions(+), 12 deletions(-)
---
diff --git a/clutter-gtkmm.spec b/clutter-gtkmm.spec
index 4ffe0e8..e346689 100644
--- a/clutter-gtkmm.spec
+++ b/clutter-gtkmm.spec
@@ -1,7 +1,9 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Summary:	A basic gtkmm Clutter widget
 Name:		clutter-gtkmm
 Version:	0.91.8
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.gtkmm.org/
@@ -23,7 +25,7 @@ interfaces.
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	devhelp
 
 %description devel
@@ -39,7 +41,7 @@ sed --in-place \
 sed -i 's|gtkmm-2.4|gtkmm-3.0|g' ./configure
 
 %build
-%configure --disable-silent-rules --docdir=%{_docdir}/%{name}-%{version}
+%configure --disable-silent-rules
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -50,9 +52,19 @@ make %{?_smp_mflags}
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-1.0/reference .
+# adding to installed docs in order to avoid using %%doc magic
+mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
+for f in ChangeLog COPYING NEWS ; do
+    cp -p $f ${RPM_BUILD_ROOT}%{_pkgdocdir}
+done
+cp -p examples/redhand.png ${RPM_BUILD_ROOT}%{_pkgdocdir}
+cp -a examples/events ${RPM_BUILD_ROOT}%{_pkgdocdir}
+
+# move installed 'reference' to package-specific docdir,
+# but add a softlink from /usr/share/doc/clutter-gtkmm-1.0/reference
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-1.0/reference ${RPM_BUILD_ROOT}%{_pkgdocdir}
 pushd $RPM_BUILD_ROOT%{_docdir}/%{name}-1.0
-  ln -s ../%{name}-devel-%{version}/reference reference
+  ln -s $(find .. -name reference) reference
 popd
 
 %post -p /sbin/ldconfig
@@ -60,15 +72,17 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root, -)
-%doc ChangeLog COPYING NEWS
+# deliberately no %%doc usage here
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/ChangeLog
+%{_pkgdocdir}/COPYING
+%{_pkgdocdir}/NEWS
 %{_libdir}/libclutter-gtkmm-1.0.so.*
 
 %files devel
-%defattr(-, root, root, -)
-%doc examples/events
-%doc examples/redhand.png
-%doc reference
+%{_pkgdocdir}/reference/
+%{_pkgdocdir}/redhand.png
+%{_pkgdocdir}/events/
 %{_libdir}/libclutter-gtkmm-1.0.so
 %{_libdir}/pkgconfig/%{name}-1.0.pc
 %{_libdir}/%{name}-1.0
@@ -76,9 +90,14 @@ popd
 %{_includedir}/%{name}-1.0
 
 %dir %{_docdir}/%{name}-1.0
-%doc %{_docdir}/%{name}-1.0/reference
+%{_docdir}/%{name}-1.0/reference
 
 %changelog
+* Mon Dec 23 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.91.8-9
+- Fix doc packaging for UnversionedDocdirs (#993704)
+- Add %%?_isa to -devel base package dep
+- Remove %%defattr
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.91.8-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild