diff --git a/libkolabxml.spec b/libkolabxml.spec index 1f931b2..83796e4 100644 --- a/libkolabxml.spec +++ b/libkolabxml.spec @@ -51,7 +51,7 @@ Name: libkolabxml Version: 1.1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Kolab XML format collection parser library License: LGPLv3+ @@ -72,6 +72,15 @@ BuildRequires: uuid-devel BuildRequires: xerces-c-devel BuildRequires: xsd +# libkolab FTBFS, so ... +# https://bugzilla.redhat.com/show_bug.cgi?id=1518800 +%global libkolab_obsoletes 1.0.2-20 +%if 0%{?libkolab_obsoletes:1} +Obsoletes: libkolab < %{libkolab_obsoletes} +Obsoletes: libkolab-devel < %{libkolab_obsoletes} +Obsoletes: python2-libkolab < %{libkolab_obsoletes} +%endif + %if 0%{?with_csharp} < 1 Obsoletes: csharp-kolabformat < %{version}-%{release} #Provides: csharp-kolabformat = %{version}-%{release} @@ -184,7 +193,6 @@ popd make -C build - %install make install DESTDIR=%{buildroot} INSTALL='install -p' -C build @@ -217,8 +225,7 @@ python src/python/test.py ||: popd -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc DEVELOPMENT NEWS README @@ -257,6 +264,10 @@ popd %changelog +* Wed Apr 04 2018 Rex Dieter - 1.1.6-4 +- Obsoletes: libkolab < 1.0.2-20 +- use %%ldconfig_scriptlets + * Wed Feb 07 2018 Fedora Release Engineering - 1.1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild