Fix srpm/rpm/dist/archive for initial review

25 files changed, 27 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index 8f9c31f..9a4eaf9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,29 @@
 NAME 		:= genome-site
-SPECFILE	= $(NAME).spec
-VERSION         := $(shell rpm -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1)
-RELEASE         := $(shell rpm -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1)
-UPSTREAM_NAME   = $(PROJECT)
+SPECFILE	= ${NAME}.spec
+VERSION         = $(shell rpm -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1)
+RELEASE         = $(shell rpm -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1)
 
-TAG             = $(subst .,_,$(NAME)-$(VERSION)-$(RELEASE))
+TAG             = $(subst .,_,${NAME}-${VERSION}-$(RELEASE))
 
 CVS             = cvs
-RPMBUILD	= rpmbuild
-INSTALL         = /usr/bin/install
-INSTALL_DIR     = $(INSTALL) --verbose -d -m 755
-ARCHIVE         = $(NAME)-$(VERSION).tar.gz	
-
-RPM_TOPDIR	= /tmp/$(NAME)-$(VERSION)-$(RELEASE)-build
-_RPM_OPTS	= --define "_topdir	    $(RPM_TOPDIR)" \
-		  --define "_builddir	    %{_topdir}" \
-		  --define "_sourcedir	    $(shell pwd)" \
-		  --define "_specdir	    $(shell pwd)" \
-		  --define "_rpmdir	    $(shell pwd)" \
-		  --define "_srcrpmdir 	    $(shell pwd)" \
-		  --define '_rpmfilename    %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
-RPM_OPTS        = $(strip $(_RPM_OPTS))
-
-rpm: clean $(RPM_TOPDIR) $(SPECFILE) $(ARCHIVE)
-	$(RPMBUILD) --clean $(RPM_OPTS) -bs $(SPECFILE)
-	rm -f $(ARCHIVE)
+
+ARCHIVE         = ${NAME}-${VERSION}.tar.gz	
+
+rpm: clean dist
+	@rpmbuild -ta $(ARCHIVE)
+
+srpm: clean dist
+	@rpmbuild -ts $(ARCHIVE)
 
 clean:
-	@rm -rfv *~ *.rpm $(RPM_TOPDIR) $(ARCHIVE)
+	@rm -rfv *~ *.rpm $(ARCHIVE)
 
