diff options
Diffstat (limited to 'osx')
| -rw-r--r-- | osx/Makefile | 7 | ||||
| -rw-r--r-- | osx/bcfg2.conf | 1 | ||||
| -rw-r--r-- | osx/macports/Portfile | 2 | ||||
| -rw-r--r-- | osx/macports/files/patch-setup.py.diff | 12 |
4 files changed, 5 insertions, 17 deletions
diff --git a/osx/Makefile b/osx/Makefile index ee7b7d565..174eb53c8 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -5,8 +5,7 @@ PREFLIGHT = preflight POSTFLIGHT = postflight PKGROOT = bcfg2pkg PKGTMP = bcfg2tmp -FILTERS = --filter Hostbase \ ---filter Reports \ +FILTERS = --filter Reports \ --filter Server \ --filter xsd \ --filter xsl \ @@ -29,9 +28,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 = 1.3.5 +BCFGVER = 1.4.0pre1 MAJOR = 1 -MINOR = 35 +MINOR = 40 default: clean client diff --git a/osx/bcfg2.conf b/osx/bcfg2.conf index cac424576..1f0984f0e 100644 --- a/osx/bcfg2.conf +++ b/osx/bcfg2.conf @@ -1,5 +1,4 @@ [communication] -protocol = xmlrpc/ssl password = foobat # certificate = /etc/bcfg2.key # key = /etc/bcfg2.key diff --git a/osx/macports/Portfile b/osx/macports/Portfile index cf6f33ddc..05ce40bf0 100644 --- a/osx/macports/Portfile +++ b/osx/macports/Portfile @@ -5,7 +5,7 @@ PortSystem 1.0 PortGroup python26 1.0 name bcfg2 -version 1.3.5 +version 1.4.0pre1 categories sysutils python maintainers gmail.com:sol.jerome license BSD diff --git a/osx/macports/files/patch-setup.py.diff b/osx/macports/files/patch-setup.py.diff index f78d27e5c..01b21eadf 100644 --- a/osx/macports/files/patch-setup.py.diff +++ b/osx/macports/files/patch-setup.py.diff @@ -1,6 +1,6 @@ --- setup.py 2010-11-15 15:30:28.000000000 -0600 +++ setup.py.macports 2010-11-18 19:06:49.155292524 -0600 -@@ -11,47 +11,22 @@ +@@ -11,38 +11,21 @@ setup(cmdclass=cmdclass, name="Bcfg2", version="1.1.1", @@ -14,16 +14,12 @@ "Bcfg2.Client.Tools", - 'Bcfg2.Server', - "Bcfg2.Server.Admin", -- "Bcfg2.Server.Hostbase", -- "Bcfg2.Server.Hostbase.hostbase", - "Bcfg2.Server.Plugins", - "Bcfg2.Server.Reports", - "Bcfg2.Server.Reports.reports", - "Bcfg2.Server.Reports.reports.templatetags", -- "Bcfg2.Server.Snapshots", ], + py_modules = ["Bcfg2.Options", -+ "Bcfg2.Proxy", + "Bcfg2.Logger", + ], package_dir = {'Bcfg2':'src/lib'}, @@ -51,11 +47,5 @@ - glob('src/lib/Server/Reports/reports/templates/clients/*')), - ('share/bcfg2/Reports/templates/config_items', - glob('src/lib/Server/Reports/reports/templates/config_items/*')), -- ('share/bcfg2/Hostbase/templates', -- glob('src/lib/Server/Hostbase/hostbase/webtemplates/*.*')), -- ('share/bcfg2/Hostbase/templates/hostbase', -- glob('src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/*')), -- ('share/bcfg2/Hostbase/repo', -- glob('src/lib/Server/Hostbase/templates/*')), ] ) |