From 60810c28874b16823460c2ba6604bd1ac9a5089b Mon Sep 17 00:00:00 2001
From: Planet-Lab Support <support@planet-lab.org>
Date: Thu, 4 Nov 2004 16:25:33 +0000
Subject: [PATCH] This commit was manufactured by cvs2svn to create tag
 'planetlab-3_0-rc6'.

---
 Makefile  | 21 +++------------------
 ipod.spec | 35 +++++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 338dc58..dbe3395 100644
--- a/Makefile
+++ b/Makefile
@@ -7,31 +7,16 @@
 # test: runs the tests on the current machine
 #
 
-ALLBUILD=pl-poddoit pod ipod-2.0.tar.gz
-PLBIN=/usr/local/planetlab/bin/
-INIT=/etc/init.d/
+ALLBUILD=pl-poddoit pod 
 
 all: $(ALLBUILD)
 
 pod: pod.src disable_pod.sh  enable_pod.sh  status_pod.sh
 	./shell_include --source pod.src --destination pod 
 
-ipod-2.0.tar.gz: pod ipod.spec
-	mkdir ipod-2.0
-	cp ipod.spec disable_pod.sh enable_pod.sh INTEL_LICENSE.txt ipod.patch \
-	Makefile pl-podcntl pl-poddoit.c pl-podset pl-podzap pod.src \
-	README shell_include status_pod.sh test-pod ipod-2.0
-	tar cvfz ipod-2.0.tar.gz ipod-2.0
-	rm -rf ipod-2.0
-
 pl-poddoit: pl-poddoit.c
 	gcc pl-poddoit.c -o pl-poddoit
 
-install: all
-	cp pl-poddoit $(PLBIN)
-	chmod 555 $(PLBIN)/pl-poddoit
-	cp pod $(INIT)
-	chmod 555 $(INIT)/pod
-
 clean:
-	rm -f pod pl-poddoit ipod-2.0.tar.gz
+	rm -f pod pl-poddoit
+
diff --git a/ipod.spec b/ipod.spec
index 3161ead..f021108 100644
--- a/ipod.spec
+++ b/ipod.spec
@@ -1,10 +1,20 @@
+%define name ipod
+%define version 2.0
+%define release 5.planetlab%{?date:.%{date}}
+
+Vendor: PlanetLab
+Packager: PlanetLab Central <support@planet-lab.org>
+Distribution: PlanetLab 3.0
+URL: http://cvs.planet-lab.org/cvs/ipod
+
 Summary: PlanetLab ICMP Ping of Death
-Name: ipod
-Version: 2.0
-Release: 2
+Name: %{name}
+Version: %{version}
+Release: %{release}
 Copyright: GPL
 Group: System Environment/Kernel
-Source: ipod-2.0.tar.gz
+Source: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}root
 
 %description
 Startup service to enable Ping Of Death
@@ -16,13 +26,21 @@ Startup service to enable Ping Of Death
 %build
 make
 
+
 %install
-make install
+mkdir -p $RPM_BUILD_ROOT/usr/local/planetlab/bin
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+
+cp pl-poddoit $RPM_BUILD_ROOT/usr/local/planetlab/bin/
+cp pod $RPM_BUILD_ROOT/etc/init.d/
+
 
 %clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
 
 %files
-%defattr(-, root, root)
+%defattr(0755, root, root)
 /etc/init.d/pod
 /usr/local/planetlab/bin/pl-poddoit
 
@@ -48,3 +66,8 @@ fi
 
 %postun
 
+
+%changelog
+* Mon Apr 12 2004 Aaron Klingaman <alk@cs.princeton.edu>
+- moved to new build process
+- added change log
-- 
2.43.0