and again

[bootstrapfs.git] / nodeimage.spec

diff --git a/nodeimage.spec b/nodeimage.spec
index 99de140..da01e7d 100644 (file)
--- a/nodeimage.spec
+++ b/nodeimage.spec
@@ -6,7 +6,6 @@
 %define taglevel 9
 
 # pldistro already in the rpm name
-#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define release %{taglevel}%{?date:.%{date}}
 
 # we don't really need the standard postinstall process from rpm that
@@ -46,7 +45,7 @@ Requires: ed
 Obsoletes: bootstrapfs-%{nodefamily}
 # 5.0 now has 3-fold nodefamily
 %define obsolete_nodefamily %{pldistro}-%{_arch}
-Obsoletes: bootstrapfs-%{obsolete_nodefamily}
+# Obsoletes: bootstrapfs-{obsolete_nodefamily}
 
 AutoReqProv: no
 %define debug_package %{nil}
@@ -78,10 +77,10 @@ for the MyPLC side.
 pushd nodeimage
 ./build.sh %{pldistro} 
 for tar in *.tar *.tar.bz2; do 
-    start=$(date +%H-%M-%S)
+    start=$(date --iso-8601=seconds)
     sha1sum $tar > $tar.sha1sum
     chmod 444 $tar.sha1sum
-    end=$(date +%H-%M-%S)
+    end=$(date --iso-8601=seconds)
     echo "* Computed SHA1 checksum for $tar ($start .. $end) "
 done
 popd
@@ -106,7 +105,7 @@ for fcdistro in $(ls); do
 done
 popd
 
-echo "* nodeconfig/yum done $(date +%H-%M-%S)"
+echo "* nodeconfig/yum done $(date --iso-8601=seconds)"
 
 %install
 rm -rf $RPM_BUILD_ROOT