rebuild with separate debuginfo build-ids

[packages/ORBit2.git] / ORBit2.spec

diff --git a/ORBit2.spec b/ORBit2.spec
index e6fb189699d96e0e70a08223806dcb3eec11a64b..3ca2dea2da991f11092ae196461e8615b3ad5e0b 100644 (file)
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -1,22 +1,22 @@
 #
 # Conditional build:
-%bcond_without apidocs         # disable gtk-doc
-%bcond_without static_libs     # don't build static library
+%bcond_without apidocs         # gtk-doc based API documentation
+%bcond_without static_libs     # static libraries
 
 Summary:       High-performance 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
 Version:       2.14.19
-Release:       7
+Release:       11
 Epoch:         1
 License:       GPL v2+/LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
+Source0:       https://download.gnome.org/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
 # Source0-md5: 7082d317a9573ab338302243082d10d1
-Patch0:                %{name}-pthread.patch
 Patch1:                %{name}-build-fix.patch
-URL:           http://projects.gnome.org/ORBit2/
+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
@@ -27,11 +27,12 @@ BuildRequires:      indent
 BuildRequires: libIDL-devel >= 0.8.10
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 1:0.18
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.197
 Requires:      glib2 >= 1:2.14.1
 Requires:      libIDL >= 0.8.10
 Provides:      linc = 1.1.1
-Obsoletes:     ORBit2-automake
+Obsoletes:     ORBit2-automake < 1:2.12.5
 Obsoletes:     libORBit2_0
 Obsoletes:     linc
 Conflicts:     libbonobo < 2.3.2
@@ -61,9 +62,7 @@ Summary:      ORBit API documentation
 Summary(pl.UTF-8):     Dokumentacja API ORBit
 Group:         Documentation
 Requires:      gtk-doc-common
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description apidocs
 ORBit API documentation.
@@ -130,10 +129,10 @@ skonsolidowanych statycznie używających technologii CORBA.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
-%if !%{with apidocs}
+%if %{without apidocs}
 echo 'EXTRA_DIST=' > gtk-doc.make
 echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
 %endif
@@ -157,8 +156,13 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 # 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
@@ -196,9 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%{_libdir}/libORBit-2.la
-%{_libdir}/libORBit-imodule-2.la
-%{_libdir}/libORBitCosNaming-2.la
+# static-only library
 %{_libdir}/libname-server-2.a
 %{_includedir}/orbit-2.0
 %{_pkgconfigdir}/ORBit-2.0.pc