- python3 patch from Debian

[packages/GConf2.git] / GConf2.spec

diff --git a/GConf2.spec b/GConf2.spec
index 349fa55453c1eaefc0613bdc1e6341c82f82921f..3aba1d8114593ab15cc7bdf1326018ebe017aa8d 100644 (file)
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -2,6 +2,7 @@
 # - update documentation to follow changes introduced in Patch0
 #
 # Conditional build:
+%bcond_with    apidocs         # build apidocs (broken with new gtk-doc)
 %bcond_without static_libs     # don't build static libraries
 
 Summary:       GNOME2 configuration database system
@@ -10,7 +11,7 @@ Summary(pt_BR.UTF-8): Sistema de Configuração do GNOME 2
 Summary(ru.UTF-8):     Система конфигурации GNOME 2
 Name:          GConf2
 Version:       3.2.6
-Release:       6
+Release:       8
 License:       LGPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.xz
@@ -18,6 +19,7 @@ Source0:      http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.x
 Patch0:                %{name}-NO_MAJOR_VERSION.patch
 Patch1:                %{name}-reload.patch
 Patch2:                workaround-crash.patch
+Patch3:                python3.patch
 URL:           https://projects-old.gnome.org/gconf/
 BuildRequires: ORBit2-devel >= 1:2.14.9
 BuildRequires: autoconf >= 2.60
@@ -29,7 +31,7 @@ BuildRequires:        gettext-tools
 BuildRequires: glib2-devel >= 1:2.31.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gtk+3-devel >= 3.0.0
-BuildRequires: gtk-doc >= 1.8
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.8}
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 1:2.6.30
@@ -38,7 +40,7 @@ BuildRequires:        perl-base
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.92
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.527
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 Requires(post):        findutils
@@ -125,9 +127,7 @@ Summary:    GConf2 API documentation
 Summary(pl.UTF-8):     Dokumentacja API GConf2
 Group:         Documentation
 Requires:      gtk-doc-common
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description apidocs
 GConf2 API documentation.
@@ -175,9 +175,10 @@ automatycznie skonfigurowane do używania tych adresów.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
-%{__gtkdocize}
+%{?with_apidocs:%{__gtkdocize}}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -188,7 +189,7 @@ automatycznie skonfigurowane do używania tych adresów.
 %configure \
        --disable-silent-rules \
        %{!?with_static_libs:--disable-static} \
-       --enable-gtk-doc \
+       %{__enable_disable apidocs gtk-doc} \
        --with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -206,7 +207,10 @@ cp examples/*.schemas $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %find_lang %{name}
 
 # no *.{la,a} for modules - shut up check-files
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.a
+%endif
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libgconf-2.la
 
@@ -287,9 +291,11 @@ exit 0
 %{_libdir}/libgconf-2.a
 %endif
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gconf
+%endif
 
 %files examples
 %defattr(644,root,root,755)