X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ORBit2.spec;h=f4ee2e2bec1e2faef6fa637a58947c4ea2692b93;hb=ea09590d6b8b5ac63379e78b424f2819197e683c;hp=8c1f860f4d20516d46a37dd15dcab1309105448a;hpb=fe4a73e888de5888ede9e51a55b6e1c175bce8de;p=packages%2FORBit2.git

diff --git a/ORBit2.spec b/ORBit2.spec
index 8c1f860..f4ee2e2 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,27 +2,35 @@ 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.7.1
-Release:	1
+Version:	2.12.2
+Release:	2
 Epoch:		1
-License:	GPL/LGPL
+License:	GPL v2+/LGPL v2+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.7/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-am.patch
-Patch1:		%{name}-ac_fix.patch
-Patch2:		%{name}-pthread.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.12/%{name}-%{version}.tar.bz2
+# Source0-md5:	7f963dcd0d84e6854460449383cc8c70
+Patch0:		%{name}-pthread.patch
+Patch1:		%{name}-popt.patch
 URL:		http://www.labs.redhat.com/orbit/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.12
 BuildRequires:	automake
 BuildRequires:	flex
-BuildRequires:	glib2-devel >= 2.0.6
+BuildRequires:	glib2-devel >= 1:2.6.3
+BuildRequires:	gtk-doc >= 1.3
 BuildRequires:	indent
-BuildRequires:	libIDL-devel >= 0.8.0
+BuildRequires:	libIDL-devel >= 0.8.5
 BuildRequires:	libtool
-BuildRequires:	linc-devel >= 1.1.1
-BuildRequires:	popt-devel
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires:	pkgconfig >= 1:0.14.0
+BuildRequires:	popt-devel >= 1.5
+BuildRequires:	rpmbuild(macros) >= 1.197
+Requires:	glib2 >= 1:2.6.3
+Requires:	libIDL >= 0.8.5
+Requires:	popt >= 1.5
+Provides:	linc = 1.1.1
 Obsoletes:	libORBit2_0
+Obsoletes:	linc
+Conflicts:	libbonobo < 2.3.2
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker
@@ -48,15 +56,15 @@ Summary:	Header files, and utilities for ORBit
 Summary(fr):	Librairies statiques et fichiers entête pour ORBit
 Summary(pl):	Pliki nag³ówkowe i u¿ytki dla ORBit
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
-Requires:	glib2-devel >= 2.0.0
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib2-devel >= 1:2.6.3
 Requires:	indent
-Requires:	libIDL-devel
-Requires:	linc-devel
-Requires:	popt-devel
+Requires:	libIDL-devel >= 0.8.5
+Provides:	linc-devel = 1.1.1
 Obsoletes:	libORBit2_0-devel
+Obsoletes:	linc-devel
 
-%description
+%description devel
 devel ORBit is a high-performance CORBA ORB with support for the C
 language. It allows programs to send requests and receive replies from
 other programs, regardless of the locations of the two programs.
@@ -80,7 +88,9 @@ program
 Summary:	Static libraries for ORBit
 Summary(pl):	Biblioteki statyczne dla ORBit
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Provides:	linc-static = 1.1.1
+Obsoletes:	linc-static
 
 %description static
 ORBit is a high-performance CORBA ORB with support for the C language.
@@ -96,44 +106,53 @@ Pozwala na wysy
 programów bez znajomo¶ci po³o¿enia tych dwóch programów.
 
 Ten pakiet zawiera biblioteki statyczne potrzebne do pisania programów
-zlinkowanych statycznie u¿ywaj±cych technologii CORBA.
+skonsolidowanych statycznie u¿ywaj±cych technologii CORBA.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
+# workaround for variable name
+echo 'm4_pattern_allow(PKG_CONFIG_MIN_VERSION)' >> acinclude.m4
 
 %build
-rm -f missing
+%{__gtkdocize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--with-html-dir=%{_gtkdocdir} \
+	--enable-gtk-doc \
+	--enable-http
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT 
+	DESTDIR=$RPM_BUILD_ROOT
+
+# no static module - shut up check-files
+rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/Everything_module.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/ior-decode-2
+%attr(755,root,root) %{_bindir}/linc-cleanup-sockets
 %attr(755,root,root) %{_bindir}/orbit-idl-2
 %attr(755,root,root) %{_bindir}/typelib-dump
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 %dir %{_libdir}/orbit-2.0
-%{_libdir}/orbit-2.0/*.la
 %{_libdir}/orbit-2.0/*.so*
 %{_datadir}/idl/orbit-*
 
@@ -141,16 +160,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) %{_bindir}/orbit2-config
-%{_libdir}/lib*.la
 %attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_libdir}/libname-server-2.a
 %{_pkgconfigdir}/*.pc
 %{_includedir}/orbit-*
 %{_aclocaldir}/*
+%{_gtkdocdir}/%{name}
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libORBit-2.a
 %{_libdir}/libORBit-imodule-2.a
 %{_libdir}/libORBitCosNaming-2.a
-%{_libdir}/orbit-2.0/Everything_module.a