- added apidocs bcond; cosmetics

Changed files:
    exo.spec -> 1.34

diff --git a/exo.spec b/exo.spec
index c78bc6e48dd4d44f52dfed778fb85386fd7a1268..cd84517e5e97e2217d0b57fcc8c2e272964049bb 100644 (file)
--- a/exo.spec
+++ b/exo.spec
@@ -1,5 +1,6 @@
 #
 # Conditional build:
 #
 # Conditional build:

+%bcond_without apidocs         # disable gtk-doc

 %bcond_without static_libs     # don't build static library
 #
 %define                xfce_version    4.6.0
 %bcond_without static_libs     # don't build static library
 #
 %define                xfce_version    4.6.0


@@ -18,7 +19,8 @@ BuildRequires:        autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel >= 2:2.10.6
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel >= 2:2.10.6

-BuildRequires: gtk-doc >= 1.7
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.7}
+BuildRequires: gtk-doc-automake

 BuildRequires: hal-devel >= 0.5.7
 BuildRequires: intltool >= 0.35.0
 BuildRequires: libnotify-devel >= 0.4.0
 BuildRequires: hal-devel >= 0.5.7
 BuildRequires: intltool >= 0.35.0
 BuildRequires: libnotify-devel >= 0.4.0


@@ -135,12 +137,13 @@ Pliki programistyczne wiązań Pythona do libexo.
 %{__automake}
 %{__autoconf}
 %configure \
 %{__automake}
 %{__autoconf}
 %configure \

+       --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \

        --enable-hal \
        --enable-hal \

-       --enable-gtk-doc \

        --enable-notifications \
        --enable-notifications \

+       --enable-python \

        --with-html-dir=%{_gtkdocdir} \
        --with-html-dir=%{_gtkdocdir} \

-       %{!?with_static_libs:--disable-static} \
-       --enable-python
+       %{!?with_static_libs:--disable-static}
+

 %{__make}
 
 %install
 %{__make}
 
 %install


@@ -154,6 +157,8 @@ mv $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,}
 
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/exo-0.3/*.{la,a}
 
 
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/exo-0.3/*.{la,a}
 

+%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/exo}
+

 %py_postclean
 
 %find_lang libexo-0.3
 %py_postclean
 
 %find_lang libexo-0.3


@@ -201,9 +206,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*/apps/applications-other.png
 %{_mandir}/man1/*.1*
 
 %{_iconsdir}/hicolor/*/apps/applications-other.png
 %{_mandir}/man1/*.1*
 

+%if %{with apidocs}

 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/exo
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/exo

+%endif

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)