diff options
| author | Anssi Hannula <anssi@mandriva.org> | 2007-09-08 15:34:39 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mandriva.org> | 2007-09-08 15:34:39 +0000 |
| commit | 19fa30c27fa1424b3f4bc937ed57c159fbd5745f (patch) | |
| tree | 2124466456f6f844c371b2f156f8a109d106be1c /macros.in | |
| parent | 292c72d0ec1ce7086401a5bafaf4965f822158cc (diff) | |
| download | rpm-setup-19fa30c27fa1424b3f4bc937ed57c159fbd5745f.tar rpm-setup-19fa30c27fa1424b3f4bc937ed57c159fbd5745f.tar.gz rpm-setup-19fa30c27fa1424b3f4bc937ed57c159fbd5745f.tar.bz2 rpm-setup-19fa30c27fa1424b3f4bc937ed57c159fbd5745f.tar.xz rpm-setup-19fa30c27fa1424b3f4bc937ed57c159fbd5745f.zip | |
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.
Diffstat (limited to 'macros.in')
| -rw-r--r-- | macros.in | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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} |