From 2a81a653b0433eacd11117982cd2faa3e22f11df Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 31 Aug 2007 17:46:11 +0000 Subject: [PATCH] No need to include the content from new_plc_www in the RPM, as this will come from the PLCWWW rpm in the future --- build-native.sh | 13 +------------ myplc-native.spec | 46 +++++----------------------------------------- 2 files changed, 6 insertions(+), 53 deletions(-) diff --git a/build-native.sh b/build-native.sh index 34525c7..2d7f720 100755 --- a/build-native.sh +++ b/build-native.sh @@ -9,7 +9,7 @@ # Marc E. Fiuczynski # Copyright (C) 2007 The Trustees of Princeton University # -# $Id: build-native.sh,v 1.1.2.3 2007/08/31 06:52:55 mef Exp $ +# $Id: build-native.sh,v 1.1.2.4 2007/08/31 06:53:39 mef Exp $ # . build.functions @@ -51,22 +51,11 @@ install -m 755 \ $srcdir/plc/scripts/gen-static-content.py \ ${tmpdir}/usr/bin/ -# Install web pages -echo "* myplc-native: Installing web pages" -mkdir -p ${tmpdir}/var/www/html -rsync -a $srcdir/new_plc_www/ ${tmpdir}/var/www/html/ - -# Install Drupal rewrite rules -install -D -m 644 $srcdir/new_plc_www/drupal.conf ${tmpdir}/etc/httpd/conf.d/drupal.conf - # Install configuration file echo "* myplc: Installing configuration file" install -D -m 444 plc_config.xml ${tmpdir}/etc/planetlab/default_config.xml install -D -m 444 plc_config.dtd ${tmpdir}/etc/planetlab/plc_config.dtd -# Remove generated bootmanager script -rm -f ${tmpdir}/var/www/html/boot/bootmanager.sh - # Initialize node RPMs directory. The PlanetLab-Bootstrap.tar.bz2 # tarball already contains all of the node RPMs pre-installed. Only # updates or optional packages should be placed in this directory. diff --git a/myplc-native.spec b/myplc-native.spec index d7ac4ff..3c3a1a1 100644 --- a/myplc-native.spec +++ b/myplc-native.spec @@ -1,4 +1,4 @@ -Vendor: PlanetLab +>Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab 4.0 URL: http://cvs.planet-lab.org/cvs/myplc @@ -116,8 +116,7 @@ fi %files %defattr(-,root,root,-) # Host startup script and configuration file -%{_sysconfdir}/init.d/plc -# %{_sysconfdir}/sysconfig/plc +/etc/init.d/plc /usr/bin/plc-config /usr/bin/plc-config-tty /usr/bin/db-config @@ -125,44 +124,9 @@ fi /usr/bin/gen-sites-xml.py* /usr/bin/gen-slices-xml-05.py* /usr/bin/gen-static-content.py* -/etc/httpd/conf.d/drupal.conf - -%dir /etc/plc.d/* -%dir /etc/planetlab/* -%dir /var/www/html/* -%dir /var/www/html/PLCAPI/* -%dir /var/www/html/PlanetLabConf/* -%dir /var/www/html/PlanetLabConf/RootResources/* -%dir /var/www/html/PlanetLabConf/ntp/* -%dir /var/www/html/PlanetLabConf/ntp/host/* -%dir /var/www/html/boot/* -%dir /var/www/html/database/* -%dir /var/www/html/includes/* -%dir /var/www/html/install-rpms/planetlab/* -%dir /var/www/html/misc/* -%dir /var/www/html/modules/* -%dir /var/www/html/modules/taxonomy_block/* -%dir /var/www/html/planetlab/* -%dir /var/www/html/planetlab/addresses/* -%dir /var/www/html/planetlab/includes/* -%dir /var/www/html/planetlab/includes/js/* -%dir /var/www/html/planetlab/nodes/* -%dir /var/www/html/planetlab/peers/* -%dir /var/www/html/planetlab/persons/* -%dir /var/www/html/planetlab/pub/* -%dir /var/www/html/planetlab/sirius/* -%dir /var/www/html/planetlab/sites/* -%dir /var/www/html/planetlab/slices/* -%dir /var/www/html/plot-latlong/* -/var/www/html/plot-latlong/.mapinfo -%dir /var/www/html/plot-latlong/.mapimages/* -%dir /var/www/html/scripts/* -%dir /var/www/html/sites/default/* -%dir /var/www/html/themes/bluemarine/* -%dir /var/www/html/themes/chameleon/* -%dir /var/www/html/themes/chameleon/marvin/* -%dir /var/www/html/themes/engines/phptemplate/* -%dir /var/www/html/themes/pushbutton/* +/etc/plc.d +/etc/planetlab +/var/www/html/install-rpms/planetlab %changelog * Fri Aug 31 2007 Marc E. Fiuczynski -- 2.43.0