rebuild with separate debuginfo build-ids

[packages/ORBit2.git] / ORBit2.spec

diff --git a/ORBit2.spec b/ORBit2.spec
index fdcf910c3dab0106ccac138cf49c559284b56f45..3ca2dea2da991f11092ae196461e8615b3ad5e0b 100644 (file)
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -1,32 +1,38 @@
+#
+# Conditional build:
+%bcond_without apidocs         # gtk-doc based API documentation
+%bcond_without static_libs     # static libraries
+

 Summary:       High-performance CORBA Object Request Broker
 Summary:       High-performance CORBA Object Request Broker

-Summary(fr):   Requète d'Objects CORBA
-Summary(pl):   Wysoko wydajny CORBA Object Request Broker
+Summary(fr.UTF-8):     Requète d'Objects CORBA
+Summary(pl.UTF-8):     Wysoko wydajny CORBA Object Request Broker

 Name:          ORBit2
 Name:          ORBit2

-Version:       2.12.2
-Release:       1
+Version:       2.14.19
+Release:       11

 Epoch:         1
 License:       GPL v2+/LGPL v2+
 Group:         Libraries
 Epoch:         1
 License:       GPL v2+/LGPL v2+
 Group:         Libraries

-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/
-BuildRequires: autoconf >= 2.12
-BuildRequires: automake
+Source0:       https://download.gnome.org/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 7082d317a9573ab338302243082d10d1
+Patch1:                %{name}-build-fix.patch
+Patch2:                %{name}-idl-gtk-doc.patch
+URL:           https://developer.gnome.org/ORBit2/
+BuildRequires: autoconf >= 2.54
+BuildRequires: automake >= 1:1.9
+BuildRequires: docbook-dtd412-xml

 BuildRequires: flex
 BuildRequires: flex

-BuildRequires: glib2-devel >= 1:2.6.3
-BuildRequires: gtk-doc >= 1.3
+BuildRequires: glib2-devel >= 1:2.14.1
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.8}

 BuildRequires: indent
 BuildRequires: indent

-BuildRequires: libIDL-devel >= 0.8.5
+BuildRequires: libIDL-devel >= 0.8.10

 BuildRequires: libtool
 BuildRequires: libtool

-BuildRequires: pkgconfig >= 1:0.14.0
-BuildRequires: popt-devel >= 1.5
+BuildRequires: pkgconfig >= 1:0.18
+BuildRequires: rpm-build >= 4.6

 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: rpmbuild(macros) >= 1.197

-Requires:      glib2 >= 1:2.6.3
-Requires:      libIDL >= 0.8.5
-Requires:      popt >= 1.5
+Requires:      glib2 >= 1:2.14.1
+Requires:      libIDL >= 0.8.10

 Provides:      linc = 1.1.1
 Provides:      linc = 1.1.1

+Obsoletes:     ORBit2-automake < 1:2.12.5

 Obsoletes:     libORBit2_0
 Obsoletes:     linc
 Conflicts:     libbonobo < 2.3.2
 Obsoletes:     libORBit2_0
 Obsoletes:     linc
 Conflicts:     libbonobo < 2.3.2


@@ -40,26 +46,39 @@ locations of the two programs. CORBA is an architecture that enables
 communication between program objects, regardless of the programming
 language they're written in or the operating system they run on.
 
 communication between program objects, regardless of the programming
 language they're written in or the operating system they run on.
 

-%description -l fr
+%description -l fr.UTF-8

 ORBit est un ORB CORBA avec support pour le language C. Il permet a
 ORBit est un ORB CORBA avec support pour le language C. Il permet a

-des programmes d'envoyer des requètes et recevoir de réponses d'autres
-programmes, indépendement de l'endroit ou sont les deux programmes.
+des programmes d'envoyer des requètes et recevoir de réponses d'autres
+programmes, indépendement de l'endroit ou sont les deux programmes.
+
+%description -l pl.UTF-8
+ORBit to wysokiej wydajności CORBA (Common Object Request Broker
+Architecture) ORB (object request broker). Pozwala na wysyłanie próśb
+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.UTF-8):     Dokumentacja API ORBit
+Group:         Documentation
+Requires:      gtk-doc-common
+BuildArch:     noarch

 
 

-%description -l pl
-ORBit to wysokiej wydajno¶ci CORBA (Common Object Request Broker
-Architecture) ORB (object request broker). Pozwala na wysy³anie pró¶b
-i otrzymywanie odpowiedzi od innych programów bez znajomo¶ci po³o¿enia
-tych dwóch programów.
+%description apidocs
+ORBit API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API ORBit.

 
 %package devel
 Summary:       Header files, and utilities for 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
+Summary(fr.UTF-8):     Librairies statiques et fichiers entête pour ORBit
+Summary(pl.UTF-8):     Pliki nagłówkowe i użytki dla ORBit

 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}

-Requires:      glib2-devel >= 1:2.6.3
+Requires:      glib2-devel >= 1:2.14.1

 Requires:      indent
 Requires:      indent

