common Makefile.common,1.109,1.110

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/pkgs/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20144

Modified Files:
	Makefile.common 
Log Message:
Improve bodhi's update template for the new API (https://fedorahosted.org/bodhi/ticket/207)



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Makefile.common	30 Jul 2008 17:42:18 -0000	1.109
+++ Makefile.common	13 Aug 2008 21:02:19 -0000	1.110
@@ -460,18 +460,32 @@
 bodhi: build-check $(COMMON_DIR)/branches clog 
 	@if [ ! -x "$(BODHI_CLIENT)" ]; then echo "Must have bodhi-client installed"; exit 1; fi
 	@echo -e "\
-# [ $(NAME)-$(VERSION)-$(RELEASE) ]\n\
-# type=[S|B|E] (S=security, B=bugfix, E=enhancement) (required)\n\
-# request=[T|S] (T=testing, S=stable) (default: testing)\n\
-# bug=123,456\n\
-# all other text will be considered to be part of the update notes\n\
-type=" > bodhi.template
+[ $(NAME)-$(VERSION)-$(RELEASE) ]\n\n\
+# bugfix, security, enhancement, newpackage (required)\n\
+type=\n\n\
+# testing, stable\n\
+request=testing\n\n\
+# Bug numbers: 1234,9876\n\
+bugs=\n\n\
+# Description of your update\n\
+notes=Here is where you\n\
+	\tgive an explanation of\n\
+	\tyour update.\n\n\
+# Enable request automation based on the stable/unstable karma thresholds\n\
+autokarma=True\n\
+stable_karma=3\n\
+unstable_karma=-3\n\n\
+# Automatically close bugs when this marked as stable\n\
+close_bugs=True\n\n\
+# Suggest that users restart after update\n\
+suggest_reboot=False\n\
+" > bodhi.template
 	@grep -Z '#' clog | xargs -0n1 | sed -n -e 's,^#\([0-9]*\)$$,\1,p' | xargs | tr ' ' ',' > $(NAME).bugs
 	@if [ `cat $(NAME).bugs` ]; then echo "bug=`cat $(NAME).bugs`" >> bodhi.template; fi
 	@sed -e '/^#/d' < bodhi.template > bodhi.template.orig
 	@if [ -z "$$EDITOR" ]; then vi bodhi.template; else $$EDITOR bodhi.template; fi
 	@if [ -n "`sed -e '/^#/d' < bodhi.template | diff bodhi.template.orig -`" ]; then \
-		$(BODHI_CLIENT) -v --new --release $(subst -,,$(BRANCH)) \
+		$(BODHI_CLIENT) --new --release $(subst -,,$(BRANCH)) \
 			--file bodhi.template $(NAME)-$(VERSION)-$(RELEASE) -u $(BODHI_USER); \
 	else \
 		echo "Bodhi update aborted!"; \