diff options
-rw-r--r-- | spec-helper.spec | 5 | ||||
-rwxr-xr-x | strip_files | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/spec-helper.spec b/spec-helper.spec index 419a05a..46598c6 100644 --- a/spec-helper.spec +++ b/spec-helper.spec @@ -1,6 +1,6 @@ %define name spec-helper %define version 0.3 -%define release 5mdk +%define release 6mdk Summary: Tools to ease the creation of rpm packages Name: %{name} @@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/spec-helper %changelog +* Mon Sep 4 2000 Pixel <pixel@mandrakesoft.com> 0.3-6mdk +- fix EXCLUDE_FROM_STRIP in strip_files + * Sat Aug 26 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 0.3-5mdk - macroszification: Add initrddir macroszification. - spec-helper.spec: macroszification :-( diff --git a/strip_files b/strip_files index 1178ad2..e681923 100755 --- a/strip_files +++ b/strip_files @@ -16,7 +16,7 @@ use File::Find; # for use by File::Find. It'll fill the following 3 arrays with anything # it finds: my (@shared_libs, @executables, @static_libs); -my $exclude_files=defined($ENV{EXCLUDE_FROM_STRIP}) ? split(' ',$ENV{EXCLUDE_FROM_STRIP}) : undef; +my @exclude_files = split(' ',$ENV{EXCLUDE_FROM_STRIP}); sub testfile { @@ -24,12 +24,10 @@ sub testfile { $fn="$File::Find::dir/$_"; - if ($exclude_files) { - # See if we were asked to exclude this file. - # Note that we have to test on the full filename, including directory. - foreach my $f ($exclude_files) { - return if ($fn=~m/\Q$f\E/); - } + # See if we were asked to exclude this file. + # Note that we have to test on the full filename, including directory. + foreach my $f (@exclude_files) { + return if ($fn=~m/\Q$f\E/); } # Does its filename look like a shared library? |