gunnar: server/kolab-webadmin Makefile, 1.10, 1.11 kolab-webadmin.spec, 1.17, 1.18

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin
In directory doto:/tmp/cvs-serv1306

Modified Files:
	Makefile kolab-webadmin.spec 
Log Message:
Fix some whitespace and a set of syntaxc errors.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	27 Jul 2007 10:30:33 -0000	1.10
+++ Makefile	22 Aug 2007 06:53:01 -0000	1.11
@@ -1,6 +1,15 @@
-PACKAGE=kolab-webadmin
-VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
-RELEASE:=`date '+%Y%m%d'`
+PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
+BASE_VERSION = $(shell grep "%define[ ]*V_base_version" *.spec | sed -e "s/.*V_base_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+CVS = $(shell grep "%define[ ]*V_cvs" *.spec | sed -e "s/.*V_cvs\s*\([01]\).*/\1/")
+
+ifeq "x$(CVS)" "x1"
+VERSION=$(BASE_VERSION).cvs
+TAR=$(PACKAGE)-$(VERSION)-$(RELEASE).tar.bz2
+else
+VERSION=$(BASE_VERSION)
+TAR=$(PACKAGE)-$(VERSION).tar.bz2
+endif
 
 ifeq "x$(RPM)" "x"
   RPM = $(HOME)/bin/openpkg rpm
@@ -15,19 +24,36 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-all:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
+.PHONY: clean_all
+clean_all: clean
+
+.PHONY: clean
+clean:
+	rm -rf $(HOME)/RPM/TMP/$(PACKAGE)*
+	find . -name "*~" | xargs rm -rf
+	rm -rf *.src.rpm
+	rm -rf *.tar.bz2
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TAR)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab \
-	&& make clean distcheck && mv $(PACKAGE)-$(VERSION).tar.bz2 $(KOLABRPMSRC)/$(PACKAGE) 
-	cp $(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version CVS'
 
-binary:
-	$(RPM) -bB $(PACKAGE).spec
+	cp $(TAR) $(KOLABRPMSRC)/$(PACKAGE)/
 
-release:
-	tar cvzf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)
-	$(RPM) -ba $(PACKAGE).spec
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
-dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
+.PHONY: tardist
+tardist: $(TAR)
+
+$(TAR): admin/*.php
+	for PO in admin/locale/**/LC_MESSAGES/messages.po;do msgfmt -o $${PO/po/mo} $${PO};done
+	tar cjf $@ admin --exclude="CVS" --exclude="*~" --exclude=".cvsignore"

Index: kolab-webadmin.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolab-webadmin.spec	17 Aug 2007 18:25:38 -0000	1.17
+++ kolab-webadmin.spec	22 Aug 2007 06:53:01 -0000	1.18
@@ -26,7 +26,7 @@
 #   versions of individual parts
 %define       V_package kolab-webadmin
 %define       V_base_version 2.1.0
-%define       V_release 20070816
+%define       V_release 20070820
 %define       V_cvs 1
 
 %if "%{V_cvs}" == "1"