X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ORBit2.spec;h=8a8a29291d8bf9596f5357556a633dd7b617104e;hb=6148b34f9ce62fdff5b32933d0508d80a2acd897;hp=36c492149fdbd69a3dd28924fb907ec78337c73d;hpb=4116409f3bcc32a1b53a753f24a08cd22fe90a44;p=packages%2FORBit2.git

diff --git a/ORBit2.spec b/ORBit2.spec
index 36c4921..8a8a292 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,39 +2,28 @@ 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.3.104
-Release:	2
+Version:	2.5.1
+Release:	1
 Epoch:		1
-License:	LGPL/GPL
+License:	GPL/LGPL
 Group:		Libraries
-Group(cs):	Knihovny
-Group(de):	Bibliotheken
-Group(es):	Bibliotecas
-Group(fr):	Librairies
-Group(ja):	¥é¥¤¥Ö¥é¥ê
-Group(pl):	Biblioteki
-Group(pt):	Bibliotecas
-Group(pt_BR):	Bibliotecas
-Group(ru):	âÉÂÌÉÏÔÅËÉ
-Group(uk):	â¦Â̦ÏÔÅËÉ
-Source0:	ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/%{name}/%{name}-%{version}.tar.bz2
-Source1:	%{name}-Makefile.shared
-Patch0:		%{name}-disable_test.patch
-Patch1:		%{name}-am15.patch
-Patch2:		%{name}-ac_fix.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.5/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-am15.patch
+Patch1:		%{name}-ac_fix.patch
+Patch2:		%{name}-am16.patch
+Patch3:		%{name}-pthread.patch
 URL:		http://www.labs.redhat.com/orbit/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	glib2-devel >= 1.3.13
-BuildRequires:	linc-devel >= 0.1.16
-BuildRequires:	libIDL-devel >= 0.7.4
 BuildRequires:	flex
+BuildRequires:	glib2-devel >= 2.0.6
 BuildRequires:	indent
+BuildRequires:	libIDL-devel >= 0.8.0
 BuildRequires:	libtool
-BuildRequires:	popt-devel >= 1.4
+BuildRequires:	linc-devel >= 0.7.1
+BuildRequires:	popt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define		_sysconfdir	/etc
+Obsoletes:	libORBit2_0
 
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker
@@ -60,22 +49,13 @@ 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
-Group(cs):	Vývojové prostøedky/Knihovny
-Group(de):	Entwicklung/Bibliotheken
-Group(es):	Desarrollo/Bibliotecas
-Group(fr):	Development/Librairies
-Group(ja):	³«È¯/¥é¥¤¥Ö¥é¥ê
-Group(pl):	Programowanie/Biblioteki
-Group(pt_BR):	Desenvolvimento/Bibliotecas
-Group(pt):	Desenvolvimento/Bibliotecas
-Group(ru):	òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:	%{name} = %{version}
-Requires:	glib2-devel
+Requires:	glib2-devel >= 2.0.0
 Requires:	indent
 Requires:	libIDL-devel
 Requires:	linc-devel
 Requires:	popt-devel
+Obsoletes:	libORBit2_0-devel
 
 %description
 devel ORBit is a high-performance CORBA ORB with support for the C
@@ -101,16 +81,6 @@ program
 Summary:	Static libraries for ORBit
 Summary(pl):	Biblioteki statyczne dla ORBit
 Group:		Development/Libraries
-Group(cs):	Vývojové prostøedky/Knihovny
-Group(de):	Entwicklung/Bibliotheken
-Group(es):	Desarrollo/Bibliotecas
-Group(fr):	Development/Librairies
-Group(ja):	³«È¯/¥é¥¤¥Ö¥é¥ê
-Group(pl):	Programowanie/Biblioteki
-Group(pt_BR):	Desenvolvimento/Bibliotecas
-Group(pt):	Desenvolvimento/Bibliotecas
-Group(ru):	òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:	%{name}-devel = %{version}
 
 %description static
@@ -134,15 +104,14 @@ zlinkowanych statycznie u
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-
-install %{SOURCE1} Makefile.shared
+%patch3 -p1
 
 %build
 rm -f missing
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure
 %{__make}
 
@@ -154,8 +123,6 @@ rm -rf $RPM_BUILD_ROOT
 	m4datadir=%{_aclocaldir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
-gzip -9nf TODO NEWS
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -164,17 +131,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/name-client-2
+%doc AUTHORS NEWS README
+%attr(755,root,root) %{_bindir}/ior-decode-2
 %attr(755,root,root) %{_bindir}/orbit-idl-2
-%attr(755,root,root) %{_bindir}/orbit-name-server-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-*
 
 %files devel
 %defattr(644,root,root,755)
-%doc *.gz
+%doc ChangeLog
 %attr(755,root,root) %{_bindir}/orbit2-config
-%attr(755,root,root) %{_libdir}/lib*.??
+%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/libname-server-2.a
 %{_pkgconfigdir}/*.pc
 %{_includedir}/orbit-*
@@ -184,3 +156,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libORBit-2.a
 %{_libdir}/libORBitCosNaming-2.a
+%{_libdir}/orbit-2.0/Everything_module.a