summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-01-11 08:42:47 +0100
committerRemi Collet <remi@remirepo.net>2019-01-11 08:42:47 +0100
commit750e7232b80739fb2f53b3e20a7b32b439bc3675 (patch)
treebfb4fc964864ee382089163c07fbd904328a61ac
parent29e9e6239f730d8ca4d7916488d9b2b46f8aec85 (diff)
improve dependency filteringHEADmaster
-rw-r--r--libmemcached-last.spec27
1 files changed, 8 insertions, 19 deletions
diff --git a/libmemcached-last.spec b/libmemcached-last.spec
index 6b3e022..0c1f03e 100644
--- a/libmemcached-last.spec
+++ b/libmemcached-last.spec
@@ -3,7 +3,7 @@
#
# Fedora spec file for libmemcached
#
-# Copyright (c) 2009-2018 Remi Collet
+# Copyright (c) 2009-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -28,7 +28,7 @@ Name: %{libname}
Summary: Client library and command line tools for memcached server
Version: 1.0.18
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
URL: http://libmemcached.org/
# Original sources:
@@ -51,7 +51,7 @@ BuildRequires: memcached
BuildRequires: systemtap-sdt-devel
%if 0%{?rhel} == 6
-Requires: libevent2-devel
+BuildRequires: libevent2-devel
%else
BuildRequires: libevent-devel > 2
%endif
@@ -103,19 +103,6 @@ you will need to install %{name}-devel.
%package libs
Summary: %{libname} libraries
-%if %{move_to_opt}
-%if 0%{?rhel} == 6
-Requires: libevent2%{_isa}
-%else
-Requires: libevent%{_isa} > 2
-%endif
-Requires: openssl%{?_isa}
-Requires: libstdc++%{?_isa}
-%if %{with_sasl}
-Requires: cyrus-sasl-lib%{?_isa}
-%endif
-%endif
-
%description libs
This package contains the %{libname} libraries version %{version}.
%if "%{libname}" != "%{name}"
@@ -125,9 +112,8 @@ This package is designed to be installed beside %{libname}.
%if %{move_to_opt}
# Filter in the /opt installation
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so}
-%{?filter_requires_in: %filter_requires_in %{_libdir}/.*\.so}
-%{?filter_requires_in: %filter_requires_in %{_bindir}/.*}
+%{?filter_from_provides: %filter_from_provides /libhashkit/d;/libmemcached/d}
+%{?filter_from_requires: %filter_from_requires /libhashkit/d;/libmemcached/d}
%{?filter_setup}
%endif
@@ -245,6 +231,9 @@ make test
%{_mandir}/man3/hashkit*
%changelog
+* Fri Jan 11 2019 Remi Collet <remi@remirepo.net> - 1.0.18-2
+- improve dependency filtering
+
* Tue Nov 20 2018 Remi Collet <remi@remirepo.net> - 1.0.18-1
- rename to libmemcached-opt and install in /opt/libmemcached