summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2010-01-24 11:37:47 +0000
committerAnssi Hannula <anssi@mandriva.org>2010-01-24 11:37:47 +0000
commit4b2b99bd92226d1de915d5ecd0c663affdba3ede (patch)
tree754ce9205929951db6dad87ec30248a7d5485d63 /Makefile
parentbc14034884ba1c3767f0c249851a50c9749a90ec (diff)
downloadmultiarch-utils-4b2b99bd92226d1de915d5ecd0c663affdba3ede.tar
multiarch-utils-4b2b99bd92226d1de915d5ecd0c663affdba3ede.tar.gz
multiarch-utils-4b2b99bd92226d1de915d5ecd0c663affdba3ede.tar.bz2
multiarch-utils-4b2b99bd92226d1de915d5ecd0c663affdba3ede.tar.xz
multiarch-utils-4b2b99bd92226d1de915d5ecd0c663affdba3ede.zip
- Update multiarch-utils tree to SVN era:
o remove .spec o add NEWS o remove ChangeLog from SVN, build it at makedist-time o adapt Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile37
1 files changed, 9 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index b2c93cd..93ca09f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,19 +15,15 @@ RPM_BIN_FILES = mkmultiarch check-multiarch-files
BINARIES = multiarch-platform multiarch-dispatch
INCLUDES = multiarch-dispatch.h
XCONFIGS = multiarch-dispatch-host.def
-OTHER_FILES = Makefile multiarch-utils.spec ChangeLog
+OTHER_FILES = Makefile NEWS
FILES = $(foreach file,$(RPM_MACRO_FILES),macros.$(file)) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(XCONFIGS) $(OTHER_FILES)
PACKAGE = multiarch-utils
-VERSION := $(shell rpm -q --qf %{VERSION} --specfile $(PACKAGE).spec)
-RELEASE := $(shell rpm -q --qf %{RELEASE} --specfile $(PACKAGE).spec)
-TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
-MULTIARCH_DIST := $(shell sed -n '/^%define *multiarch_distro *\([0-9]*\)/s//\1/p' $(PACKAGE).spec)
-
-RPMOPT = --clean --rmspec
+VERSION = 1.0.9
+MULTIARCH_DIST = 1020
all:
- @echo "nothing to be done for $(PACKAGE)-$(VERSION)-$(RELEASE)"
+ @echo "nothing to be done for $(PACKAGE)-$(VERSION)"
clean: cleandist
rm -f *~
@@ -50,11 +46,7 @@ install:
-mkdir -p $(DESTDIR)$(prefix)/X11R6/lib/X11/config
install -m644 $(XCONFIGS) $(DESTDIR)$(prefix)/X11R6/lib/X11/config/
-# rules to build a test rpm
-
-localrpm: localdist buildrpm
-
-localdist: cleandist dir localcopy tar
+localdist: cleandist dir localcopy changelog tar
cleandist:
rm -rf $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).tar.bz2
@@ -70,25 +62,14 @@ tar:
bzip2 -9vf $(PACKAGE)-$(VERSION).tar
rm -rf $(PACKAGE)-$(VERSION)
-buildrpm:
- rpm -ta $(PACKAGE)-$(VERSION).tar.bz2
-
-# rules to build a distributable rpm
-
-rpm: changelog cvstag dist buildrpm
-
-dist: cleandist dir export tar
+dist: cleandist export changelog tar
export:
- cvs export -d $(PACKAGE)-$(VERSION) -r $(TAG) $(PACKAGE)
-
-cvstag:
- cvs tag $(CVSTAGOPT) $(TAG)
+ svn export -rBASE . $(PACKAGE)-$(VERSION)
changelog: ../common/username
- cvs2cl -U ../common/username -I ChangeLog
- rm -f ChangeLog.bak
- cvs commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog
+ svn2cl --authors=../common/username --file=$(PACKAGE)-$(VERSION)/ChangeLog
+ rm -f $(PACKAGE)-$(VERSION)/ChangeLog.bak
# Local variables:
# mode: makefile