- up to 2.14.5

[packages/ORBit2.git] / ORBit2.spec

diff --git a/ORBit2.spec b/ORBit2.spec
index d823dda1133163da1c5882c96e43c12f2bda608e..90872e4f7a6f8ae9798d1f6770c7e9f8dfb89423 100644 (file)
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,26 +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.12.0
+Version:       2.14.5
 Release:       1
 Epoch:         1
-License:       GPL/LGPL
+License:       GPL v2+/LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: d7f0c2b9bee73b89978a9968c10f81fe
+Source0:       http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 5b3ca3d7ed13a76c9e7bb4a890fe68af
 Patch0:                %{name}-pthread.patch
-URL:           http://www.labs.redhat.com/orbit/
-BuildRequires: autoconf
+URL:           http://www.gnome.org/projects/ORBit2/
+BuildRequires: autoconf >= 2.54
 BuildRequires: automake
 BuildRequires: flex
-BuildRequires: glib2-devel >= 1:2.4.2
-BuildRequires: gtk-doc >= 1.0
+BuildRequires: glib2-devel >= 1:2.12.3
+BuildRequires: gtk-doc >= 1.7
 BuildRequires: indent
-BuildRequires: libIDL-devel >= 0.8.4
+BuildRequires: libIDL-devel >= 0.8.7
 BuildRequires: libtool
-BuildRequires: pkgconfig >= 0.14.0
-BuildRequires: popt-devel
+BuildRequires: pkgconfig >= 1:0.14.0
+BuildRequires: rpmbuild(macros) >= 1.197
+Requires:      glib2 >= 1:2.12.3
+Requires:      libIDL >= 0.8.7
 Provides:      linc = 1.1.1
+Obsoletes:     ORBit2-automake
 Obsoletes:     libORBit2_0
 Obsoletes:     linc
 Conflicts:     libbonobo < 2.3.2
@@ -46,16 +49,27 @@ Architecture) ORB (object request broker). Pozwala na wysy
 i otrzymywanie odpowiedzi od innych programów bez znajomo¶ci po³o¿enia
 tych dwóch programów.
 
+%package apidocs
+Summary:       ORBit API documentation
+Summary(pl):   Dokumentacja API ORBit
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description apidocs
+ORBit API documentation.
+
+%description apidocs -l pl
+Dokumentacja API ORBit.
+
 %package devel
 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} = %{epoch}:%{version}-%{release}
-Requires:      glib2-devel >= 1:2.4.2
+Requires:      glib2-devel >= 1:2.12.3
 Requires:      indent
-Requires:      libIDL-devel >= 0.8.4
-Requires:      popt-devel
+Requires:      libIDL-devel >= 0.8.7
 Provides:      linc-devel = 1.1.1
 Obsoletes:     libORBit2_0-devel
 Obsoletes:     linc-devel
@@ -109,7 +123,7 @@ skonsolidowanych statycznie u
 %patch0 -p1
 
 %build
-gtkdocize --copy
+%{__gtkdocize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -119,7 +133,6 @@ gtkdocize --copy
        --with-html-dir=%{_gtkdocdir} \
        --enable-gtk-doc \
        --enable-http
-
 %{__make}
 
 %install
@@ -134,8 +147,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/Everything_module.{la,a}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -146,9 +159,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/typelib-dump
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 %dir %{_libdir}/orbit-2.0
-%{_libdir}/orbit-2.0/*.so*
+%attr(755,root,root) %{_libdir}/orbit-2.0/*.so*
 %{_datadir}/idl/orbit-*
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/%{name}
+
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog
@@ -156,10 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_libdir}/libname-server-2.a
-%{_pkgconfigdir}/*.pc
-%{_includedir}/orbit-*
 %{_aclocaldir}/*
-%{_gtkdocdir}/%{name}
+%{_includedir}/orbit-*
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)