X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ORBit2.spec;h=35ea9c56b22820978de231292218a0dae30fca3e;hb=ec5805f9bde2495778b01150987d10a983c382ea;hp=d10adef0ce931245b711c98be0381e3625a05200;hpb=8cc9129baa4e55a67d9510a1acb1f153a3094baf;p=packages%2FORBit2.git

diff --git a/ORBit2.spec b/ORBit2.spec
index d10adef..35ea9c5 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -1,25 +1,31 @@
+#
+# Conditional build:
+%bcond_without	apidocs		# disable gtk-doc
+%bcond_without	static_libs	# don't build static library
+#
 Summary:	High-performance CORBA Object Request Broker
 Summary(fr.UTF-8):	Requète d'Objects CORBA
 Summary(pl.UTF-8):	Wysoko wydajny CORBA Object Request Broker
 Name:		ORBit2
-Version:	2.14.12
-Release:	1
+Version:	2.14.19
+Release:	2
 Epoch:		1
 License:	GPL v2+/LGPL v2+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
-# Source0-md5:	6f4bf7d803d442e9d093a0daa203d506
+# Source0-md5:	7082d317a9573ab338302243082d10d1
 Patch0:		%{name}-pthread.patch
-URL:		http://www.gnome.org/projects/ORBit2/
+URL:		http://projects.gnome.org/ORBit2/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.9
+BuildRequires:	docbook-dtd412-xml
 BuildRequires:	flex
 BuildRequires:	glib2-devel >= 1:2.14.1
-BuildRequires:	gtk-doc >= 1.8
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
 BuildRequires:	indent
 BuildRequires:	libIDL-devel >= 0.8.10
 BuildRequires:	libtool
-BuildRequires:	pkgconfig >= 1:0.14.0
+BuildRequires:	pkgconfig >= 1:0.18
 BuildRequires:	rpmbuild(macros) >= 1.197
 Requires:	glib2 >= 1:2.14.1
 Requires:	libIDL >= 0.8.10
@@ -122,8 +128,13 @@ skonsolidowanych statycznie używających technologii CORBA.
 %setup -q
 %patch0 -p1
 
+%if !%{with apidocs}
+echo 'EXTRA_DIST=' > gtk-doc.make
+echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
+%endif
+
 %build
-%{__gtkdocize}
+%{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -131,8 +142,8 @@ skonsolidowanych statycznie używających technologii CORBA.
 %{__automake}
 %configure \
 	--with-html-dir=%{_gtkdocdir} \
-	--enable-gtk-doc \
-	--enable-http
+	%{!?with_static_libs:--disable-static} \
+	%{?with_apidocs:--enable-gtk-doc}
 %{__make} -j1
 
 %install
@@ -167,9 +178,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/orbit-2.0/Everything_module.so
 %{_datadir}/idl/orbit-2.0
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/%{name}
+%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -189,8 +202,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/ORBit-imodule-2.0.pc
 %{_aclocaldir}/ORBit2.m4
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libORBit-2.a
 %{_libdir}/libORBit-imodule-2.a
 %{_libdir}/libORBitCosNaming-2.a
+%endif