-$(ARCHIVE):
-	cd $(NAME)-$(VERSION); tar cvzf ../$(ARCHIVE) ./*; cd ..
+dist:
+	@rm -rf ${NAME}-${VERSION}.tar.gz
+	@rm -rf /tmp/${NAME}-${VERSION} /tmp/${NAME}
+	@dir=$$PWD; cd /tmp; cp -a $$dir ${NAME}
+	@mv /tmp/${NAME} /tmp/${NAME}-${VERSION}
+	@dir=$$PWD; cd /tmp; tar --exclude .git -czvf $$dir/${NAME}-${VERSION}.tar.gz ${NAME}-${VERSION}
+	@rm -rf /tmp/${NAME}-${VERSION}
+	@echo "The archive is in ${NAME}-${VERSION}.tar.gz"
 
-$(RPM_TOPDIR):
-	@$(INSTALL_DIR) $@
diff --git a/genome-site.spec b/genome-site.spec
index 3a58d6c..2c3176f 100644
--- a/genome-site.spec
+++ b/genome-site.spec
@@ -17,24 +17,24 @@ Requires:       php
 Basic web site for genome
 
 %prep
-%setup -c 0
+%setup -q
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/var/www/html
+mkdir -p $RPM_BUILD_ROOT/var/www/genome
 
-cp -r content/* $RPM_BUILD_ROOT/var/www/html
+cp -r genome-site/content $RPM_BUILD_ROOT/var/www/genome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(755,root,root)
-/var/www/html
-%doc
-
+/var/www/genome
 
 %changelog
+* Mon Jul 21 2008 Jeroen van Meeuwen <kanarip@fedoraproject.org> - 1.0.0-14
+- Initial packaging for Fedora Review
diff --git a/genome-site-1.0.0/content/contribute.php b/genome-site/content/contribute.php
index 4920ef7..4920ef7 100644
--- a/genome-site-1.0.0/content/contribute.php
+++ b/genome-site/content/contribute.php
diff --git a/genome-site-1.0.0/content/documentation.php b/genome-site/content/documentation.php
index ca20840..ca20840 100644
--- a/genome-site-1.0.0/content/documentation.php
+++ b/genome-site/content/documentation.php
diff --git a/genome-site-1.0.0/content/download.php b/genome-site/content/download.php
index f187c7d..f187c7d 100644
--- a/genome-site-1.0.0/content/download.php
+++ b/genome-site/content/download.php
diff --git a/genome-site-1.0.0/content/footer.php b/genome-site/content/footer.php
index 34a8c4e..34a8c4e 100644
--- a/genome-site-1.0.0/content/footer.php
+++ b/genome-site/content/footer.php
diff --git a/genome-site-1.0.0/content/header.php b/genome-site/content/header.php
index b5adc47..b5adc47 100644
--- a/genome-site-1.0.0/content/header.php
+++ b/genome-site/content/header.php
diff --git a/genome-site-1.0.0/content/index.html b/genome-site/content/index.html
index 535aa01..535aa01 100644
--- a/genome-site-1.0.0/content/index.html
+++ b/genome-site/content/index.html
diff --git a/genome-site-1.0.0/content/index.php b/genome-site/content/index.php
index 0922671..0922671 100644
--- a/genome-site-1.0.0/content/index.php
+++ b/genome-site/content/index.php
diff --git a/genome-site-1.0.0/content/menu.php b/genome-site/content/menu.php
index f39871b..f39871b 100644
--- a/genome-site-1.0.0/content/menu.php
+++ b/genome-site/content/menu.php
diff --git a/genome-site-1.0.0/content/styles/callout-bg.png b/genome-site/content/styles/callout-bg.png
index c24e5b8..c24e5b8 100644
--- a/genome-site-1.0.0/content/styles/callout-bg.png
+++ b/genome-site/content/styles/callout-bg.png
diff --git a/genome-site-1.0.0/content/styles/default.css b/genome-site/content/styles/default.css
index e50b401..e50b401 100644
--- a/genome-site-1.0.0/content/styles/default.css
+++ b/genome-site/content/styles/default.css
diff --git a/genome-site-1.0.0/content/styles/et_logo.png b/genome-site/content/styles/et_logo.png
index e094b59..e094b59 100644
--- a/genome-site-1.0.0/content/styles/et_logo.png
+++ b/genome-site/content/styles/et_logo.png
diff --git a/genome-site-1.0.0/content/styles/footer_corner.png b/genome-site/content/styles/footer_corner.png
index 090bfce..090bfce 100644
--- a/genome-site-1.0.0/content/styles/footer_corner.png
+++ b/genome-site/content/styles/footer_corner.png
diff --git a/genome-site-1.0.0/content/styles/footer_pattern.png b/genome-site/content/styles/footer_pattern.png
index 647c52a..647c52a 100644
--- a/genome-site-1.0.0/content/styles/footer_pattern.png
+++ b/genome-site/content/styles/footer_pattern.png
diff --git a/genome-site-1.0.0/content/styles/generic.css b/genome-site/content/styles/generic.css
index ba60cad..ba60cad 100644
--- a/genome-site-1.0.0/content/styles/generic.css
+++ b/genome-site/content/styles/generic.css
diff --git a/genome-site-1.0.0/content/styles/genome-expansion.png b/genome-site/content/styles/genome-expansion.png
index 369107d..369107d 100644
--- a/genome-site-1.0.0/content/styles/genome-expansion.png
+++ b/genome-site/content/styles/genome-expansion.png
diff --git a/genome-site-1.0.0/content/styles/genome-high-level.png b/genome-site/content/styles/genome-high-level.png
index 9a51899..9a51899 100644
--- a/genome-site-1.0.0/content/styles/genome-high-level.png
+++ b/genome-site/content/styles/genome-high-level.png
diff --git a/genome-site-1.0.0/content/styles/genome-mainbg.png b/genome-site/content/styles/genome-mainbg.png
index bc20f72..bc20f72 100644
--- a/genome-site-1.0.0/content/styles/genome-mainbg.png
+++ b/genome-site/content/styles/genome-mainbg.png
diff --git a/genome-site-1.0.0/content/styles/genome-mainbgcurve.png b/genome-site/content/styles/genome-mainbgcurve.png
index fd5d180..fd5d180 100644
--- a/genome-site-1.0.0/content/styles/genome-mainbgcurve.png
+++ b/genome-site/content/styles/genome-mainbgcurve.png
diff --git a/genome-site-1.0.0/content/styles/genome.css b/genome-site/content/styles/genome.css
index 7a9d369..7a9d369 100644
--- a/genome-site-1.0.0/content/styles/genome.css
+++ b/genome-site/content/styles/genome.css
diff --git a/genome-site-1.0.0/content/styles/glogo.gif b/genome-site/content/styles/glogo.gif
index 482f026..482f026 100644
--- a/genome-site-1.0.0/content/styles/glogo.gif
+++ b/genome-site/content/styles/glogo.gif
diff --git a/genome-site-1.0.0/content/styles/offbg.png b/genome-site/content/styles/offbg.png
index 4da082f..4da082f 100644
--- a/genome-site-1.0.0/content/styles/offbg.png
+++ b/genome-site/content/styles/offbg.png
diff --git a/genome-site-1.0.0/content/styles/onbg.png b/genome-site/content/styles/onbg.png
index b4973d3..b4973d3 100644
--- a/genome-site-1.0.0/content/styles/onbg.png
+++ b/genome-site/content/styles/onbg.png
diff --git a/genome-site-1.0.0/content/styles/topbg.png b/genome-site/content/styles/topbg.png
index e3853b8..e3853b8 100644
--- a/genome-site-1.0.0/content/styles/topbg.png
+++ b/genome-site/content/styles/topbg.png