aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile2
-rwxr-xr-xspec-helper5
-rw-r--r--spec-helper.spec6
4 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 57b1f2c..ef0cd19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-17 Pixel <pixel@mandrakesoft.com>
+
+ * spec-helper: add a rule to remove .packlist's
+ * Makefile (rpm): change the dependency to dis
+
2000-07-29 22:19 Chmouel Boudjnah <chmouel@mandrakesoft.com>
* .username: We use now ../common/username
diff --git a/Makefile b/Makefile
index 054e3e6..96aca3c 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ changelog: ../common/username
rm -f ChangeLog.bak
cvs commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog
-rpm: ../$(NAME)-$(VERSION).tar.bz2
+rpm: dis
test -d $(RPM)/SOURCES && test -d $(RPM)/
cp -f ../$(NAME)-$(VERSION).tar.bz2 $(RPM)/SOURCES
-rpm -ba --clean --rmsource $(NAME).spec
diff --git a/spec-helper b/spec-helper
index 2509b73..bb6a5e1 100755
--- a/spec-helper
+++ b/spec-helper
@@ -39,10 +39,15 @@ 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"
exit 0
diff --git a/spec-helper.spec b/spec-helper.spec
index aa21b42..104c801 100644
--- a/spec-helper.spec
+++ b/spec-helper.spec
@@ -1,6 +1,6 @@
%define name spec-helper
%define version 0.3
-%define release 2mdk
+%define release 3mdk
Summary: Tools to ease the creation of rpm packages
Name: %{name}
@@ -39,6 +39,10 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/spec-helper
%changelog
+* Thu Aug 17 2000 Pixel <pixel@mandrakesoft.com> 0.3-3mdk
+- spec-helper: add a rule to remove .packlist's
+- Makefile (rpm): change the dependency to dis
+
* Thu Jul 27 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 0.3-2mdk
- macroszification: Check Prefix only when %{?prefix}? is present in
the spec file