[Commits] idmgr branch master updated.

[Martin Langhoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "/home/olpc-code/git/projects/idmgr".

The branch, master has been updated
       via  39b74da16354637a72ba1128e73286662d423e96 (commit)
      from  2384a1b0b578c3fc9eeaa5e8b7d9c1617ca9f0eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

 Makefile                    |   79 -------------------------------------------
 idmgr.spec.in => idmgr.spec |   10 +++---
 2 files changed, 5 insertions(+), 84 deletions(-)
 rename idmgr.spec.in => idmgr.spec (94%)

- Log -----------------------------------------------------------------
commit 39b74da16354637a72ba1128e73286662d423e96
Author: Martin Langhoff <martin at laptop.org>
Date:   Tue Jan 25 16:18:39 2011 -0500

    RPM build: Rework for fedpkg & localpkg

diff --git a/Makefile b/Makefile
index 3572a17..58feb32 100644
--- a/Makefile
+++ b/Makefile
@@ -6,79 +6,9 @@ DESTDIR=/
 $(DESTDIR):
 	mkdir -p $(DESTDIR)
 
-# symbols
-PKGNAME = idmgr
-VERSION =$(shell git describe | sed 's/^v//' | sed 's/-/./g')
-RELEASE = 1
-COMMITID = $(shell git rev-parse HEAD)
-ARCH = noarch
 PY_VERSION = $(shell python -c 'import sys; print sys.version[:3]')
 PYTHON_SITELIB = /usr/lib/python$(PY_VERSION)/site-packages
 
-# NOTE: Release is hardcoded in the spec file to 1
-NV = $(PKGNAME)-$(VERSION)
-NVR = $(NV)-$(RELEASE)
-DISTVER=xs11
-
-# rpm target directory
-BUILDDIR = $(PWD)/build
-TARBALL    = $(BUILDDIR)/SOURCES/$(NV).tar.bz2
-SRPM       = $(BUILDDIR)/SRPMS/$(NVR).$(DISTVER).src.rpm
-RPM        = $(BUILDDIR)/RPMS/$(ARCH)/$(NVR).$(DISTVER).$(ARCH).rpm
-
-# for scp `make rpm-name` ...
-rpm-name:
-	@echo $(RPM)
-
-
-RPMBUILD = rpmbuild \
-	--define "_topdir $(BUILDDIR)" \
-         --define "dist .$(DISTVER)"
-
-
-
-SOURCES: $(TARBALL)
-$(TARBALL):
-	#git-diff --shortstat --exit-code # check that our working copy is clean
-	#git-diff --cached --shortstat --exit-code # uncommitted changes?
-	mkdir -p $(BUILDDIR)/BUILD $(BUILDDIR)/RPMS \
-	$(BUILDDIR)/SOURCES $(BUILDDIR)/SPECS $(BUILDDIR)/SRPMS
-	mkdir -p $(NV)
-	git archive --format=tar --prefix="$(NV)/" HEAD | tar -C $(NV) -x
-	#( cd leases && git-archive --format=tar --prefix=$(NV)/leases/ HEAD ) | tar -C $(NV) -x
-	echo $(VERSION) > $(NV)/$(NV)/build-version
-	tar -C $(NV) -cjf $@ .
-	rm -fr $(NV)
-
-SRPM: $(SRPM)
-$(SRPM): $(PKGNAME).spec SOURCES
-	$(RPMBUILD) -bs --nodeps $(PKGNAME).spec
-
-$(PKGNAME).spec: $(PKGNAME).spec.in
-	sed -e 's:@PKGNAME@:$(PKGNAME):g' \
-	    -e 's:@VERSION@:$(VERSION):g' \
-	    -e 's:@RELEASE@:$(RELEASE):g' \
-	    -e 's:@COMMITID@:$(COMMITID):g' \
-		< $< > $@
-
-rpm: $(RPM)
-RPM: $(RPM)
-$(RPM): SRPM
-	$(RPMBUILD) --rebuild $(SRPM)
-	rm -fr $(BUILDDIR)/BUILD/$(NV)
-	# Tolerate rpmlint errors
-	rpmlint $(RPM) || echo "rpmlint errored out but we love you anyway"
-
-publish: SOURCES SRPM
-	rsync -e ssh --progress  $(RPM) \
-	    xs-dev.laptop.org:/xsrepos/testing/olpc/11/i586/
-	rsync -e ssh --progress $(SRPM) \
-	    xs-dev.laptop.org:/xsrepos/testing/olpc/11/source/SRPMS/
-	rsync -e ssh --progress $(TARBALL) \
-	    xs-dev.laptop.org:/xsrepos/testing/olpc/11/source/SOURCES/
-	ssh xs-dev.laptop.org sudo createrepo /xsrepos/testing/olpc/11/i586
-	ssh xs-dev.laptop.org sudo createrepo /xsrepos/testing/olpc/11/source/SRPMS
-
 install:
 	install -D -d $(DESTDIR)/home/idmgr
 	install -D -d $(DESTDIR)/home/idmgr/test
@@ -100,12 +30,3 @@ install:
 	install -D -m 644 idmanager.py                      $(DESTDIR)$(PYTHON_SITELIB)
 	install -D conf.schoolserver/idmgr                  $(DESTDIR)/etc/init.d/
 	install -D -m 644 conf.schoolserver/idmgr.conf      $(DESTDIR)/etc/
-
-
-# This forces a rebuild of $(PKGNAME).spec.in
-.PHONY: $(PKGNAME).spec.in install
-
-
-
-
-
diff --git a/idmgr.spec.in b/idmgr.spec
similarity index 94%
rename from idmgr.spec.in
rename to idmgr.spec
index bbdbcd5..3edd738 100644
--- a/idmgr.spec.in
+++ b/idmgr.spec
@@ -1,14 +1,14 @@
-Name:           @PKGNAME@
-Version:        @VERSION@
-Release:        @RELEASE@%{?dist}
+Name:           idmgr
+Version:        xx
+Release:        1%{?dist}
 Distribution:   OLPC XS School Server
 Summary:        OLPC XS registration manager
 Vendor:         OLPC
 Group:          Core
 License:        GPLv2
 Packager:       Martin Langhoff <martin at laptop.org>
-URL:            http://dev.laptop.org/git.do?p=projects/idmgr;a=summary
-Source0:        http://dev.laptop.org/~douglas/SOURCES/%{name}-%{version}.tar.bz2
+URL:            http://dev.laptop.org/git/projects/idmgr
+Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-----------------------------------------------------------------------


--
/home/olpc-code/git/projects/idmgr