[Commits] idmgr branch master updated.
Martin Langhoff
martin at laptop.org
Fri Oct 9 06:19:45 EDT 2009
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 8113468a871b61da45321ba2a462f3426302b311 (commit)
via 058da42c3ed4c720bc47dcbf97c69b30a83349e8 (commit)
from af830efca6af919a71b94ddcb641ecf2cf541c24 (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 | 20 +++++++++-----------
README | 1 +
idmgr.spec.in | 18 +++++++++++++-----
3 files changed, 23 insertions(+), 16 deletions(-)
- Log -----------------------------------------------------------------
commit 8113468a871b61da45321ba2a462f3426302b311
Author: Martin Langhoff <martin at laptop.org>
Date: Fri Oct 9 12:19:27 2009 +0200
makefile: add createrepo cmd
diff --git a/Makefile b/Makefile
index 1a04c9d..5175ef1 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ publish: SOURCES SRPM
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/i386
+ ssh xs-dev.laptop.org sudo createrepo /xsrepos/testing/olpc/11/source/SRPMS
install:
install -D -d $(DESTDIR)/home/idmgr
commit 058da42c3ed4c720bc47dcbf97c69b30a83349e8
Author: Martin Langhoff <martin at laptop.org>
Date: Fri Oct 9 12:13:19 2009 +0200
rpm & make: update for F11 compatibility, fix maintainer.
diff --git a/Makefile b/Makefile
index 58acdd6..1a04c9d 100644
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,12 @@ 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=xs9
+DISTVER=xs11
# rpm target directory
BUILDDIR = $(PWD)/build
@@ -59,7 +59,6 @@ $(PKGNAME).spec: $(PKGNAME).spec.in
-e 's:@VERSION@:$(VERSION):g' \
-e 's:@RELEASE@:$(RELEASE):g' \
-e 's:@COMMITID@:$(COMMITID):g' \
- -e 's:@PY_VERSION@:$(PY_VERSION):g' \
< $< > $@
rpm: $(RPM)
@@ -72,20 +71,18 @@ $(RPM): SRPM
publish: SOURCES SRPM
rsync -e ssh --progress $(RPM) \
- xs-dev.laptop.org:/xsrepos/testing/olpc/9/i386/
+ xs-dev.laptop.org:/xsrepos/testing/olpc/11/i386/
rsync -e ssh --progress $(SRPM) \
- xs-dev.laptop.org:/xsrepos/testing/olpc/9/source/SRPMS/
+ xs-dev.laptop.org:/xsrepos/testing/olpc/11/source/SRPMS/
rsync -e ssh --progress $(TARBALL) \
- xs-dev.laptop.org:/xsrepos/testing/olpc/9/source/SOURCES/
- ssh xs-dev.laptop.org sudo createrepo /xsrepos/testing/olpc/9/i386
-
-
+ xs-dev.laptop.org:/xsrepos/testing/olpc/11/source/SOURCES/
+ ssh xs-dev.laptop.org sudo createrepo /xsrepos/testing/olpc/11/i386
install:
install -D -d $(DESTDIR)/home/idmgr
install -D -d $(DESTDIR)/home/idmgr/test
install -D -d $(DESTDIR)/usr/bin
- install -D -d $(DESTDIR)/usr/lib/python$(PY_VERSION)/site-packages
+ install -D -d $(DESTDIR)$(PYTHON_SITELIB)
install -D -d $(DESTDIR)/etc/init.d
install -D test/xo-register $(DESTDIR)/home/idmgr/test
@@ -99,7 +96,7 @@ install:
install -D scripts/update_users_1_to_2.py $(DESTDIR)/home/idmgr
install -D scripts/update_users_2_to_3.py $(DESTDIR)/home/idmgr
install -D registration-server $(DESTDIR)/usr/bin
- install -D -m 644 idmanager.py $(DESTDIR)/usr/lib/python$(PY_VERSION)/site-packages
+ 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/
diff --git a/README b/README
index 1122ce8..1ec6c2c 100644
--- a/README
+++ b/README
@@ -37,3 +37,4 @@ database = idmanager.Database(config.SQLITE3_FILE)
for serial in database.get_serials():
print database.get_laptop(serial)
+foo
diff --git a/idmgr.spec.in b/idmgr.spec.in
index eed265a..bbdbcd5 100644
--- a/idmgr.spec.in
+++ b/idmgr.spec.in
@@ -6,7 +6,7 @@ Summary: OLPC XS registration manager
Vendor: OLPC
Group: Core
License: GPLv2
-Packager: Douglas Bagnall <douglas at paradise.net.nz>
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,11 +18,15 @@ Requires: python python-sqlalchemy
Requires(pre): /usr/bin/sqlite3, /usr/sbin/useradd
Requires(post): /sbin/chkconfig, /sbin/service
Requires: rssh
+BuildRequires: python-devel
BuildRoot: %{_builddir}/%{name}
#Source: %{name}-%{version}.tar.gz
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+
%description
ID Management Service for the XS School Server
@@ -92,7 +96,7 @@ fi
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT PYTHON_SITELIB=%{python_sitelib} install
%clean
rm -rf $RPM_BUILD_ROOT
@@ -119,11 +123,15 @@ rm -rf $RPM_BUILD_ROOT
/home/idmgr/test/local-register
/home/idmgr/test/db_dump
/usr/bin/registration-server
-/usr/lib/python at PY_VERSION@/site-packages/idmanager.py
-/usr/lib/python at PY_VERSION@/site-packages/idmanager.pyc
-/usr/lib/python at PY_VERSION@/site-packages/idmanager.pyo
+%{python_sitelib}/idmanager.py
+%{python_sitelib}/idmanager.pyc
+%{python_sitelib}/idmanager.pyo
%changelog
+
+* Fri Oct 9 2009 Martin Langhoff <martin at laptop.org> 0.7-17
+ - Updating specfile for F11-based XS
+.
* Wed Sep 3 2008 Douglas Bagnall <douglas at paradise.net.nz> 0.3
- This is a git-maintaned package - See the changelog at
http://dev.laptop.org/git?p=projects/idmgr;a=log;h=@COMMITID@
-----------------------------------------------------------------------
--
/home/olpc-code/git/projects/idmgr
More information about the Commits
mailing list