From 675c499a7ed1c9bf1f30e7250683b4875c65c622 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 1 Jul 2016 19:46:15 +0200 Subject: [PATCH] Set minimum required versions for dependencies This ensures that we not only pull in the correct versions during build time, but also during runtime. Especially important for F23 where we are pushing out a new gnome-software version and we need to ensure that all dependant libraries get updated in lockstep. --- libappstream-glib.spec | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/libappstream-glib.spec b/libappstream-glib.spec index 9f9fde6..9827338 100644 --- a/libappstream-glib.spec +++ b/libappstream-glib.spec @@ -1,26 +1,31 @@ +%global glib2_version 2.45.8 +%global libsoup_version 2.51.92 +%global json_glib_version 1.1.1 +%global gdk_pixbuf_version 2.31.5 + Summary: Library for AppStream metadata Name: libappstream-glib Version: 0.5.16 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://people.freedesktop.org/~hughsient/appstream-glib/ Source0: http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-%{version}.tar.xz -BuildRequires: glib2-devel >= 2.45.8 +BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libtool BuildRequires: docbook-utils BuildRequires: gtk-doc BuildRequires: gobject-introspection-devel BuildRequires: gperf BuildRequires: libarchive-devel -BuildRequires: libsoup-devel >= 2.51.92 -BuildRequires: gdk-pixbuf2-devel >= 2.31.5 +BuildRequires: libsoup-devel >= %{libsoup_version} +BuildRequires: gdk-pixbuf2-devel >= %{gdk_pixbuf_version} BuildRequires: gtk3-devel BuildRequires: gettext BuildRequires: intltool BuildRequires: libgcab1-devel BuildRequires: libuuid-devel -BuildRequires: json-glib-devel >= 1.1.1 +BuildRequires: json-glib-devel >= %{json_glib_version} # for the builder component BuildRequires: fontconfig-devel @@ -34,6 +39,12 @@ BuildRequires: gcab BuildRequires: libxslt BuildRequires: docbook-style-xsl +# Make sure we pull in the minimum required versions +Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf_version} +Requires: glib2%{?_isa} >= %{glib2_version} +Requires: json-glib%{?_isa} >= %{json_glib_version} +Requires: libsoup%{?_isa} >= %{libsoup_version} + # no longer required Obsoletes: appdata-tools < 0.1.9 Provides: appdata-tools @@ -138,6 +149,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_datadir}/gir-1.0/AppStreamBuilder-1.0.gir %changelog +* Fri Jul 01 2016 Kalev Lember 0.5.16-2 +- Set minimum required versions for dependencies + * Mon Jun 13 2016 Richard Hughes 0.5.16-1 - New upstream release - Add elementary to list of project groups