From 6db74245ca9813cc64edb48b5c4d99dd903eb04f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 20 Jun 2001 21:24:42 +0000 Subject: make it build --- Makefile | 5 +++-- initscripts.spec | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 35c5eb15..53521ccf 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 @@ -98,7 +99,7 @@ check: changelog: 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" > changenew + 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 @@ -114,7 +115,7 @@ 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 cjSpf initscripts-$(VERSION).tar.bz2 initscripts-$(VERSION) + @cd /tmp; tar --bzip2 -cSpf initscripts-$(VERSION).tar.bz2 initscripts-$(VERSION) @rm -rf /tmp/initscripts-$(VERSION) @cp /tmp/initscripts-$(VERSION).tar.bz2 . @rm -f /tmp/initscripts-$(VERSION).tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 73345443..5b0b7639 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -156,7 +156,6 @@ rm -rf $RPM_BUILD_ROOT %config /sbin/ifup %dir /etc/sysconfig/console %config(noreplace) /etc/sysconfig/rawdevices -%config /etc/sysconfig/networking/ifcfg-lo %config /etc/sysconfig/network-scripts/network-functions %config /etc/sysconfig/network-scripts/network-functions-ipv6 %config /etc/sysconfig/network-scripts/ifup-post @@ -172,7 +171,6 @@ rm -rf $RPM_BUILD_ROOT %config /etc/sysconfig/network-scripts/ifup-sit %config /etc/sysconfig/network-scripts/ifdown-sit %config /etc/sysconfig/network-scripts/ifup-aliases -%config /etc/sysconfig/network-scripts/ifup-ipx %ifarch s390 s390x %config /etc/sysconfig/network-scripts/ifup-ctc %config /etc/sysconfig/network-scripts/ifup-iucv -- cgit v1.2.1