From 1021d458baa61a581e29d99eadb4bf17cd057cb9 Mon Sep 17 00:00:00 2001
From: Raul Cuza <raulcuza@gmail.com>
Date: Wed, 6 Jul 2011 16:17:49 -0400
Subject: Prepare osx/Makefile to be changed by export2.py

---
 osx/Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'osx/Makefile')

diff --git a/osx/Makefile b/osx/Makefile
index 8d16b42ae..e2223e0aa 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -29,13 +29,9 @@ SITELIBDIR = /Library/Python/${PYVERSION}/site-packages
 # an Info.plist file for packagemaker to look at for package creation
 # and substitute the version strings. Major/Minor versions can only be
 # integers (e.g. "1" and "00" for bcfg2 version 1.0.0.
-BCFGVER = $(shell /usr/bin/grep version ../setup.py | cut -d\" -f2)
-BCFGVER1 = $(shell /bin/echo ${BCFGVER} | /usr/bin/cut -d"." -f1)
-BCFGVER2 = $(shell /bin/echo ${BCFGVER} | /usr/bin/cut -d"." -f2)
-BCFGVER3 = $(shell /bin/echo ${BCFGVER} | /usr/bin/cut -d"." -f3)
-BCFGVER3I = $(shell /usr/bin/python -c "import sys; print sys.argv[1][0:1]" ${BCFGVER3})
-MAJOR = ${BCFGVER1}
-MINOR = ${BCFGVER2}${BCFGVER3I}
+BCFGVER = v1.2.0pre3
+MAJOR = 1
+MINOR = 2.0
 
 default: clean client
 
-- 
cgit v1.2.3-1-g7c22


From 8552a8344283949808805137ef182fdc75a5072e Mon Sep 17 00:00:00 2001
From: Raul Cuza <raulcuza@gmail.com>
Date: Thu, 7 Jul 2011 09:47:32 -0400
Subject: Correct typo in version variable.

---
 osx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'osx/Makefile')

diff --git a/osx/Makefile b/osx/Makefile
index e2223e0aa..4bca85582 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -29,7 +29,7 @@ SITELIBDIR = /Library/Python/${PYVERSION}/site-packages
 # an Info.plist file for packagemaker to look at for package creation
 # and substitute the version strings. Major/Minor versions can only be
 # integers (e.g. "1" and "00" for bcfg2 version 1.0.0.
-BCFGVER = v1.2.0pre3
+BCFGVER = 1.2.0pre3
 MAJOR = 1
 MINOR = 2.0
 
-- 
cgit v1.2.3-1-g7c22


From ddbaad0ea618ce3bfd92db2cedc25ccc75a10f13 Mon Sep 17 00:00:00 2001
From: Raul Cuza <raulcuza@gmail.com>
Date: Thu, 7 Jul 2011 10:24:09 -0400
Subject: Add verification that version_info['micro'] is a single digit.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Because of restrictions in Mac OS X packaging, Bcfg2's
Micro and Minor version numbers must be combined into an
integer in the OS X package (IFMinorVersion attribute).
In order for this to work, the micro version must be an
integer, otherwise we'll run into cases where the·
IFMinorVersion will not be in sequence with the Bcfg2
Micro and Minor versions.
---
 osx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'osx/Makefile')

diff --git a/osx/Makefile b/osx/Makefile
index 4bca85582..de2d75402 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -31,7 +31,7 @@ SITELIBDIR = /Library/Python/${PYVERSION}/site-packages
 # integers (e.g. "1" and "00" for bcfg2 version 1.0.0.
 BCFGVER = 1.2.0pre3
 MAJOR = 1
-MINOR = 2.0
+MINOR = 20
 
 default: clean client
 
-- 
cgit v1.2.3-1-g7c22


From 67b6e93187f8643283c98387dee5d4bcf28164f0 Mon Sep 17 00:00:00 2001
From: Raul Cuza <raulcuza@gmail.com>
Date: Thu, 7 Jul 2011 15:43:11 -0400
Subject: Correct typo in PYVERSION to fix Ticket 1023.

---
 osx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'osx/Makefile')

diff --git a/osx/Makefile b/osx/Makefile
index de2d75402..660c790cd 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -1,4 +1,4 @@
-PYVERSION := $(shell /usr/bin/python -c "import sys; print '%s.%s' % (sys.version_info[0], sys.version_info[1])"python -c "import sys; print sys.version[0:3]")
+PYVERSION := $(shell /usr/bin/python -c "import sys; print '%s.%s' % (sys.version_info[0], sys.version_info[1])"
 PYMAJORVERSION := $(shell /usr/bin/python -c "import sys; print sys.version_info[0]")
 PYMINORVERSION := $(shell /usr/bin/python -c "import sys; print sys.version_info[1]")
 PREFLIGHT = preflight
-- 
cgit v1.2.3-1-g7c22


From e788eb6afaf00516425e48ae27c72c20c5e4636a Mon Sep 17 00:00:00 2001
From: Raul Cuza <raulcuza@gmail.com>
Date: Thu, 7 Jul 2011 15:59:09 -0400
Subject: Add missing ).

---
 osx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'osx/Makefile')

diff --git a/osx/Makefile b/osx/Makefile
index 660c790cd..a5920a5eb 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -1,4 +1,4 @@
-PYVERSION := $(shell /usr/bin/python -c "import sys; print '%s.%s' % (sys.version_info[0], sys.version_info[1])"
+PYVERSION := $(shell /usr/bin/python -c "import sys; print '%s.%s' % (sys.version_info[0], sys.version_info[1])")
 PYMAJORVERSION := $(shell /usr/bin/python -c "import sys; print sys.version_info[0]")
 PYMINORVERSION := $(shell /usr/bin/python -c "import sys; print sys.version_info[1]")
 PREFLIGHT = preflight
-- 
cgit v1.2.3-1-g7c22