commit e708577576cdb38006be860cad4bc680f8319860
Author: Elan Ruusamäe <[email protected]>
Date:   Sat Dec 22 20:18:58 2012 +0200

    apidoc fixes
    
    - fix apidocs building (set proper --with-html-dir)
    - add apidocs bcond and subpackage

 mate-desktop.spec | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index fe81fac..dfe2f4e 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -9,18 +9,18 @@
 # - devel: /usr/share/gtk-doc/html is needed by 
mate-desktop-devel-1.5.5-0.4.i686
 
 # Conditional build:
-%bcond_with    doc     # gtk doc. broken
+%bcond_without apidocs         # disable gtk-doc
 
 Summary:       Shared code for mate-panel, mate-session, mate-file-manager, etc
 Name:          mate-desktop
 Version:       1.5.5
-Release:       0.4
-URL:           http://mate-desktop.org
+Release:       0.6
 Source0:       
http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
 # Source0-md5: 683a8c3efcb5270cd215d9c856b0ced6
 Source1:       user-dirs-update-mate.desktop
 License:       GPLv2+ and LGPLv2+ and MIT
 Group:         X11/Applications
+URL:           http://mate-desktop.org/
 BuildRequires: desktop-file-utils
 BuildRequires: mate-common
 BuildRequires: pkgconfig(gsettings-desktop-schemas)
@@ -60,11 +60,23 @@ Requires:   %{name}-libs = %{version}-%{release}
 Libraries and header files for the MATE-internal private library
 libmatedesktop.
 
+%package apidocs
+Summary:       mate-desktop API documentation
+Summary(pl.UTF-8):     Dokumentacja API mate-desktop
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description apidocs
+mate-desktop API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API mate-desktop.
+
 %prep
 %setup -q
-NOCONFIGURE=1 ./autogen.sh
 
 %build
+NOCONFIGURE=1 ./autogen.sh
 %configure \
        --enable-gnucat \
        --disable-scrollkeeper \
@@ -72,7 +84,7 @@ NOCONFIGURE=1 ./autogen.sh
        --disable-schemas-compile \
        --with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids" \
        --enable-unique \
-       %{?with_doc:--enable-gtk-doc} \
+       %{?with_apidocs:--enable-gtk-doc --with-html-dir=%{_gtkdocdir}} \
        --with-omf-dir=%{_datadir}/omf/mate-desktop
 
 %{__make} \
@@ -186,7 +198,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-#%doc %{_datadir}/gtk-doc/html/mate-desktop
 %{_libdir}/libmate-desktop-2.so
 %{_pkgconfigdir}/mate-desktop-2.0.pc
 %{_includedir}/mate-desktop-2.0
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/mate-desktop
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-desktop.git/commitdiff/e708577576cdb38006be860cad4bc680f8319860

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to