From 97713d90b5c22d231147100fbbc79c0e02abbfd7 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 3 Jul 2013 15:08:09 +0200 Subject: [PATCH 1/4] rpm: correct AutoRequires filtering on recent Fedora Recent Fedora releases (F17 and newer) do not need the __requires_exclude macro for filtering automatically generated Requires for .so files anymore. It is already sufficient to filter each .so from the Provides. This prevents the following (harmless) warning from being printed during build: Ignoring invalid regex -P ^(?!lib).*.so.*$ Upstream-bug: 972465 --- glusterfs.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 04c9838..01db7a2 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -227,8 +227,8 @@ Provides: %{name}-core = %{version}-%{release} %global __filter_from_req %{?__filter_from_req} | %{__grep} -v -P '^(?!lib).*\.so.*$' %filter_setup %else - # modern rpm and current Fedora - %global __requires_exclude -P ^(?!lib).*\.so.*$ + # modern rpm and current Fedora do not generate requires if the provides + # are filtered %global __provides_exclude_from ^%{_libdir}/glusterfs/%{version}/.*$ %endif @@ -1438,6 +1438,9 @@ fi %endif %changelog +* Wed Jul 3 2013 Niels de Vos +- correct AutoRequires filtering on recent Fedora (#972465) + * Fri Jun 28 2013 Kaleb S. KEITHLEY - 3.4.0-0.8.beta4 - prerelease 3.4.0beta4 for oVirt/vdsm dependencies in Fedora19 From a3fd94b44c3f8c457d395cfed4a587c752805d44 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 5 Jul 2013 11:51:42 +0200 Subject: [PATCH 2/4] Really include xlators/mount/api.so in the glusterfs-api package --- glusterfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index 01db7a2..93c2c21 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1016,7 +1016,7 @@ fi %files api %exclude %{_libdir}/*.so %{_libdir}/libgfapi.* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse* +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api* %if ( 0%{!?_without_ocf:1} ) %files resource-agents @@ -1438,6 +1438,9 @@ fi %endif %changelog +* Fri Jul 5 2013 Niels de Vos +- include xlators/mount/api.so in the glusterfs-api package + * Wed Jul 3 2013 Niels de Vos - correct AutoRequires filtering on recent Fedora (#972465) From 4dc6971ef30458010061484bb38da07063fbebdf Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 8 Jul 2013 07:47:41 -0400 Subject: [PATCH 3/4] glusterfs-3.4.0-0.8.beta4 --- glusterfs.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index 93c2c21..3dc575b 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -55,7 +55,7 @@ Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.4.0 -Release: 0.8%{?prereltag:.%{prereltag}}%{?dist} +Release: 0.9%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -571,6 +571,7 @@ Requires: openstack-swift-account = %{SWIFTVER} Requires: openstack-swift-container = %{SWIFTVER} Requires: openstack-swift-object = %{SWIFTVER} Requires: openstack-swift-proxy = %{SWIFTVER} +Obsoletes: %{name}-swift %endif Requires: memcached Requires: openssl @@ -1438,6 +1439,10 @@ fi %endif %changelog +* Mon Jul 8 2013 Kaleb S. KEITHLEY - 3.4.0-0.9.beta4 +- add Obsolete: glusterfs-swift where we use openstack-swift +- prerelease 3.4.0beta4 for oVirt/vdsm dependencies in Fedora19 + * Fri Jul 5 2013 Niels de Vos - include xlators/mount/api.so in the glusterfs-api package From 68db8666f5b35bfc2df548eb3aac58f6a91ed283 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 8 Jul 2013 07:47:41 -0400 Subject: [PATCH 4/4] glusterfs-3.4.0-0.9.beta4 --- glusterfs.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index 93c2c21..3dc575b 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -55,7 +55,7 @@ Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.4.0 -Release: 0.8%{?prereltag:.%{prereltag}}%{?dist} +Release: 0.9%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -571,6 +571,7 @@ Requires: openstack-swift-account = %{SWIFTVER} Requires: openstack-swift-container = %{SWIFTVER} Requires: openstack-swift-object = %{SWIFTVER} Requires: openstack-swift-proxy = %{SWIFTVER} +Obsoletes: %{name}-swift %endif Requires: memcached Requires: openssl @@ -1438,6 +1439,10 @@ fi %endif %changelog +* Mon Jul 8 2013 Kaleb S. KEITHLEY - 3.4.0-0.9.beta4 +- add Obsolete: glusterfs-swift where we use openstack-swift +- prerelease 3.4.0beta4 for oVirt/vdsm dependencies in Fedora19 + * Fri Jul 5 2013 Niels de Vos - include xlators/mount/api.so in the glusterfs-api package