X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ORBit2.spec;h=2076ca5741e8b3f12ca2d1e0e112816633fb3339;hb=3cea88241de09e88b04c21533787df277110ce3a;hp=9b33ab6483d06b780280ee55cc36dbcf69a0de18;hpb=bc163da4138adc6e0f4a5c0612f600897dcae28b;p=packages%2FORBit2.git

diff --git a/ORBit2.spec b/ORBit2.spec
index 9b33ab6..2076ca5 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,45 +2,29 @@ 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.105
+Version:	2.7.6
 Release:	1
 Epoch:		1
-License:	LGPL/GPL
+License:	GPL/LGPL
 Group:		Libraries
-Group(cs):	Knihovny
-Group(da):	Biblioteker
-Group(de):	Bibliotheken
-Group(es):	Bibliotecas
-Group(fr):	Librairies
-Group(is):	Aðgerðasöfn
-Group(it):	Librerie
-Group(ja):	¥é¥¤¥Ö¥é¥ê
-Group(no):	Biblioteker
-Group(pl):	Biblioteki
-Group(pt):	Bibliotecas
-Group(pt_BR):	Bibliotecas
-Group(ru):	âÉÂÌÉÏÔÅËÉ
-Group(sl):	Knji¾nice
-Group(sv):	Bibliotek
-Group(uk):	â¦Â̦ÏÔÅËÉ
-Source0:	ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-disable_test.patch
-Patch1:		%{name}-am15.patch
-Patch2:		%{name}-ac_fix.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.7/%{name}-%{version}.tar.bz2
+# Source0-md5:	4a98ba4b345cffaea53a80d26b00a9a6
+Patch0:		%{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:	popt-devel
+Provides:		linc = 1.1.1
+Obsoletes:	libORBit2_0
+Obsoletes:	linc
+Conflicts:	libbonobo < 2.3.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc
-
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker
 Architecture) ORB (object request broker). It allows programs to send
@@ -65,28 +49,14 @@ 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(da):	Udvikling/Biblioteker
-Group(de):	Entwicklung/Bibliotheken
-Group(es):	Desarrollo/Bibliotecas
-Group(fr):	Development/Librairies
-Group(is):	Þróunartól/Aðgerðasöfn
-Group(it):	Sviluppo/Librerie
-Group(ja):	³«È¯/¥é¥¤¥Ö¥é¥ê
-Group(no):	Utvikling/Bibliotek
-Group(pl):	Programowanie/Biblioteki
-Group(pt_BR):	Desenvolvimento/Bibliotecas
-Group(pt):	Desenvolvimento/Bibliotecas
-Group(ru):	òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(sl):	Razvoj/Knji¾nice
-Group(sv):	Utveckling/Bibliotek
-Group(uk):	òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
-Requires:	glib2-devel
+Requires:	%{name} = %{epoch}:%{version}
+Requires:	glib2-devel >= 2.0.0
 Requires:	indent
 Requires:	libIDL-devel
-Requires:	linc-devel
 Requires:	popt-devel
+Provides:	linc-devel = 1.1.1
+Obsoletes:	libORBit2_0-devel
+Obsoletes:	linc-devel
 
 %description
 devel ORBit is a high-performance CORBA ORB with support for the C
@@ -112,23 +82,9 @@ program
 Summary:	Static libraries for ORBit
 Summary(pl):	Biblioteki statyczne dla ORBit
 Group:		Development/Libraries
-Group(cs):	Vývojové prostøedky/Knihovny
-Group(da):	Udvikling/Biblioteker
-Group(de):	Entwicklung/Bibliotheken
-Group(es):	Desarrollo/Bibliotecas
-Group(fr):	Development/Librairies
-Group(is):	Þróunartól/Aðgerðasöfn
-Group(it):	Sviluppo/Librerie
-Group(ja):	³«È¯/¥é¥¤¥Ö¥é¥ê
-Group(no):	Utvikling/Bibliotek
-Group(pl):	Programowanie/Biblioteki
-Group(pt_BR):	Desenvolvimento/Bibliotecas
-Group(pt):	Desenvolvimento/Bibliotecas
-Group(ru):	òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(sl):	Razvoj/Knji¾nice
-Group(sv):	Utveckling/Bibliotek
-Group(uk):	òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}
+Provides:	linc-static = 1.1.1
+Obsoletes:	linc-static
 
 %description static
 ORBit is a high-performance CORBA ORB with support for the C language.
@@ -148,28 +104,27 @@ zlinkowanych statycznie u
 
 %prep
 %setup  -q
-#%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1
 
 %build
 rm -f missing
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c
-%configure
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure \
+	--with-html-dir=%{_gtkdocdir}
+	
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	m4datadir=%{_aclocaldir} \
-	pkgconfigdir=%{_pkgconfigdir}
+	DESTDIR=$RPM_BUILD_ROOT 
 
-gzip -9nf TODO NEWS
+# 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
@@ -179,23 +134,30 @@ 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}/linc-cleanup-sockets
 %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/*.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-*
 %{_aclocaldir}/*
+%{_gtkdocdir}/%{name}
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libORBit-2.a
+%{_libdir}/libORBit-imodule-2.a
 %{_libdir}/libORBitCosNaming-2.a