diff --git a/libical.spec b/libical.spec index 308cb4b..d844a02 100644 --- a/libical.spec +++ b/libical.spec @@ -1,7 +1,7 @@ Summary: Reference implementation of the iCalendar data type and serialization format Name: libical Version: 3.0.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 or MPLv2.0 URL: https://libical.github.io/libical/ Source: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -10,6 +10,7 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: gtk-doc +BuildRequires: pkgconfig BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libxml-2.0) @@ -29,8 +30,6 @@ used in dozens of calendaring and scheduling products. %package devel Summary: Development files for libical Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig(icu-i18n) -Requires: pkgconfig(icu-uc) %description devel The libical-devel package contains libraries and header files for developing @@ -38,8 +37,6 @@ applications that use libical. %package glib Summary: GObject wrapper for libical library -Provides: libical-glib%{?_isa} = %{version}-%{release} -Obsoletes: libical-glib < 3.0.0 Requires: %{name}%{?_isa} = %{version}-%{release} %description glib @@ -48,9 +45,6 @@ of GObject Introspection. %package glib-doc Summary: Documentation files for %{name}-glib -Group: Development/Libraries -Provides: libical-glib-doc = %{version}-%{release} -Obsoletes: libical-glib-doc < 3.0.0 BuildArch: noarch %description glib-doc @@ -58,12 +52,8 @@ This package contains developer documentation for %{name}-glib. %package glib-devel Summary: Development files for building against %{name}-glib -Group: Development/Libraries -Provides: libical-glib-devel%{?_isa} = %{version}-%{release} -Obsoletes: libical-glib-devel < 3.0.0 -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig(glib-2.0) -Requires: pkgconfig(gobject-2.0) +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-glib%{?_isa} = %{version}-%{release} %description glib-devel Development files needed for building things which link against %{name}-glib. @@ -83,7 +73,8 @@ pushd %{_target_platform} -DSHARED_ONLY:BOOL=true popd -make %{?_smp_mflags} -C %{_target_platform} -j1 +# avoid parallel-builds, gir generatation fails on slower archs +%make_build -j1 -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} @@ -94,7 +85,8 @@ make test ARGS="-V" -C %{_target_platform} %ldconfig_scriptlets %files -%doc LICENSE ReadMe.txt THANKS +%doc ReadMe.txt THANKS +%license LICENSE %{_libdir}/libical.so.3* %{_libdir}/libical_cxx.so.3* %{_libdir}/libicalss.so.3* @@ -114,6 +106,8 @@ make test ARGS="-V" -C %{_target_platform} %{_libdir}/cmake/LibIcal/ %{_includedir}/libical/ +%ldconfig_scriptlets glib + %files glib %{_libdir}/libical-glib.so.3* %{_libdir}/girepository-1.0/ICalGLib-3.0.typelib @@ -129,6 +123,15 @@ make test ARGS="-V" -C %{_target_platform} %{_datadir}/gtk-doc/html/%{name}-glib %changelog +* Sat Apr 28 2018 Rex Dieter - 3.0.3-3 +- use %%license +- %%build: use %%make_build +- -glib: add %%ldconfig_scriptlets +- -glib: no need to Obsoletes/Provides itself +- -glib-devel: Requires -devel,-glib (instead of base pkg) +- drop deprecated Group: tag +- -devel: drop hardcoded pkgconfig deps (let rpm autodetection do it) + * Mon Mar 12 2018 Christian Stadelmann - 3.0.3-2 - Update upstream URL