- version 2.7.5

[packages/ORBit2.git] / ORBit2.spec

diff --git a/ORBit2.spec b/ORBit2.spec
index 0720555d51c4548e67bbdecd21b36cad8c096689..6e5b5cf813407da635a8c032457a4a0df8d85740 100644 (file)
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,16 +2,14 @@ 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.5.1
-Release:       1
+Version:       2.7.5
+Release:       0.9
 Epoch:         1
 License:       GPL/LGPL
 Group:         Libraries
-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
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.7/%{name}-%{version}.tar.bz2
+# Source0-md5: 0e75301c0df80406c265984e6ae753cf
+Patch0:                %{name}-pthread.patch
 URL:           http://www.labs.redhat.com/orbit/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -20,10 +18,11 @@ BuildRequires:      glib2-devel >= 2.0.6
 BuildRequires: indent
 BuildRequires: libIDL-devel >= 0.8.0
 BuildRequires: libtool
-BuildRequires: linc-devel >= 0.7.1
+BuildRequires: linc-devel >= 1.1.1
 BuildRequires: popt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libORBit2_0
+Conflicts:     libbonobo < 2.3.2
 
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker
@@ -49,7 +48,7 @@ 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
@@ -81,7 +80,7 @@ program
 Summary:       Static libraries for ORBit
 Summary(pl):   Biblioteki statyczne dla ORBit
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}
 
 %description static
 ORBit is a high-performance CORBA ORB with support for the C language.
@@ -102,9 +101,6 @@ zlinkowanych statycznie u
 %prep
 %setup  -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 rm -f missing
@@ -112,16 +108,19 @@ rm -f missing
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%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 
+
+# 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,11 +132,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/ior-decode-2
+#Waiting for new linc package
+#%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-*
 
@@ -145,14 +145,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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
-%{_libdir}/orbit-2.0/Everything_module.a