- use _gidocdir for apidocs

diff --git a/gdk-pixbuf2.spec b/gdk-pixbuf2.spec
index 11dd4e8d3046f52e65cdf8f02237299ce865d618..89acdefb4dd8c69fdab6f657f23670f9625d3fc1 100644 (file)
--- a/gdk-pixbuf2.spec
+++ b/gdk-pixbuf2.spec
@@ -26,7 +26,7 @@ BuildRequires:        ninja >= 1.5
 BuildRequires: perl-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.6
-BuildRequires: rpmbuild(macros) >= 1.752
+BuildRequires: rpmbuild(macros) >= 2.029
 BuildRequires: shared-mime-info
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
@@ -110,8 +110,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %ninja_install -j1 -C build
 
-install -d $RPM_BUILD_ROOT%{_gtkdocdir}
-
 %if "%{_lib}" != "lib"
 # We need to have 32-bit and 64-bit binaries as they have hardcoded LIBDIR.
 # (needed when multilib is used)
@@ -119,8 +117,8 @@ install -d $RPM_BUILD_ROOT%{_gtkdocdir}
 %endif
 
 %if %{with apidocs}
-# FIXME: better common place to package gi-docgen genrated docs?
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/doc/gdk-* $RPM_BUILD_ROOT%{_gtkdocdir}
+install -d $RPM_BUILD_ROOT%{_gidocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/gdk-* $RPM_BUILD_ROOT%{_gidocdir}
 %endif
 
 touch $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/%{abiver}/loaders.cache
@@ -183,6 +181,6 @@ fi
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gdk-pixbuf
-%{_gtkdocdir}/gdk-pixdata
+%{_gidocdir}/gdk-pixbuf
+%{_gidocdir}/gdk-pixdata
 %endif