- release 2 for Th.

[packages/ORBit2.git] / ORBit2.spec

diff --git a/ORBit2.spec b/ORBit2.spec
index d90f9fa36833e109bdea39c03eae696ac708f32a..f4ee2e2bec1e2faef6fa637a58947c4ea2692b93 100644 (file)
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,30 +2,36 @@ Summary:      High-performance CORBA Object Request Broker
 Summary(fr):   Requète d'Objects CORBA
 Summary(pl):   Wysoko wydajny CORBA Object Request Broker
 Name:          ORBit2
 Summary(fr):   Requète d'Objects CORBA
 Summary(pl):   Wysoko wydajny CORBA Object Request Broker
 Name:          ORBit2

-Version:       2.3.102
-Release:       1
+Version:       2.12.2
+Release:       2

 Epoch:         1
 Epoch:         1

-License:       LGPL/GPL
+License:       GPL v2+/LGPL v2+

 Group:         Libraries
 Group:         Libraries

-Group(de):     Libraries
-Group(es):     Bibliotecas
-Group(fr):     Librairies
-Group(pl):     Biblioteki
-Source0:       ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-disable_test.patch
+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/
 URL:           http://www.labs.redhat.com/orbit/

-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.12

 BuildRequires: automake
 BuildRequires: automake

-BuildRequires: glib2-devel
-BuildRequires: libIDL-devel

 BuildRequires: flex
 BuildRequires: flex

+BuildRequires: glib2-devel >= 1:2.6.3
+BuildRequires: gtk-doc >= 1.3

 BuildRequires: indent
 BuildRequires: indent

+BuildRequires: libIDL-devel >= 0.8.5

 BuildRequires: libtool
 BuildRequires: libtool

-BuildRequires: popt-devel >= 1.4
+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

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 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
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker
 Architecture) ORB (object request broker). It allows programs to send


@@ -50,15 +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
 Summary(fr):   Librairies statiques et fichiers entête pour ORBit
 Summary(pl):   Pliki nag³ówkowe i u¿ytki dla ORBit
 Group:         Development/Libraries

-Group(de):     Entwicklung/Libraries
-Group(fr):     Development/Librairies
-Group(pl):     Programowanie/Biblioteki
-Requires:      %{name} = %{version}
-Requires:      glib2-devel
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      glib2-devel >= 1:2.6.3

 Requires:      indent
 Requires:      indent

-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.
 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.


@@ -70,7 +76,7 @@ write programs that use CORBA technology.
 Librairies statiques et fichiers entête requis pour le development ou
 la compilation de programmes utilisant ORBit.
 
 Librairies statiques et fichiers entête requis pour le development ou
 la compilation de programmes utilisant ORBit.
 

-%description -l pl devel
+%description devel -l pl

 ORBit to wysokiej wydajno¶ci CORBA ORB ze wsparciem dla jêzyka C.
 Pozwala na wysy³anie pró¶b i otrzymywanie odpowiedzi od innych
 programów bez znajomo¶ci po³o¿enia tych dwóch programów.
 ORBit to wysokiej wydajno¶ci CORBA ORB ze wsparciem dla jêzyka C.
 Pozwala na wysy³anie pró¶b i otrzymywanie odpowiedzi od innych
 programów bez znajomo¶ci po³o¿enia tych dwóch programów.


@@ -82,10 +88,9 @@ program
 Summary:       Static libraries for ORBit
 Summary(pl):   Biblioteki statyczne dla ORBit
 Group:         Development/Libraries
 Summary:       Static libraries for ORBit
 Summary(pl):   Biblioteki statyczne dla ORBit
 Group:         Development/Libraries

-Group(de):     Entwicklung/Libraries
-Group(fr):     Development/Librairies
-Group(pl):     Programowanie/Biblioteki
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Provides:      linc-static = 1.1.1
+Obsoletes:     linc-static

 
 %description static
 ORBit is a high-performance CORBA ORB with support for the C language.
 
 %description static
 ORBit is a high-performance CORBA ORB with support for the C language.


@@ -95,61 +100,76 @@ programs, regardless of the locations of the two programs.
 This package includes static libraries neecessary to write programs
 statically linked that use CORBA technology.
 
 This package includes static libraries neecessary to write programs
 statically linked that use CORBA technology.
 

-%description -l pl static
-
+%description static -l pl

 ORBit to wysokiej wydajno¶ci CORBA ORB ze wsparciem dla jêzyka C.
 Pozwala na wysy³anie pró¶b i otrzymywanie odpowiedzi od innych
 programów bez znajomo¶ci po³o¿enia tych dwóch programów.
 
 Ten pakiet zawiera biblioteki statyczne potrzebne do pisania programów
 ORBit to wysokiej wydajno¶ci CORBA ORB ze wsparciem dla jêzyka C.
 Pozwala na wysy³anie pró¶b i otrzymywanie odpowiedzi od innych
 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
 
 %prep

-%setup  -q
+%setup -q

 %patch0 -p1
 %patch0 -p1

+%patch1 -p1

 
 

-%build
-libtoolize --copy --force
-aclocal
-autoconf
+# workaround for variable name
+echo 'm4_pattern_allow(PKG_CONFIG_MIN_VERSION)' >> acinclude.m4

 
 

-%configure
+%build
+%{__gtkdocize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       --with-html-dir=%{_gtkdocdir} \
+       --enable-gtk-doc \
+       --enable-http

 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 %{__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
-
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+# 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
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+

 %files
 %defattr(644,root,root,755)
 %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-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.*.*.*
 %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)
 %{_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) %{_bindir}/orbit2-config

-%attr(755,root,root) %{_libdir}/lib*.??
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
+%{_libdir}/libname-server-2.a

 %{_pkgconfigdir}/*.pc
 %{_includedir}/orbit-*
 %{_aclocaldir}/*
 %{_pkgconfigdir}/*.pc
 %{_includedir}/orbit-*
 %{_aclocaldir}/*

+%{_gtkdocdir}/%{name}

 
 %files static
 %defattr(644,root,root,755)
 
 %files static
 %defattr(644,root,root,755)

-%{_libdir}/lib*.a
+%{_libdir}/libORBit-2.a
+%{_libdir}/libORBit-imodule-2.a
+%{_libdir}/libORBitCosNaming-2.a