diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-02 09:36:55 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-06-21 12:50:37 +0200 |
| commit | 58480c63c689ee93f5f5693027920269b29b901d (patch) | |
| tree | 405a1654ce27a63758f18c9c931eb9c27ebe8a7f | |
| parent | 06a3b228ad9ca546a0e177f32d470bbe70adadce (diff) | |
| download | rpm-setup-58480c63c689ee93f5f5693027920269b29b901d.tar rpm-setup-58480c63c689ee93f5f5693027920269b29b901d.tar.gz rpm-setup-58480c63c689ee93f5f5693027920269b29b901d.tar.bz2 rpm-setup-58480c63c689ee93f5f5693027920269b29b901d.tar.xz rpm-setup-58480c63c689ee93f5f5693027920269b29b901d.zip | |
also drop old %__find_(provides|requires)
They're still defined by rpm, we just don't support pre mga5 exceptions
mechanism anymore
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | build.macros.in | 3 | ||||
| -rwxr-xr-x | filter.sh | 36 |
4 files changed, 1 insertions, 40 deletions
diff --git a/Makefile.am b/Makefile.am index 351b333..d7d565e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,6 @@ pkg_scripts = \ devel.prov \ devel.req \ drop-ld-no-undefined-for-shared-lib-modules-in-libtool \ - filter.sh \ find-lang.pl \ fix-dlsearch-path-in-libtool-for-multilib \ fix-libtool-from-moving-options-after-libs \ @@ -1,4 +1,5 @@ - kill obsolete %defaultbuildroot +- kill old %__find_(provides|requires) - kill redondant/unmainted macro (mga#4927) Version 2.7 - 26 October 2014, by Pascal Terjan diff --git a/build.macros.in b/build.macros.in index 06718bb..40d1a4d 100644 --- a/build.macros.in +++ b/build.macros.in @@ -72,9 +72,6 @@ # Note: Disable (by commenting out) for legacy compatibility. #%__check_multiarch_files @RPMLIBDIR@/check-multiarch-files %{buildroot} -%__find_provides @RPMVENDORDIR@/filter.sh '%{?_provides_exceptions:%{_provides_exceptions}}%{!?_provides_exceptions: }' '%{?_exclude_files_from_autoprov:%{_exclude_files_from_autoprov}}%{!?_exclude_files_from_autoprov: }' '%{buildroot}' @RPMVENDORDIR@/find-provides -%__find_requires @RPMVENDORDIR@/filter.sh '%{?_requires_exceptions:%{_requires_exceptions}}%{!?_requires_exceptions: }' '%{?_exclude_files_from_autoreq:%{_exclude_files_from_autoreq}}%{!?_exclude_files_from_autoreq: }' '%{buildroot}' @RPMVENDORDIR@/find-requires %{?buildroot:%{buildroot}} %{?_target_cpu:%{_target_cpu}} - %find_lang @RPMVENDORDIR@/find-lang.pl %{buildroot} # stuff below has been deprecated by rpm filetriggers [June 2008] diff --git a/filter.sh b/filter.sh deleted file mode 100755 index cd96fd8..0000000 --- a/filter.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -#--------------------------------------------------------------- -# Project : Mageia -# Module : rpm -# File : filter.sh -# Version : $Id: filter.sh 227371 2007-09-08 15:34:39Z anssi $ -# Author : Frederic Lepied -# Created On : Tue May 13 15:45:17 2003 -# Purpose : filter using grep and first argument the -# command passed as the rest of the command line -#--------------------------------------------------------------- - -GREP_ARG="$1" -FILE_GREP_ARG="$2" -BUILDROOT="$3" -PROG="$4" -shift 4 - -# use ' ' to signify no arg as rpm filter empty strings from -# command line :( -if [ "$FILE_GREP_ARG" != ' ' ]; then - # get rid of double and trailing slashes - BUILDROOT="$(echo "$BUILDROOT" | perl -pe 's,/+,/,g;s,/$,,')" - perl -pe "s,^$BUILDROOT,," | grep -v "$FILE_GREP_ARG" | perl -pe "s,^,$BUILDROOT," -else - cat -fi | \ -$PROG "$@" | \ -if [ "$GREP_ARG" != ' ' ]; then - grep -v "$GREP_ARG" -else - cat -fi -exit ${PIPESTATUS[1]} - -# filter.sh ends here |