From cc5f8d577e39bc1cb8f39aa1f23f13a3f5909248 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 7 Jun 2007 16:02:15 +0000
Subject: sync with latest SVN snapshot before SVN crash

---
 Makefile | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4a746c23..13144add 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-VERSION = $(shell awk '/Version:[ 	]*(.*)/ { print $$2 }' $(NAME).spec)
+VERSION = 10.4.19
 NAME = drakconf
 SUBDIRS = po pixmaps data
 localedir = $(DESTDIR)/usr/share/locale
-RPM=$(HOME)/rpm
 mcc_dir = $(DESTDIR)/usr/share/mcc
 
 override CFLAGS += -DPACKAGE=\"$(NAME)\" -DLOCALEDIR=\"$(localedir)\"
@@ -35,32 +34,13 @@ install: all
 
 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 -name control-center.rc |xargs rm -rf
+	svn export -q . $(NAME)-$(VERSION)
 	find $(NAME)-$(VERSION) -name '*.pl' -o -name control-center | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
 	tar cjf ../$(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
 	rm -rf $(NAME)-$(VERSION)
 
-srpm: dis 
-#       ../$(NAME)-$(VERSION).tar.bz2 $(RPM)
-	chmod 0644 ../$(NAME)-$(VERSION).tar.bz2 *.png #rpmlint is happy
-	cp -f ../$(NAME)-$(VERSION).tar.bz2 $(RPM)/SOURCES
-	cp -f *.png $(RPM)/SOURCES
-	cp -f $(NAME).spec $(RPM)/SPECS/
-	rpm -bs $(NAME).spec
-
-rpm: srpm
-	rpm -bb --clean --rmsource $(NAME).spec
-	rm -f ../$(NAME)-$(VERSION).tar.bz2
-	cvs commit
-
-localrpm: srpm
-	rpm -bb --clean --rmsource $(NAME).spec
-	rm -f ../$(NAME)-$(VERSION).tar.bz2
-
 changelog:
-	cvs2cl -U ../common/username -I ChangeLog --accum -W 400 -F TRUNK
+	svn2cl --authors ../common/username.xml --accum --strip-prefix=soft/control-center/trunk/
 	rm -f ChangeLog.bak
 
 
-- 
cgit v1.2.1