From c9cd9ea4ba3a8399fc1b5400e178f2c23abbbd07 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Tue, 14 Mar 2017 10:30:30 +0100 Subject: [PATCH] Update required versions Update required versions per configure, add version macros for easier maintenance and use pkgconfig where possible. https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires --- gvfs.spec | 84 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 31 deletions(-) diff --git a/gvfs.spec b/gvfs.spec index a60f6a1..e8ecef3 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,5 +1,25 @@ -%global glib2_version 2.49.4 +%global avahi_version 0.6 +%global fuse_version 2.8.0 +%global gettext_version 0.19.4 +%global glib2_version 2.51.0 +%global goa_version 3.17.1 +%global gtk3_version 3.0 +%global gudev_version 147 +%global libarchive_version 3.0.22 +%global libcdio_paranoia_version 0.78.2 +%global libgcrypt_version 1.2.2 %global libgdata_version 0.17.3 +%global libgphoto2_version 2.5.0 +%global libimobiledevice_version 1.2 +%global libmtp_version 1.1.0 +%global libnfs_version 1.9.8 +%global libplist_version 0.15 +%global libsmbclient_version 3.4.0 +%global libsoup_version 2.42.0 +%global libusb_version 1.0.21 +%global systemd_version 206 +%global talloc_version 1.3.0 +%global udisks2_version 1.97 Name: gvfs Version: 1.32.0 @@ -14,24 +34,25 @@ Source0: https://download.gnome.org/sources/gvfs/1.32/gvfs-%{version}.tar.xz Patch0: gvfs-archive-integration.patch BuildRequires: pkgconfig -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: dbus-glib-devel -BuildRequires: gcr-devel +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gcr-3) BuildRequires: /usr/bin/ssh -BuildRequires: libcdio-paranoia-devel -BuildRequires: libgudev1-devel -BuildRequires: libsoup-devel >= 2.34.0 -BuildRequires: pkgconfig(avahi-client) pkgconfig(avahi-glib) -BuildRequires: libsecret-devel -BuildRequires: gettext-devel -BuildRequires: libudisks2-devel -BuildRequires: libbluray-devel -BuildRequires: systemd-devel >= 44 -BuildRequires: libxslt-devel -BuildRequires: gtk3-devel +BuildRequires: pkgconfig(libcdio_paranoia) >= %{libcdio_paranoia_version} +BuildRequires: pkgconfig(gudev-1.0) >= %{gudev_version} +BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} +BuildRequires: pkgconfig(avahi-client) >= %{avahi_version} +BuildRequires: pkgconfig(avahi-glib) >= %{avahi_version} +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: gettext-devel >= %{gettext_version} +BuildRequires: pkgconfig(udisks2) >= %{udisks2_version} +BuildRequires: pkgconfig(libbluray) +BuildRequires: systemd-devel >= %{systemd_version} +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} BuildRequires: docbook-style-xsl -BuildRequires: polkit-devel -BuildRequires: libcap-devel +BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(libcap) # The patch touches Makefile.am files: BuildRequires: automake autoconf @@ -39,7 +60,7 @@ BuildRequires: libtool Requires: %{name}-client%{?_isa} = %{version}-%{release} Requires: glib2%{?_isa} >= %{glib2_version} -Requires: udisks2 +Requires: udisks2 >= %{udisks2_version} # for file triggers Requires(post): desktop-file-utils >= 0.22-6 @@ -75,8 +96,8 @@ required to develop applications using gvfs. %package fuse Summary: FUSE support for gvfs Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: fuse-devel -Requires: fuse +BuildRequires: pkgconfig(fuse) >= %{fuse_version} +Requires: fuse >= %{fuse_version} %description fuse This package provides support for applications not using gio @@ -86,8 +107,8 @@ to access the gvfs filesystems. %package smb Summary: Windows fileshare support for gvfs Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: libsmbclient-devel >= 3.2.0-1.pre2.8 -BuildRequires: libtalloc-devel >= 1.3.0-0 +BuildRequires: libsmbclient-devel >= %{libsmbclient_version} +BuildRequires: pkgconfig(talloc) >= %{talloc_version} %description smb This package provides support for reading and writing files on windows @@ -97,7 +118,7 @@ shares (SMB) to applications using gvfs. %package archive Summary: Archiving support for gvfs Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: libarchive-devel >= 2.7.1-1 +BuildRequires: pkgconfig(libarchive) >= %{libarchive_version} %description archive This package provides support for accessing files inside Zip and Tar archives, @@ -107,8 +128,8 @@ as well as ISO images, to applications using gvfs. %package gphoto2 Summary: gphoto2 support for gvfs Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: libgphoto2-devel -BuildRequires: libusb-devel +BuildRequires: pkgconfig(libgphoto2) >= %{libgphoto2_version} +BuildRequires: libusb-devel >= %{libusb_version} BuildRequires: libexif-devel %description gphoto2 @@ -122,7 +143,8 @@ media players (Media Transfer Protocol) to applications using gvfs. Summary: AFC support for gvfs Requires: %{name}%{?_isa} = %{version}-%{release} Requires: usbmuxd -BuildRequires: libimobiledevice-devel >= 0.9.7 +BuildRequires: pkgconfig(libimobiledevice-1.0) >= %{libimobiledevice_version} +BuildRequires: pkgconfig(libplist) >= %{libplist_version} %description afc This package provides support for reading files on mobile devices @@ -133,7 +155,7 @@ including phones and music players to applications using gvfs. %package afp Summary: AFP support for gvfs Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: libgcrypt-devel >= 1.2.2 +BuildRequires: libgcrypt-devel >= %{libgcrypt_version} # this should ensure having this new subpackage installed on upgrade from older versions Obsoletes: %{name} < 1.9.4-1 @@ -146,7 +168,7 @@ to applications using gvfs. %package mtp Summary: MTP support for gvfs Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: libmtp-devel >= 1.1.0 +BuildRequires: pkgconfig(libmtp) >= %{libmtp_version} %description mtp This package provides support for reading and writing files on @@ -156,7 +178,7 @@ MTP based devices (Media Transfer Protocol) to applications using gvfs. %package nfs Summary: NFS support for gvfs Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: libnfs-devel >= 1.9.7 +BuildRequires: pkgconfig(libnfs) >= %{libnfs_version} %description nfs This package provides support for reading and writing files on @@ -166,8 +188,8 @@ NFS network shares (Network File System) to applications using gvfs. %package goa Summary: GOA support for gvfs Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: gnome-online-accounts-devel >= 3.7.1 -BuildRequires: libgdata-devel >= %{libgdata_version} +BuildRequires: pkgconfig(goa-1.0) >= %{goa_version} +BuildRequires: pkgconfig(libgdata) >= %{libgdata_version} Requires: libgdata%{?_isa} >= %{libgdata_version} %description goa