summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xfind-provides-without-python-sonames.sh15
-rw-r--r--python34.spec10
2 files changed, 1 insertions, 24 deletions
diff --git a/find-provides-without-python-sonames.sh b/find-provides-without-python-sonames.sh
deleted file mode 100755
index 7a9e224..0000000
--- a/find-provides-without-python-sonames.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# The standard find-provides script
-# adds provides lines for all SONAME directives in all shared libraries,
-# even if those libraries are not in the LD_LIBRARY_PATH
-
-# This leads to the rpm having a redundant Provides "foo.so" for all of the
-# various foo.so Python c modules
-
-# So we strip out all /usr/lib/python lines first, before running them through
-# the standard script:
-grep -v "/usr/lib/python" | grep -v "/usr/lib64/python" | \
- /usr/lib/rpm/redhat/find-provides
-
-exit 0
diff --git a/python34.spec b/python34.spec
index 9e8c0b6..243baff 100644
--- a/python34.spec
+++ b/python34.spec
@@ -194,12 +194,6 @@ BuildRequires: python-rpm-macros
Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
-# Avoid having various bogus auto-generated Provides lines for the various
-# python c modules' SONAMEs:
-Source1: find-provides-without-python-sonames.sh
-%global _use_internal_dependency_generator 0
-%global __find_provides %{SOURCE1}
-
# Supply an RPM macro "py_byte_compile" for the python3-devel subpackage
# to enable specfiles to selectively byte-compile individual files and paths
# with different Python runtimes as necessary:
@@ -769,9 +763,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.python.org/
-# We'll not provide this, on purpose
+# We don't want to provide this
# No package in Fedora shall ever depend on this
-# Provides: python(abi) = %{pybasever}
%global __requires_exclude ^python\\(abi\\) = 3\\..$
%global __provides_exclude ^python\\(abi\\) = 3\\..$
@@ -789,7 +782,6 @@ No security fixes will be applied.
%prep
%setup -q -n Python-%{version}%{?prerel}
-chmod +x %{SOURCE1}
%if 0%{?with_systemtap}
# Provide an example of usage of the tapset: