From 7f357e7a590f2822453e95a382a23688e7afc2a9 Mon Sep 17 00:00:00 2001
From: Derek Feichtinger <derek.feichtinger@psi.ch>
Date: Mon, 1 Oct 2012 15:49:24 +0200
Subject: [PATCH] added some functionality for versioned release process

---
 .gitignore                 |  6 +++++-
 MANIFEST.in                |  4 ++++
 bin/ldapuserdir-ctl        | 12 +++++++++++-
 ldapuserdir/__init__.py    |  1 +
 ldapuserdir/ldapuserdir.py |  1 -
 rpm_setup.cfg              | 20 ++++++++++++++++++++
 6 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 MANIFEST.in
 create mode 100644 rpm_setup.cfg

diff --git a/.gitignore b/.gitignore
index 56587c7..ded0138 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-*~
 *.py[cod]
 
 # C extensions
@@ -14,3 +13,8 @@ sdist
 
 # Installer logs
 pip-log.txt
+
+# editor files
+*~
+.ropeproject
+
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..c2c21c9
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,4 @@
+include bin/ldapuserdir-ctl
+include etc/ldapuserdir-ctl.cfg
+recursive-include ldapuserdir
+
diff --git a/bin/ldapuserdir-ctl b/bin/ldapuserdir-ctl
index 4547ea8..4004f92 100755
--- a/bin/ldapuserdir-ctl
+++ b/bin/ldapuserdir-ctl
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import logging
-from ldapuserdir import LdapUserDir
+from ldapuserdir import LdapUserDir, __version__ as libversion
 import ldap
 import sys
 import os
@@ -175,6 +175,12 @@ parser.add_option('--no-msSFU',
                   help = 'do not restrict to entries with unix (msSFU) mappings',
                   default = False
                   )
+parser.add_option('-V',
+                  action = 'store_true',
+                  dest = 'flag_version',
+                  help = 'show version information',
+                  default = False
+                  )
 
 (options, args) = parser.parse_args()
 
@@ -187,6 +193,10 @@ if len(args) > 0:
 if options.flag_debug:
     ch.setLevel(logging.DEBUG)
 
+if options.flag_version:
+    sys.stdout.write('Library version: ' + libversion + '\n')
+    sys.exit(0)
+
 cfgfile = None
 if(options.cfgfile != ''):
     cfgfile = options.cfgfile
diff --git a/ldapuserdir/__init__.py b/ldapuserdir/__init__.py
index 9367861..38d932f 100644
--- a/ldapuserdir/__init__.py
+++ b/ldapuserdir/__init__.py
@@ -1 +1,2 @@
 from ldapuserdir import LdapUserDir
+from version import __version__
diff --git a/ldapuserdir/ldapuserdir.py b/ldapuserdir/ldapuserdir.py
index 3e4b873..8b13f90 100644
--- a/ldapuserdir/ldapuserdir.py
+++ b/ldapuserdir/ldapuserdir.py
@@ -4,7 +4,6 @@
 #
 # Author: Derek Feichtinger <derek.feichtinger@psi.ch>
 #
-# Version info: $Id: ldapgroupmng.py 65 2012-09-25 15:35:38Z feichtinger $
 ######################################################################
 
 """ This module provides the LdapUserDir class. It is used to interact
diff --git a/rpm_setup.cfg b/rpm_setup.cfg
new file mode 100644
index 0000000..1015c29
--- /dev/null
+++ b/rpm_setup.cfg
@@ -0,0 +1,20 @@
+[build]
+/usr/bin/python
+
+[install]
+prefix=/usr
+
+[bdist_rpm]
+Release=1.el6
+Group=Applications/Internet
+Vendor=PSI
+Packager=Derek Feichtinger
+#Provides
+Requires=python-ldap
+License=PSI
+#Conflicts
+#Obsoletes
+#Distribution
+#BuildRequires
+#Icon
+