X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=47993cd1ff0d23055db001382e6da2030ada9802;hb=a6a6fb657c92ac55d0bc24ffbb98d29438530ade;hp=854357b5ac6ca7c0f588d8727a82842f905da395;hpb=adf37430863e18c84137f5688d6e0b50f33eac77;p=myplc.git

diff --git a/myplc.spec b/myplc.spec
index 854357b..47993cd 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -4,7 +4,7 @@
 
 %define name myplc
 %define version 5.0
-%define taglevel 0
+%define taglevel 7
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -61,16 +61,13 @@ Requires: vixie-cron
 %endif
 # planetlab stuff
 Requires: bootmanager
-# make sure to remove 2-fold nodefamily stuff
-Conflicts: bootcd-%{pldistro}-%{_arch}
 Requires: bootcd-%{nodefamily}
 Requires: bootcd-initscripts
 Requires: PLCWWW
 Requires: www-register-wizard
 Requires: nodeconfig
+Requires: nodeyum
 Requires: PLCAPI
-# make sure to remove 2-fold nodefamily stuff
-Conflicts: bootstrapfs-%{pldistro}-%{_arch}
 Requires: bootstrapfs-%{nodefamily}
 Requires: myplc-docs
 Requires: myplc-release
@@ -146,7 +143,7 @@ chmod 444 ${RPM_BUILD_ROOT}/etc/plc_sliceinitscripts/*
 # Install configuration file
 echo "* myplc: Installing configuration file"
 install -D -m 444 plc_config.dtd ${RPM_BUILD_ROOT}/etc/planetlab/plc_config.dtd
-sed -e "s,@PLDISTRO@,%{pldistro},g" -e "s,@FCDISTRO@,%{fcdistro},g" -e "s,@ARCH@,%{_arch},g" \
+sed -e "s,@PLDISTRO@,%{pldistro},g" -e "s,@FCDISTRO@,%{distroname},g" -e "s,@ARCH@,%{_arch},g" \
     default_config.xml > ${RPM_BUILD_ROOT}/etc/planetlab/default_config.xml
 chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/default_config.xml
 
@@ -241,6 +238,36 @@ fi
 
 
 %changelog
+* Tue Jul 06 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - MyPLC-5.0-7
+- disable mod_wsgi
+
+* Mon Jul 05 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - MyPLC-5.0-6
+- module name changes
+- start wsgi support
+
+* Tue Jun 22 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-5.0-5
+- new setting PLC_RESERVATION_GRANULARITY
+
+* Wed May 12 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - MyPLC-5.0-4
+- * partial-repo.sh script
+- * preserve key along with certificates
+
+* Fri Apr 02 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-5.0-3
+- set date.timezone to GMT if not set in php.ini for php-5.3 / fedora12
+
+* Fri Mar 12 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-5.0-2
+- legacy scripts gen-sites-xml & gen-static-content back in (sigh)
+- new OMF category in the config
+- create the drl system slice
+
+* Fri Jan 29 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-5.0-1
+- first working version of 5.0:
+- pld.c/, db-config.d/ and nodeconfig/ scripts should now sit in the module they belong to
+- nodefamily is 3-fold with pldistro-fcdistro-arch
+- new PLC_FLAVOUR config category
+- reviewed module layout
+- cleaned up old chroot-related build stuff (does not need the build module when building anymore)
+
 * Sat Jan 09 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-4.3-37
 - support for fedora 12
 - new package myplc-config for use by sfa