Status of the merge

[Tomas Janousek]

Hi,

On Wed, May 02, 2007 at 03:42:47PM -0700, Jesse Keating wrote:
> Yes, cvs.fedora Makefile.common diverged from Red Hat's internal 
> Makefile.common.  Much in RH's doesn't make sense in Fedora's, but some does.  
> If you find functionality missing, please request specific things get added 
> in.

For all who use private branches, the following patch may be helpful. I added
it to RH's Makefile.common recently, being inspired by `make zstreams'.

---
diff -u -r1.51 Makefile.common
--- Makefile.common	3 May 2007 19:11:07 -0000	1.51
+++ Makefile.common	3 May 2007 20:33:52 -0000
@@ -445,6 +445,28 @@
 gimmespec:
 	@echo "$(SPECFILE)"
 
+privates: $(SPECFILE)
+	@for P_BRANCH in $$(cvs -f log -h $(SPECFILE) | awk '/private-.*-branch/ { print substr($$1, 0, length($$1) - 1) }'); do \
+		P_DIR=$${P_BRANCH%-branch}; \
+		P_DIR=$${P_DIR#private-}; \
+		P_DIR=$(BRANCH)-$${P_DIR}; \
+		pushd .. > /dev/null; \
+		if [ -d $$P_DIR ]; then \
+			cd $$P_DIR; \
+			if [ ! -f CVS/Tag ] || [ $$(cat CVS/Tag) != "T$$P_BRANCH" ]; then \
+				echo "$$P_DIR exists but is not on branch $$P_BRANCH"; \
+				exit 1; \
+			else \
+				echo "Updating $$P_DIR..."; \
+				cvs up; \
+			fi; \
+		else \
+			echo "Checking out $$P_BRANCH into $$P_DIR..."; \
+			cvs co -r $$P_BRANCH -d $$P_DIR rpms/$(NAME)/$(BRANCH); \
+		fi; \
+		popd > /dev/null; \
+	done
+
 ##################### EXPERIMENTAL ##########################
 # this stuff is very experimental in nature and should not be
 # relied upon until these targets are moved above this line

-- 
TJ. (Brno, CZ), BaseOS, Red Hat