[packages/mate-conf: 2/2] Merge branch 'master' of git://git.pld-linux.org/packages/mate-conf

[qboosh]

commit 271208aabb3bdc3ed7bc82538a30054a2e647713
Merge: adaf8d9 e96f431
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 14 21:12:37 2013 +0100

    Merge branch 'master' of git://git.pld-linux.org/packages/mate-conf
    
    Conflicts:
    	mate-conf.spec

 mate-conf.spec | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 13 deletions(-)
---
diff --cc mate-conf.spec
index b39c9e2,144662f..eca801a
--- a/mate-conf.spec
+++ b/mate-conf.spec
@@@ -1,7 -1,10 +1,11 @@@
  #
  # Conditional build:
- %bcond_with	gtk3	# use GTK+ 3.x instead of 2.x
- #
+ %bcond_without	apidocs		# disable gtk-doc
 -%bcond_without	gtk			# disable GTK
++%bcond_without	gtk		# disable GTK at all
++%bcond_with	gtk3		# use GTK+ 3.x instead of 2.x
+ %bcond_without	ldap		# without Evolution Data Sources LDAP backend
+ %bcond_without	static_libs	# don't build static libraries
+ 
  Summary:	MateConf configuration database system
  Summary(pl.UTF-8):	MateConf - system bazy danych konfiguracji
  Name:		mate-conf
@@@ -19,22 -22,20 +23,26 @@@ BuildRequires:	dbus-glib-devel >= 0.7
  BuildRequires:	gettext-devel
  BuildRequires:	glib2-devel >= 1:2.26.0
  BuildRequires:	gobject-introspection-devel >= 0.9.5
- BuildRequires:	gtk-doc >= 1.0
- # does MATE allow gtk+3 everywhere?
+ %{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
+ BuildRequires:	rpmbuild(macros) >= 1.527
 -# does MATE allow gtk+3 everywhere?
 -BuildRequires:	gtk+2-devel >= 2:2.14.0
++%if %{with gtk}
 +%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.14.0}
 +%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
++%endif
  BuildRequires:	intltool >= 0.35.0
- BuildRequires:	libxml2-devel >= 2.0
  BuildRequires:	libtool
+ BuildRequires:	libxml2-devel >= 2.0
  BuildRequires:	mate-corba-devel
- BuildRequires:	openldap-devel
+ %{?with_ldap:BuildRequires:	openldap-devel}
  BuildRequires:	pkgconfig
  BuildRequires:	polkit-devel
  BuildRequires:	tar >= 1:1.22
  BuildRequires:	xz
  Requires:	%{name}-libs = %{version}-%{release}
++%if %{with gtk}
 +%{!?with_gtk3:Requires:	gtk+2 >= 2:2.14.0}
 +%{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
++%endif
  BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
  %description
@@@ -132,7 -130,14 +140,14 @@@ automatycznie skonfigurowane do używan
  %{__autoheader}
  %{__automake}
  %configure \
- 	--with-html-dir=%{_gtkdocdir}
+ 	--enable-defaults-service \
+ 	--enable-gsettings-backend=yes \
 -	%{?with_gtk:--enable-gtk --with-gtk=2.0} \
++	%{?with_gtk:--enable-gtk %{?with_gtk3:--with-gtk=3.0}} \
+ 	%{?with_apidocs:--enable-gtk-doc --with-html-dir=%{_gtkdocdir}} \
+ 	--enable-introspection \
+ 	%{__with_without ldap openldap} \
+ 	%{__disable static_libs static} \
+ 	%{nil}
  %{__make}
  
  %install
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-conf.git/commitdiff/271208aabb3bdc3ed7bc82538a30054a2e647713