From 858ffb7e452aad1aae4005cf9d22b30546c0864c Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 20 Nov 2014 16:40:57 +0100 Subject: [PATCH] Fix version in gluster-api.pc so other packages can get rebuild Samba (and others?) fail to rebuild because gluster-api.pc has a lower version than it used to. This has been introduced by the symbol versioning changes. An updated version of GlusterFS should get the correct version in the gluster-api.pc file. Further details can be found in http://review.gluster.org/9154. Related: 1166232 Signed-off-by: Niels de Vos --- glusterfs.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index 6ca0506..1d7edee 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -146,7 +146,7 @@ Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.6.1 -Release: 2%{?prereltag:.%{prereltag}}%{?dist} +Release: 3%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -720,6 +720,17 @@ find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glus install -p -m 0744 -D extras/command-completion/gluster.bash \ %{buildroot}%{_sysconfdir}/bash_completion.d/gluster +## While introducing symbol versioning in libgfapi.so, the pkg-config version +## for gluster-api got reset to 0. This is causing users of pkg-config to be +## confused, they can not reliably check the version anymore. In upstream +## Gluster we have changed the version in gluster-api to 4.3.6.x so that +## existing checks for ">= 4" are still valid. +## +## Upstream bug 1166232, should get fixed in 3.6.2 and then this note + sed +## patching can get dropped from this .spec. +sed -i 's/^Version: 0.0.0/Version: 4.%{version}/' \ + %{buildroot}%{_libdir}/pkgconfig/glusterfs-api.pc + %clean rm -rf %{buildroot} @@ -1048,6 +1059,9 @@ fi %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid %changelog +* Thu Nov 20 2014 Niels de Vos 3.6.1-3 +- Fix version in gluster-api.pc (upstream bug 1166232) + * Wed Nov 19 2014 Lalatendu Mohanty - Changes to remove regression-tests RPM from Fedora