- fixed %%files (no need 755 for *.la)

[packages/ORBit2.git] / ORBit2.spec

diff --git a/ORBit2.spec b/ORBit2.spec
index 043e9dd9c0cfb43b99639443c73b6347c6be4201..8a8a29291d8bf9596f5357556a633dd7b617104e 100644 (file)
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,30 +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
 Summary(fr):   Requète d'Objects CORBA
 Summary(pl):   Wysoko wydajny CORBA Object Request Broker
 Name:          ORBit2

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

 Epoch:         1
 Epoch:         1

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

 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/%{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
 URL:           http://www.labs.redhat.com/orbit/
 BuildRequires: autoconf
 BuildRequires: automake

-BuildRequires: glib2-devel >= 1.3.10
-BuildRequires: linc-devel >= 0.1.12
-BuildRequires: libIDL-devel

 BuildRequires: flex
 BuildRequires: flex

+BuildRequires: glib2-devel >= 2.0.6

 BuildRequires: indent
 BuildRequires: indent

+BuildRequires: libIDL-devel >= 0.8.0

 BuildRequires: libtool
 BuildRequires: libtool

-BuildRequires: popt-devel >= 1.4
+BuildRequires: linc-devel >= 0.7.1
+BuildRequires: popt-devel

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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
 
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker


@@ -51,13 +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
 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:      %{name} = %{version}

-Requires:      glib2-devel
+Requires:      glib2-devel >= 2.0.0

 Requires:      indent
 Requires:      indent

+Requires:      libIDL-devel
+Requires:      linc-devel

 Requires:      popt-devel
 Requires:      popt-devel

+Obsoletes:     libORBit2_0-devel

 
 %description
 devel ORBit is a high-performance CORBA ORB with support for the C
 
 %description
 devel ORBit is a high-performance CORBA ORB with support for the C


@@ -71,7 +69,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.


@@ -83,9 +81,6 @@ 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}
 
 %description static
 Requires:      %{name}-devel = %{version}
 
 %description static


@@ -96,8 +91,7 @@ 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.
 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.


@@ -108,13 +102,16 @@ zlinkowanych statycznie u
 %prep
 %setup  -q
 %patch0 -p1
 %prep
 %setup  -q
 %patch0 -p1

+%patch1 -p1
+%patch2 -p1
+%patch3 -p1

 
 %build
 rm -f missing
 
 %build
 rm -f missing

-install /usr/share/automake/missing .
-libtoolize --copy --force
-aclocal
-autoconf
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}

 %configure
 %{__make}
 
 %configure
 %{__make}
 


@@ -126,28 +123,31 @@ rm -rf $RPM_BUILD_ROOT
        m4datadir=%{_aclocaldir} \
        pkgconfigdir=%{_pkgconfigdir}
 
        m4datadir=%{_aclocaldir} \
        pkgconfigdir=%{_pkgconfigdir}
 

-gzip -9nf TODO NEWS
+%clean
+rm -rf $RPM_BUILD_ROOT

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

-%clean
-rm -rf $RPM_BUILD_ROOT
-

 %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}/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/*.la
+%{_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*.??
-%{_libdir}/libname-server.a
+%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/libname-server-2.a

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


@@ -156,3 +156,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libORBit-2.a
 %{_libdir}/libORBitCosNaming-2.a
 %defattr(644,root,root,755)
 %{_libdir}/libORBit-2.a
 %{_libdir}/libORBitCosNaming-2.a

+%{_libdir}/orbit-2.0/Everything_module.a