- version 2.7.6

[packages/ORBit2.git] / ORBit2.spec

diff --git a/ORBit2.spec b/ORBit2.spec
index 90a714ebf7e438c9514c75552ee58fd013286bf7..2076ca5741e8b3f12ca2d1e0e112816633fb3339 100644 (file)
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,29 +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.106
-Release:       2
+Version:       2.7.6
+Release:       1
 Epoch:         1
-License:       LGPL/GPL
+License:       GPL/LGPL
 Group:         Libraries
-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: flex
-BuildRequires: glib2-devel >= 2.0.0
+BuildRequires: glib2-devel >= 2.0.6
 BuildRequires: indent
-BuildRequires: libIDL-devel >= 0.7.4
+BuildRequires: libIDL-devel >= 0.8.0
 BuildRequires: libtool
-BuildRequires: linc-devel >= 0.1.17
-BuildRequires: popt-devel >= 1.4
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: popt-devel
+Provides:              linc = 1.1.1
 Obsoletes:     libORBit2_0
-
-%define                _sysconfdir     /etc
+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
@@ -50,13 +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
-Requires:      %{name} = %{version}
+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
@@ -82,7 +82,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}
+Provides:      linc-static = 1.1.1
+Obsoletes:     linc-static
 
 %description static
 ORBit is a high-performance CORBA ORB with support for the C language.
@@ -102,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 -f
-%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
@@ -133,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