Kolab Groupware OBS

Changes of Revision 16

arcanist.spec Changed

update.sh Changed

@@ -46,16 +46,21 @@
 fi
 
 sed -i -r \
-    -e "s/git_short_version_hash .*/git_short_version_hash ${git_short_version_hash}/g" \
-    -e "s/git_full_version_hash .*/git_full_version_hash ${git_full_version_hash}/g" \
-    -e "s/Version:(\s+)0-9+/Version:\1${commitdate}/g" \
+    -e "s/git_short_version_hash .*$/git_short_version_hash ${git_short_version_hash}/g" \
+    -e "s/git_full_version_hash .*$/git_full_version_hash ${git_full_version_hash}/g" \
+    -e "s/revision_date 0-9+$/revision_date ${commitdate}/g" \
     -e "s/Requires:(\s+)arcanist$libphutil$ >= 0-9+/Requires:\1arcanist$libphutil$ >= ${month_behind}/g" \
     -e "s/Requires:(\s+)arcanist$libphutil$ <= 0-9+/Requires:\1arcanist$libphutil$ <= ${month_ahead}/g" \
     arcanist.spec
 
 rpmdev-bumpspec \
     --new="${commitdate}.git${git_short_version_hash}" \
-    --comment "Promote Week #$(date +%V --date ${commitdate})" \
+    --comment "Promote Week #$(date +'%V %Y' --date ${commitdate})" \
+    arcanist.spec
+
+# Thanks, rpmdev-bumpspec ...
+sed -i -r \
+    -e "s/^Version:(\s+).*$/Version:\1%{revision_date}.git%{git_short_version_hash}/g" \
     arcanist.spec
 
 rm -rf *.src.rpm