aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-06-24 21:24:13 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-06-24 21:29:16 +0200
commitc491c8341d1b842ddae7317ca4de189bd6801af0 (patch)
tree9dced11eabcd4b04449b25a15e1fa19c8debb893
parente49cdb3d16c78f9dba16c394db1d0b8be19822f0 (diff)
downloadrpm-setup-c491c8341d1b842ddae7317ca4de189bd6801af0.tar
rpm-setup-c491c8341d1b842ddae7317ca4de189bd6801af0.tar.gz
rpm-setup-c491c8341d1b842ddae7317ca4de189bd6801af0.tar.bz2
rpm-setup-c491c8341d1b842ddae7317ca4de189bd6801af0.tar.xz
rpm-setup-c491c8341d1b842ddae7317ca4de189bd6801af0.zip
stop emitting perlapi-<version> requires
now that libperl has a proper soname
-rw-r--r--Makefile.am2
-rw-r--r--NEWS2
-rw-r--r--perlapi.attr3
-rwxr-xr-xperlapi.req15
4 files changed, 2 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am
index d7d565e..84d5d49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,6 @@ pkg_scripts = \
http.req \
multiarch.req \
perlapi.prov \
- perlapi.req \
perl_base.req \
perl.prov \
perl.req \
@@ -53,7 +52,6 @@ pkg_attr_defs = \
devel.attr \
multiarch.attr \
perlapi_base.attr \
- perlapi.attr \
perl_base.attr \
perl_from_meta.attr \
php.attr \
diff --git a/NEWS b/NEWS
index b21a045..b23e510 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- stop emitting perlapi-<version> requires
+
Version 2.8 - 21 June 2015, by Thierry Vignaud
- change file digests hashing algorithm to SHA-256
diff --git a/perlapi.attr b/perlapi.attr
deleted file mode 100644
index 34fe519..0000000
--- a/perlapi.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-# --- If libperl.so exists and if XS modules are found, depend on perlapi-<version> and libperl.so
-%__perlapi_requires %{_rpmconfigdir}/mageia/perlapi.req
-%__perlapi_magic Perl script|Perl5 module source
diff --git a/perlapi.req b/perlapi.req
deleted file mode 100755
index 507f74b..0000000
--- a/perlapi.req
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# --- If libperl.so exists and if XS modules are found, depend on perlapi-<version> and libperl.so
-while read instfile ; do
- if perl -V:useshrplib | grep -q true ; then
- if echo $instfile | grep -q `perl -MConfig -e 'print $Config{archname}'` ; then
- version=`perl -MConfig -e 'print $Config{version}'`
- echo perlapi-$version
-
- f=`perl -MConfig -e 'print $Config{archlib}'`/CORE/libperl.so
- lib64=`if file -L $f 2>/dev/null | \
- grep "ELF 64-bit" >/dev/null; then echo "()(64bit)"; fi`
- echo libperl.so$lib64
- fi
- fi
-done