diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-08-17 13:05:14 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-08-17 13:05:14 +0000 |
| commit | dcbf4039dc03fb2c05279506e1320079790e11c3 (patch) | |
| tree | d5e1b32c2b110f33e8d950c1b4fa84a7967d08c5 | |
| parent | 948d68d30a7cc9c3745a18b987a45e7f8c7e016c (diff) | |
| download | spec-helper-dcbf4039dc03fb2c05279506e1320079790e11c3.tar spec-helper-dcbf4039dc03fb2c05279506e1320079790e11c3.tar.gz spec-helper-dcbf4039dc03fb2c05279506e1320079790e11c3.tar.bz2 spec-helper-dcbf4039dc03fb2c05279506e1320079790e11c3.tar.xz spec-helper-dcbf4039dc03fb2c05279506e1320079790e11c3.zip | |
no_comment
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | clean_perl | 19 | ||||
| -rwxr-xr-x | spec-helper | 6 | ||||
| -rw-r--r-- | spec-helper.spec | 3 |
5 files changed, 25 insertions, 8 deletions
@@ -1,6 +1,7 @@ 2000-08-17 Pixel <pixel@mandrakesoft.com> - * spec-helper: add a rule to remove .packlist's + * spec-helper: add a rule to call clean_perl + * clean_perl: created, removes .packlist, empty *.bs and *.ix * Makefile (rpm): change the dependency to dis 2000-07-29 22:19 Chmouel Boudjnah <chmouel@mandrakesoft.com> @@ -8,7 +8,7 @@ #--------------------------------------------------------------- VERSION=0.3 -FILES= spec-helper clean_files compress_files strip_files relative_me_babe +FILES= spec-helper clean_files clean_perl compress_files strip_files relative_me_babe DISTFILES= Makefile ChangeLog Howto-spec-helper $(FILES) macroszification NAME=spec-helper DIST=$(NAME)-$(VERSION) diff --git a/clean_perl b/clean_perl new file mode 100755 index 0000000..7cb3fb2 --- /dev/null +++ b/clean_perl @@ -0,0 +1,19 @@ +#!/bin/sh -x + +d=$RPM_BUILD_ROOT/usr/lib/perl5 + +[ -d $d ] || exit 0 + + +find $d -name ".packlist" | xargs rm -f + +for i in $(find $d -name "*.bs"); do + if [ -s $i ]; then + echo "non empty *.bs file, please mail pixel@mandrakesoft.com about this!" + else + rm -f $i + fi +done + +# remove .ix's +find $d -name "*.ix" | xargs rm -f diff --git a/spec-helper b/spec-helper index bb6a5e1..7a7f10e 100755 --- a/spec-helper +++ b/spec-helper @@ -39,15 +39,11 @@ while [ $# != 0 ]; do shift done -unlink_packlist() { - find $RPM_BUILD_ROOT -name ".packlist" -exec rm -f '{}' ';' # remove .packlist's, unneeded by perl packages -} - test -z "$DONT_CLEANUP" && echo -n "Cleaning files..." && clean_files && echo "done" test -z "$DONT_COMPRESS" && echo -n "Compressing files..." && compress_files && echo "done" test -z "$DONT_STRIP" && echo -n "Stripping files..." && strip_files && echo "done" test -z "$DONT_RELINK" && echo -n "Relativisation of symlinks..." && relative_me_babe && echo "done" -test -z "$DONT_UNLINK_PACKLIST" && echo -n "Removing .packlist's..." && unlink_packlist && echo "done" +test -z "$DONT_CLEAN_PERL" && echo -n "Clean perl..." && clean_perl && echo "done" exit 0 diff --git a/spec-helper.spec b/spec-helper.spec index 104c801..52a321b 100644 --- a/spec-helper.spec +++ b/spec-helper.spec @@ -40,7 +40,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Aug 17 2000 Pixel <pixel@mandrakesoft.com> 0.3-3mdk -- spec-helper: add a rule to remove .packlist's +- spec-helper: add a rule to call clean_perl +- clean_perl: created, removes .packlist and empty *.bs - Makefile (rpm): change the dependency to dis * Thu Jul 27 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 0.3-2mdk |