From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 30 Nov 2007 16:57:13 +0000 (+0000)
Subject: attempts to handle plc_config install
X-Git-Tag: myplc-4.0-15~20
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ec296d7e6a6bf9796ed4f5965f64befbf4f1e5cd;p=myplc.git

attempts to handle plc_config install
---

diff --git a/build-native.sh b/build-native.sh
index 6e6b7ae..6146bf6 100755
--- a/build-native.sh
+++ b/build-native.sh
@@ -26,17 +26,13 @@ install -D -m 755 plc-config ${tmpdir}/usr/bin/plc-config
 install -D -m 755 plc-config-tty ${tmpdir}/usr/bin/plc-config-tty
 install -D -m 755 db-config ${tmpdir}/usr/bin/db-config
 install -D -m 755 dns-config ${tmpdir}/usr/bin/dns-config
-install -D -m 755 plc-map.py root/usr/bin/plc-map.py
-install -D -m 755 clean-empty-dirs.py root/usr/bin/clean-empty-dirs.py
-install -D -m 755 mtail.py root/usr/bin/mtail.py
-install -D -m 755 check-ssl-peering.py root/usr/bin/check-ssl-peering.py
-
-echo "* myplc-native: skipping build/install of plc_config.py"
-# XXX needs to be done by %pre script in .spec file
-# install -D -m 755 plc_config.py /tmp/plc_config.py
-# sh -c 'cd ${tmpdir}; python plc_config.py build; python plc_config.py install'
-# XXX needs to be done by %pre script in .spec file
-# sh -c 'chkconfig --add plc; chkconfig plc on'
+install -D -m 755 plc-map.py ${tmpdir}/usr/bin/plc-map.py
+install -D -m 755 clean-empty-dirs.py ${tmpdir}/usr/bin/clean-empty-dirs.py
+install -D -m 755 mtail.py ${tmpdir}/usr/bin/mtail.py
+install -D -m 755 check-ssl-peering.py ${tmpdir}/usr/bin/check-ssl-peering.py
+
+echo "* myplc-native: installing plc_config.py in /usr/share/myplc"
+install -D -m 755 plc_config.py ${tmpdir}/usr/share/myplc/plc_config.py
 
 # Install initscripts
 echo "* myplc-native: Installing initscripts"
diff --git a/myplc-native.spec b/myplc-native.spec
index 37ac24c..af62568 100644
--- a/myplc-native.spec
+++ b/myplc-native.spec
@@ -78,6 +78,7 @@ popd
 
 %install
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -132,6 +133,10 @@ if [ -x /sbin/chkconfig ] ; then
     /sbin/chkconfig --add plc
     /sbin/chkconfig plc on
 fi
+pushd /usr/share/myplc &> /dev/null
+python plc_config.py build
+python plc_config.py install
+popd &> /dev/null
 
 %triggerpostun -- %{name}
 # 0 = erase, 1 = upgrade
@@ -161,19 +166,19 @@ fi
 %defattr(-,root,root,-)
 # Host startup script and configuration file
 /etc/init.d/plc
+/etc/plc.d
+/etc/planetlab
+/var/www/html/install-rpms/planetlab
 /usr/bin/plc-config
 /usr/bin/plc-config-tty
 /usr/bin/db-config
 /usr/bin/dns-config
-#/usr/bin/gen-sites-xml.py*
-#/usr/bin/gen-slices-xml-05.py*
-#/usr/bin/gen-static-content.py*
-/etc/plc.d
-/etc/planetlab
-/var/www/html/install-rpms/planetlab
+/usr/bin/plc-map.py*
+/usr/bin/clean-empty-dirs.py*
+/usr/bin/mtail.py*
+/usr/bin/check-ssl-peering.py*
+/usr/share/myplc/plc_config.py*
 
 %changelog
 * Fri Aug 31 2007 Marc E. Fiuczynski <mef@CS.Princeton.EDU>
 - initial build.
-
-