From 0949401e7084d42457ecf673fceefc9643f91348 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Fri, 9 Feb 2007 15:36:55 +0000
Subject: update Makefile

---
 Makefile | 52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2c2b0f2..f698bac 100644
--- a/Makefile
+++ b/Makefile
@@ -4,48 +4,54 @@ RELEASE := $(shell rpm -q --qf '%{release}\n' --specfile $(NAME).spec | head -1)
 RELTAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
 
 SUBDIRS=scripts fb fbmngplay fbtruetype splash po
+FILES=$(SUBDIRS) Makefile bootsplash.spec ChangeLog README
 
 prefix=/
 sharedir=/usr/share
 configdir=/etc
 RPM=$(HOME)/rpm
 
+SVNSOFT=svn+ssh://svn.mandriva.com/svn/soft/build_system/iurt/
+SVNNAME=svn+ssh://svn.mandriva.com/svn/packages/cooker/iurt/current/
+
 all: 
 	@for i in $(SUBDIRS);do	make -C $$i all;done
 
 install:
 	@for i in $(SUBDIRS);do	make -C $$i install;done
 
-dis: clean 
-	rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
-	mkdir -p $(NAME)-$(VERSION)
-	find . -not -name "$(NAME)-$(VERSION)"|cpio -pd $(NAME)-$(VERSION)/
-	find $(NAME)-$(VERSION) -type d -name CVS -o -name .cvsignore -o -name unused |xargs rm -rf
-	tar cf ../$(NAME)-$(VERSION).tar $(NAME)-$(VERSION)
-	bzip2 -9f ../$(NAME)-$(VERSION).tar
+dir:
+	mkdir $(NAME)-$(VERSION)
+
+tar:  dir localcopy
+	tar cvf $(NAME).tar $(NAME)-$(VERSION)
 	rm -rf $(NAME)-$(VERSION)
 
+localcopy:                                                                                                                                              
+	tar c --exclude=.svn $(FILES) | tar x -C $(NAME)-$(VERSION)   
+
+
 clean:
 	@for i in $(SUBDIRS);do	make -C $$i clean;done
 	rm -f *~ \#*\#
 
-changelog: ../common/username
-	( cvs2cl --accum -U ../common/username -I ChangeLog -I tmp/ ; \
-	rm -f ChangeLog.bak ; \
-	cvs commit -m "Generated by cvs2cl the `date '+%c'`" ChangeLog ; \
-	)
+svntag:
+	svn cp -m 'version $(VERSION)' $(SVNSOFT)/trunk $(SVNNAME)/tag/v$(VERSION)
 
-cvstag:
-	echo $(RELTAG)
-	cvs commit
-	cvs tag $(RELTAG)
+ci: tar
+	svn ci -m 'Update soft SPEC for version $(VERSION)' $(NAME).spec
+	mkdir svn; cd svn; mdvsys co $(NAME)
+	cp $(NAME).spec svn/$(NAME)/SPECS/
+	cp $(NAME).tar svn/$(NAME)/SOURCES/
+	cd svn/$(NAME)/; mdvsys ci -m 'update tarball and spec for version $(VERSION)' 
 
-rpm: changelog cvstag dis ../$(NAME)-$(VERSION).tar.bz2 $(RPM)
-	cp -f ../$(NAME)-$(VERSION).tar.bz2 $(RPM)/SOURCES
-	-rpm -ba --clean $(NAME).spec
-	rm -f ../$(NAME)-$(VERSION).tar.bz2
+rpm: clean ci
+	cd svn/$(NAME); bm
 
-localrpm: dis ../$(NAME)-$(VERSION).tar.bz2 $(RPM)
-	cp -f ../$(NAME)-$(VERSION).tar.bz2 $(RPM)/SOURCES
+localrpm: tar $(RPM)
+	cp -f $(NAME).tar $(RPM)/SOURCES
 	-rpm -ba --clean $(NAME).spec
-	rm -f ../$(NAME)-$(VERSION).tar.bz2
+	rm -f $(NAME).tar
+
+submit: clean ci
+	mdvsys submit $(NAME)
-- 
cgit v1.2.1