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

diff --git a/ORBit2.spec b/ORBit2.spec
index 7364fa7..f4ee2e2 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,24 +2,31 @@ 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.8.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.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	062674985948deebf9f8a9117c3c7754
+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.2.3
+BuildRequires:	glib2-devel >= 1:2.6.3
+BuildRequires:	gtk-doc >= 1.3
 BuildRequires:	indent
-BuildRequires:	libIDL-devel >= 0.8.2
+BuildRequires:	libIDL-devel >= 0.8.5
 BuildRequires:	libtool
-BuildRequires:	popt-devel
-Provides:		linc = 1.1.1
+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
@@ -49,16 +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} = %{epoch}:%{version}
-Requires:	glib2-devel >= 2.2.3
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib2-devel >= 1:2.6.3
 Requires:	indent
-Requires:	libIDL-devel >= 0.8.2
-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.
@@ -82,7 +88,7 @@ program
 Summary:	Static libraries for ORBit
 Summary(pl):	Biblioteki statyczne dla ORBit
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 Provides:	linc-static = 1.1.1
 Obsoletes:	linc-static
 
@@ -100,21 +106,27 @@ 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
+
+# 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 \
-	--with-html-dir=%{_gtkdocdir}
-
+	--with-html-dir=%{_gtkdocdir} \
+	--enable-gtk-doc \
+	--enable-http
 %{__make}
 
 %install
@@ -129,8 +141,8 @@ 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)
@@ -148,8 +160,8 @@ 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-*