Renamed redhat/ to rpm/

2 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 314457a..3e6370b 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ all:
 	@echo "Usage:"
 	@echo
 	@echo "  make deb         - Builds debian packages."
-	@echo "  make rpm         - Builds redhat packages."
+	@echo "  make rpm         - Builds rpm packages."
 	@echo "  make release     - Generates the release tarball."
 	@echo
 	@echo "  make clean       - Cleanup the local repository build files."
@@ -39,7 +39,7 @@ clean:
 	@rm -frv debian/${NAME}-doc/ debian/python2.5-${NAME}/
 	@rm -frv debian/python2.6-${NAME}/ debian/python-${NAME}/
 	@rm -frv results
-	@rm -fv redhat/*.spec *.spec redhat/sed* sed*
+	@rm -fv rpm/*.spec *.spec rpm/sed* sed*
 	@rm -frv ${NAME}-*
 	@rm -frv *.rpm warn${NAME}.txt build${NAME}
 	@rm -fv debian/*.debhelper.log debian/*.debhelper debian/*.substvars debian/files
@@ -66,11 +66,11 @@ build/release-stamp:
 		build/${NAME}-${VERSION}/${NAME}/__init__.py
 	@echo "Generating rpm specfile from template..."
 	@cd build/${NAME}-${VERSION}; \
-		for spectmpl in redhat/*.spec.tmpl; do \
+		for spectmpl in rpm/*.spec.tmpl; do \
 			sed -i "s/Version:\( *\).*/Version:\1${VERSION}/g" $${spectmpl}; \
 			mv $${spectmpl} $$(basename $${spectmpl} .tmpl); \
 		done; \
-		rmdir redhat
+		rmdir rpm
 	@echo "Generating rpm changelog..."
 	@for commit in $$(git log --date=iso  | grep -e ^commit -e ^Date: \
 		| tr -d '\n' | sed 's/commit /\n/g' | sed 's/Date:  //g' \
diff --git a/redhat/targetcli.spec.tmpl b/rpm/targetcli.spec.tmpl
index 8e55361..8e55361 100644
--- a/redhat/targetcli.spec.tmpl
+++ b/rpm/targetcli.spec.tmpl