-Requires:      libIDL-devel >= 0.8.5
+Requires:      libIDL-devel >= 0.8.10

 Provides:      linc-devel = 1.1.1
 Obsoletes:     libORBit2_0-devel
 Obsoletes:     linc-devel
 Provides:      linc-devel = 1.1.1
 Obsoletes:     libORBit2_0-devel
 Obsoletes:     linc-devel


@@ -72,21 +91,21 @@ other programs, regardless of the locations of the two programs.
 This package includes the header files and utilities neecessary to
 write programs that use CORBA technology.
 
 This package includes the header files and utilities neecessary to
 write programs that use CORBA technology.
 

-%description devel -l fr
-Librairies statiques et fichiers entête requis pour le development ou
+%description devel -l fr.UTF-8
+Librairies statiques et fichiers entête requis pour le development ou

 la compilation de programmes utilisant ORBit.
 
 la compilation de programmes utilisant ORBit.
 

-%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.
+%description devel -l pl.UTF-8
+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 pliki nag³ówkowe oraz u¿ytki potrzebne do pisania
-programów u¿ywaj±cych technologi CORBA.
+Ten pakiet zawiera pliki nagłówkowe oraz użytki potrzebne do pisania
+programów używających technologi CORBA.

 
 %package static
 Summary:       Static libraries for ORBit
 
 %package static
 Summary:       Static libraries for ORBit

-Summary(pl):   Biblioteki statyczne dla ORBit
+Summary(pl.UTF-8):     Biblioteki statyczne dla ORBit

 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Provides:      linc-static = 1.1.1
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Provides:      linc-static = 1.1.1


@@ -100,24 +119,26 @@ 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 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.
+%description static -l pl.UTF-8
+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
-skonsolidowanych statycznie u¿ywaj±cych technologii CORBA.
+Ten pakiet zawiera biblioteki statyczne potrzebne do pisania programów
+skonsolidowanych statycznie używających technologii CORBA.

 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1

 %patch1 -p1
 %patch1 -p1

+%patch2 -p1

 
 

-# workaround for variable name
-echo 'm4_pattern_allow(PKG_CONFIG_MIN_VERSION)' >> acinclude.m4
+%if %{without apidocs}
+echo 'EXTRA_DIST=' > gtk-doc.make
+echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
+%endif

 
 %build
 
 %build

-%{__gtkdocize}
+%{?with_apidocs:%{__gtkdocize}}

 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}


@@ -125,18 +146,23 @@ echo 'm4_pattern_allow(PKG_CONFIG_MIN_VERSION)' >> acinclude.m4
 %{__automake}
 %configure \
        --with-html-dir=%{_gtkdocdir} \
 %{__automake}
 %configure \
        --with-html-dir=%{_gtkdocdir} \

-       --enable-gtk-doc \
-       --enable-http
-%{__make}
+       %{!?with_static_libs:--disable-static} \
+       %{?with_apidocs:--enable-gtk-doc}
+%{__make} -j1

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-%{__make} install \
+%{__make} -j1 install \

        DESTDIR=$RPM_BUILD_ROOT
 
        DESTDIR=$RPM_BUILD_ROOT
 

+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la

 # no static module - shut up check-files
 # no static module - shut up check-files

-rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/Everything_module.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/Everything_module.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/Everything_module.a
+%endif

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -151,25 +177,42 @@ rm -rf $RPM_BUILD_ROOT
 %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) %{_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.*.*.*
+%attr(755,root,root) %{_libdir}/libORBit-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libORBit-2.so.0
+%attr(755,root,root) %{_libdir}/libORBit-imodule-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libORBit-imodule-2.so.0
+%attr(755,root,root) %{_libdir}/libORBitCosNaming-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libORBitCosNaming-2.so.0

 %dir %{_libdir}/orbit-2.0
 %dir %{_libdir}/orbit-2.0

-%{_libdir}/orbit-2.0/*.so*
-%{_datadir}/idl/orbit-*
+%attr(755,root,root) %{_libdir}/orbit-2.0/Everything_module.so
+%{_datadir}/idl/orbit-2.0
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/%{name}
+%endif

 
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) %{_bindir}/orbit2-config
 
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) %{_bindir}/orbit2-config

-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libORBit-2.so
+%attr(755,root,root) %{_libdir}/libORBit-imodule-2.so
+%attr(755,root,root) %{_libdir}/libORBitCosNaming-2.so
+# static-only library

 %{_libdir}/libname-server-2.a
 %{_libdir}/libname-server-2.a

-%{_pkgconfigdir}/*.pc
-%{_includedir}/orbit-*
-%{_aclocaldir}/*
-%{_gtkdocdir}/%{name}
-
+%{_includedir}/orbit-2.0
+%{_pkgconfigdir}/ORBit-2.0.pc
+%{_pkgconfigdir}/ORBit-CosNaming-2.0.pc
+%{_pkgconfigdir}/ORBit-idl-2.0.pc
+%{_pkgconfigdir}/ORBit-imodule-2.0.pc
+%{_aclocaldir}/ORBit2.m4
+
+%if %{with static_libs}

 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libORBit-2.a
 %{_libdir}/libORBit-imodule-2.a
 %{_libdir}/libORBitCosNaming-2.a
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libORBit-2.a
 %{_libdir}/libORBit-imodule-2.a
 %{_libdir}/libORBitCosNaming-2.a

+%endif