summaryrefslogtreecommitdiffstats
path: root/osx/macports/files/patch-setup.py.diff
diff options
context:
space:
mode:
Diffstat (limited to 'osx/macports/files/patch-setup.py.diff')
-rw-r--r--osx/macports/files/patch-setup.py.diff37
1 files changed, 21 insertions, 16 deletions
diff --git a/osx/macports/files/patch-setup.py.diff b/osx/macports/files/patch-setup.py.diff
index cc948face..f78d27e5c 100644
--- a/osx/macports/files/patch-setup.py.diff
+++ b/osx/macports/files/patch-setup.py.diff
@@ -1,26 +1,26 @@
---- setup.py.orig 2009-11-20 16:07:52.000000000 -0600
-+++ setup.py 2009-11-20 16:29:56.000000000 -0600
-@@ -5,45 +5,19 @@
-
- setup(name="Bcfg2",
- version="1.0.1",
+--- 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 @@
+ setup(cmdclass=cmdclass,
+ name="Bcfg2",
+ version="1.1.1",
- description="Bcfg2 Server",
+ description="Bcfg2 Client",
author="Narayan Desai",
author_email="desai@mcs.anl.gov",
-- packages=["Bcfg2",
-- "Bcfg2.Client",
-+ packages=["Bcfg2.Client",
+- packages=["Bcfg2",
+- "Bcfg2.Client",
++ packages=["Bcfg2.Client",
"Bcfg2.Client.Tools",
-- 'Bcfg2.Server',
+- 'Bcfg2.Server',
- "Bcfg2.Server.Admin",
-- "Bcfg2.Server.Hostbase",
-- "Bcfg2.Server.Hostbase.hostbase",
-- "Bcfg2.Server.Plugins",
-- "Bcfg2.Server.Reports",
+- "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",
+- "Bcfg2.Server.Snapshots",
],
+ py_modules = ["Bcfg2.Options",
+ "Bcfg2.Proxy",
@@ -36,6 +36,9 @@
- ('share/bcfg2/xsl-transforms/xsl-transform-includes',
- glob('reports/xsl-transforms/xsl-transform-includes/*.xsl')),
- ('share/man/man1', glob("man/bcfg2.1")),
++ package_data = {'Bcfg2.Server.Reports.reports':['fixtures/*.xml',
++ 'templates/*.html', 'templates/*/*.html',
++ 'templates/*/*.inc' ] },
+ scripts = glob('src/sbin/bcfg2'),
+ data_files = [('share/man/man1', glob("man/bcfg2.1")),
('share/man/man5', glob("man/*.5")),
@@ -49,7 +52,9 @@
- ('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/*')),
+- 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/*')),
]