From 64d449222c178869bf8c3f2943b50733893abba4 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 21 Sep 2001 16:01:14 +0000
Subject: fix archive generation

---
 Makefile         | 13 +++++++------
 initscripts.spec |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 69d36425..02aa90f9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ SUPERGROUP=root
 
 VERSION=$(shell awk '/Version:/ { print $$2 }' initscripts.spec)
 CVSTAG = r$(subst .,-,$(VERSION))
+CVSROOT = $(shell cat CVS/Root)
 
 mandir=/usr/share/man
 
@@ -59,8 +60,8 @@ check:
 	done
 
 changelog:
-	rcs2log | sed "s|@.*redhat\.com|@redhat.com|" | sed "s|@@|@|" | \
-	 sed "s|/mnt/devel/CVS/initscripts/||g" > changenew
+	@rcs2log | sed "s|@.*redhat\.com|@redhat.com|" | sed "s|@.*redhat\.de|@redhat.com|" | sed "s|@redhat\.de|@redhat.com|" | sed "s|@@|@|" | \
+	 sed "s|/mnt/devel/CVS/initscripts/||g" | sed "s|/cvs/rhl/initscripts/||g" > changenew
 	 mv ChangeLog ChangeLog.old
 	 cat changenew ChangeLog.old > ChangeLog
 	 rm -f changenew
@@ -76,11 +77,11 @@ create-archive: tag-archive
 	@rm -rf /tmp/initscripts
 	@cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) initscripts || echo GRRRrrrrr -- ignore [export aborted]
 	@mv /tmp/initscripts /tmp/initscripts-$(VERSION)
-	@cd /tmp; tar czSpf initscripts-$(VERSION).tar.gz initscripts-$(VERSION)
+	@cd /tmp; tar --bzip2 -cSpf initscripts-$(VERSION).tar.bz2 initscripts-$(VERSION)
 	@rm -rf /tmp/initscripts-$(VERSION)
-	@cp /tmp/initscripts-$(VERSION).tar.gz .
-	@rm -f /tmp/initscripts-$(VERSION).tar.gz 
+	@cp /tmp/initscripts-$(VERSION).tar.bz2 .
+	@rm -f /tmp/initscripts-$(VERSION).tar.bz2 
 	@echo " "
-	@echo "The final archive is ./initscripts-$(VERSION).tar.gz."
+	@echo "The final archive is ./initscripts-$(VERSION).tar.bz2."
 
 archive: clean check tag-archive create-archive
diff --git a/initscripts.spec b/initscripts.spec
index 32672bf9..7e72ec74 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -4,7 +4,7 @@ Version: 5.84.1
 Copyright: GPL
 Group: System Environment/Base
 Release: 1
-Source: initscripts-%{version}.tar.gz
+Source: initscripts-%{version}.tar.bz2
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
 Requires: procps >= 2.0.7-7, sysklogd >= 1.3.31
-- 
cgit v1.2.1