Author: djurban Date: Wed Feb 1 13:47:06 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- first steps to separate automake definitions from ORBit2
- release 2, new subpackage - automake
- no ac/am regeneration when built without apidocs, stupid gnomish buildsystem
doesnt want to regenerate here (strange as it worked in pango)
---- Files affected:
SPECS:
ORBit2.spec (1.85 -> 1.86)
---- Diffs:
================================================================
Index: SPECS/ORBit2.spec
diff -u SPECS/ORBit2.spec:1.85 SPECS/ORBit2.spec:1.86
--- SPECS/ORBit2.spec:1.85 Mon Jan 23 16:08:55 2006
+++ SPECS/ORBit2.spec Wed Feb 1 14:47:00 2006
@@ -1,10 +1,11 @@
# $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
Name: ORBit2
Version: 2.12.4
-Release: 1
+Release: 2
Epoch: 1
License: GPL v2+/LGPL v2+
Group: Libraries
@@ -17,7 +18,11 @@
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
@@ -109,21 +114,37 @@
Ten pakiet zawiera biblioteki statyczne potrzebne do pisania programów
skonsolidowanych statycznie używających technologii CORBA.
+%package automake
+Summary: Automake macros for ORBit2
+Summary(pl): Makra dla automake do ORBit2
+Group: Development/Tools
+Requires: automake
+Conflicts: ORBit2-devel < 1:2.12.4-2
+
+%description automake
+Automake macros for ORBit2.
+
+%description automake -l pl
+Makra dla automake do ORBit2.
+
%prep
%setup -q
%patch0 -p1
%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-html-dir=%{_gtkdocdir} \
- --enable-gtk-doc \
+ %{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
+ --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
--enable-http
%{__make}
@@ -163,8 +184,7 @@
%{_libdir}/libname-server-2.a
%{_pkgconfigdir}/*.pc
%{_includedir}/orbit-*
-%{_aclocaldir}/*
-%{_gtkdocdir}/%{name}
+%{?with_apidocs:%{_gtkdocdir}/%{name}}
%files static
%defattr(644,root,root,755)
@@ -172,12 +192,23 @@
%{_libdir}/libORBit-imodule-2.a
%{_libdir}/libORBitCosNaming-2.a
+%files automake
+%defattr(644,root,root,755)
+%{_aclocaldir}/*
+
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.86 2006/02/01 13:47:00 djurban
+- first steps to separate automake definitions from ORBit2
+- release 2, new subpackage - automake
+- no ac/am regeneration when built without apidocs, stupid gnomish buildsystem
+ doesnt want to regenerate here (strange as it worked in pango)
+
Revision 1.85 2006/01/23 15:08:55 qboosh
- current policy is not to R: pkgconfig just because package has pkgconfig
support
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ORBit2.spec?r1=1.85&r2=1.86&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
