Tagging module MyPLC - MyPLC-4.2-8

[myplc.git] / myplc-native.spec

diff --git a/myplc-native.spec b/myplc-native.spec
index 71495e4..ebc137e 100644 (file)
--- a/myplc-native.spec
+++ b/myplc-native.spec
@@ -5,7 +5,7 @@
 
 %define name myplc-native
 %define version 4.2
-%define taglevel 3
+%define taglevel 8
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -17,6 +17,7 @@ License: PlanetLab
 Group: Applications/Systems
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch: noarch
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -60,7 +61,7 @@ Requires: postgresql
 Requires: openssh
 Requires: cvs
 Requires: dev
-Requires: bootcd
+Requires: bootcd-%{pldistro}-%{_arch}
 Requires: dnsmasq
 Requires: diffutils
 Requires: gzip
@@ -69,7 +70,7 @@ Requires: findutils
 Requires: PLCWWW
 Requires: nodeconfig
 Requires: PLCAPI
-Requires: bootstrapfs
+Requires: bootstrapfs-%{pldistro}-%{_arch}
 
 Provides: myplc
 
@@ -90,7 +91,7 @@ system.
 %build
 pushd MyPLC
 rm -rf $RPM_BUILD_ROOT
-./build-native.sh $RPM_BUILD_ROOT
+./build-native.sh %{pldistro} $RPM_BUILD_ROOT
 popd
 
 %install
@@ -182,12 +183,14 @@ fi
 %files
 %defattr(-,root,root,-)
 # Host startup script and configuration file
+/etc/myplc-release
 /etc/init.d/plc
 /etc/plc.d
 /etc/planetlab
-/etc/plc_sliceinitscripts/sirius.py
-/etc/support-scripts/gen_aliases.py
-/etc/support-scripts/renew_reminder.py
+/etc/plc_sliceinitscripts/sirius
+/etc/support-scripts/gen_aliases.py*
+/etc/support-scripts/renew_reminder.py*
+/var/www/html/install-rpms/%{pldistro}-%{_arch}
 /var/www/html/install-rpms/planetlab
 /usr/bin/plc-config
 /usr/bin/plc-config-tty
@@ -200,6 +203,36 @@ fi
 /usr/share/myplc
 
 %changelog
+* Thu Apr 24 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-4.2-8
+- plc.d/bootcd step altered for handling legacy bootcd smooth migration
+- to new bootcd packaging
+
+* Wed Apr 23 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-4.2-7
+- changes needed for bootcd 4.2 : new, possible multiple, installation locations, and new rpm name
+
+* Tue Apr 22 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-4.2-6
+- packaging of mplc-release in myplc-native
+- sudoers.php is new to PlanetLabConf (needs nodeconfig-4.2-4)
+- resolv file in /etc/resolv.conf, not plc_resolv.conf
+- improved sirius script
+- remove the 'driver' node-network-setting that was unused, and new 'Multihome' category
+- expires more properly set 
+
+* Mon Apr 07 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - MyPLC-4.2-4 MyPLC-4.2-5
+- 
+
+* Wed Mar 26 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-4.2-3 MyPLC-4.2-4
+- renew_reminder script moved to support-scripts/
+- gen-aliases script added in support-scripts/
+- sirius initscript moved to plc_sliceinitscripts (formerly inlined in db-config)
+- plc-map script : no javascript for googlemap anymore, see new plc-kml script instead
+- nodefamily-aware (creates legacy symlink /var/www/html/install-rpms/planetlab)
+- new native slice attributes 'capabilities', 'vsys' and 'codemux'
+- new setting 'Mom list address' for sending emails to a separate destination
+- starts rsyslogd/syslogd as appropriate
+- expects nodeconfig package (former PlanetLabConf/ dir from PLCWWW)
+- convenience generation of yum.conf in resulting image based on build/mirroring
+
 * Thu Feb 14 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-4.2-2 myplc-4.2-3
 - refresh-peer.py removed (duplicate with PLCAPI)
 - plc.d/ scripts cleaned up