From 19fa30c27fa1424b3f4bc937ed57c159fbd5745f Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sat, 8 Sep 2007 15:34:39 +0000 Subject: Handle double slashes in buildroot in filter.sh in new file exception macros, in case tmppath contains a trailing slash as in iurt. This also fixes handling of exception macros that contain spaces, which has been broken for a while. --- macros.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'macros.in') diff --git a/macros.in b/macros.in index ee53095..d676ad9 100644 --- a/macros.in +++ b/macros.in @@ -156,8 +156,8 @@ Group: %{group}\ # Use internal dependency generator rather than external helpers? %_use_internal_dependency_generator 0 -%__find_provides @RPMVENDORDIR@/filter.sh '%{?_provides_exceptions:%{_provides_exceptions}}%{!?_provides_exceptions: }' '%{?_exclude_files_from_autoprov:%{?buildroot:%{buildroot}}%{_exclude_files_from_autoprov}}%{!?_exclude_files_from_autoprov: }' @RPMVENDORDIR@/find-provides -%__find_requires @RPMVENDORDIR@/filter.sh '%{?_requires_exceptions:%{_requires_exceptions}}%{!?_requires_exceptions: }' '%{?_exclude_files_from_autoreq:%{?buildroot:%{buildroot}}%{_exclude_files_from_autoreq}}%{!?_exclude_files_from_autoreq: }' @RPMVENDORDIR@/find-requires %{?buildroot:%{buildroot}} %{?_target_cpu:%{_target_cpu}} +%__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} -- cgit v1.2.1