Re: Status of the merge

[Joe Orton <jorton redhat com>]

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.

Can you add these changes?  Allows a standard "make patch CVS=xxxx-yyyy"
and "make unused-patches | xargs cvs rm -f".

--- Makefile.common.~1.52.~	2007-05-03 22:36:56.000000000 +0100
+++ Makefile.common	2007-05-04 10:56:31.000000000 +0100
@@ -400,7 +400,13 @@
 FILTERDIFF := cat
 endif
 
+ifdef CVE
+PATCHFILE := $(NAME)-$(VERSION)-CVE-$(CVE).patch
+SUFFIX := cve$(shell echo $(CVE) | sed s/.*-//)
+else
 PATCHFILE := $(NAME)-$(VERSION)-$(SUFFIX).patch
+endif
+
 patch:
 	@if test -z "$(SUFFIX)"; then echo "Must specify SUFFIX=whatever" ; exit 1; fi
 	(cd $(RPM_BUILD_DIR)/.. && gendiff $(NAME)-$(VERSION) .$(SUFFIX) | $(FILTERDIFF)) > $(PATCHFILE) || true
@@ -445,11 +451,15 @@
 	@echo "	clean			Remove srcs ($(SOURCEFILES)), export dir (cvs-$(TAG)) and srpm ($(NAME)-$(VERSION)-$(RELEASE).src.rpm)"
 	@echo "	patch SUFFIX=<suff>	Create and add a gendiff patch file"
 	@echo "	rediff SUFFIX=<suff>	Recreates a gendiff patch file, retaining comments"
+	@echo "	unused-patches		Print list of patches not referenced by name in specfile"
 	@echo "	gimmespec		Print the name of the specfile"
 
 gimmespec:
 	@echo "$(SPECFILE)"
 
+unused-patches:
+	@for f in *.patch; do if [ -e $$f ]; then grep -q $$f $(SPECFILE) || echo $$f; fi; done
+
 ##################### EXPERIMENTAL ##########################
 # this stuff is very experimental in nature and should not be
 # relied upon until these targets are moved above this line