Author: djurban Date: Wed Feb 1 17:30:21 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add automake br in devel, remove without apidocs backend as i'd have to break
half
of the configure.ac.
---- Files affected:
SPECS:
ORBit2.spec (1.86 -> 1.87)
---- Diffs:
================================================================
Index: SPECS/ORBit2.spec
diff -u SPECS/ORBit2.spec:1.86 SPECS/ORBit2.spec:1.87
--- SPECS/ORBit2.spec:1.86 Wed Feb 1 14:47:00 2006
+++ SPECS/ORBit2.spec Wed Feb 1 18:30:16 2006
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-%bcond_without apidocs # disable gtk-doc
Summary: High-performance CORBA Object Request Broker
Summary(fr): Requčte d'Objects CORBA
Summary(pl): Wysoko wydajny CORBA Object Request Broker
@@ -18,11 +17,7 @@
BuildRequires: automake
BuildRequires: flex
BuildRequires: glib2-devel >= 1:2.6.3
-%if %{with apidocs}
BuildRequires: gtk-doc >= 1.3
-%else
-BuildRequires: gtk-doc-automake
-%endif
BuildRequires: indent
BuildRequires: libIDL-devel >= 0.8.5
BuildRequires: libtool
@@ -65,6 +60,7 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: glib2-devel >= 1:2.6.3
Requires: indent
+Requires: %{name}-automake = %{epoch}:%{version}-%{release}
Requires: libIDL-devel >= 0.8.5
Provides: linc-devel = 1.1.1
Obsoletes: libORBit2_0-devel
@@ -133,18 +129,16 @@
%patch1 -p1
%build
-# workaround a bug that prevents regenaration without gtk-doc, will need to
fix it one day
-%if %{with apidocs}
%{__gtkdocize}
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
-%endif
+
%configure \
- %{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
- --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
+ --with-html-dir=%{_gtkdocdir} \
+ --enable-gtk-doc \
--enable-http
%{__make}
@@ -184,7 +178,7 @@
%{_libdir}/libname-server-2.a
%{_pkgconfigdir}/*.pc
%{_includedir}/orbit-*
-%{?with_apidocs:%{_gtkdocdir}/%{name}}
+%{_gtkdocdir}/%{name}
%files static
%defattr(644,root,root,755)
@@ -203,6 +197,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.87 2006/02/01 17:30:16 djurban
+- add automake br in devel, remove without apidocs backend as i'd have to
break half
+ of the configure.ac.
+
Revision 1.86 2006/02/01 13:47:00 djurban
- first steps to separate automake definitions from ORBit2
- release 2, new subpackage - automake
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ORBit2.spec?r1=1.86&r2=1.87&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
