From 9bc2e60814e1604740a57048d7762fb3a8552ea6 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@fedoraproject.org>
Date: Wed, 6 Apr 2005 15:47:50 +0000
Subject: [PATCH] - revert Makefile - update .cvsignore

---
 .cvsignore |  8 ++------
 Makefile   | 20 +++++---------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ecd9db0..b189248 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1,3 @@
-Mule-UCS-current.tar.gz
-elisp-manual-21-2.8.tar.bz2
-emacs-21.3
-emacs-21.3.tar.gz
-leim-21.3.tar.gz
+emacs-21.3.50*
+emacs-22.0.50*
 php-mode-1.1.0.tgz
-tramp-2.1.3.tar.gz
diff --git a/Makefile b/Makefile
index 59f9fd1..103b47e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,6 @@
-NAME = emacs
-
-DIST = current
-# only one repo
-ALL_DISTS = no
-
-STAGE_DIR=/fedora/emacs
-REPO_TOP=$(STAGE_DIR)
-REPO=testing
-WEBSITE=people:public_html/emacs/
-
-include ../Makefile.repo
-
-dist:
-	./make-dist
+# Makefile for source rpm: emacs
+# $Id: Makefile,v 1.1 2004/09/09 04:30:11 cvsdist Exp $
+NAME := emacs
+SPECFILE = $(firstword $(wildcard *.spec))
 
+include ../common/Makefile.common