================================ rmake:source=2.0.3-0.0.1 (previous: 2.0.1-1.1.8) cvc rdiff rmake -1 /conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/2.0.3-0.0.1 ================================ 2.0.3-0.0.1 Filip Brcic (brcha@xxxxxxxxxxxx) Sat Jun 12 09:37:47 2010 version bump rmake.recipe: changed Index: rmake.recipe ==================================================================== contents(size sha1) inode(mtime) --- rmake.recipe /conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/2.0.1-1.1.8 +++ rmake.recipe /conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/2.0.3-0.0.1 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006-2009 rPath, Inc. +# Copyright (c) 2006-2010 rPath, Inc. # This file is distributed under the terms of the MIT License. # A copy is available at http://www.rpath.com/permanent/mit-license.html # @@ -7,7 +7,7 @@ loadSuperClass('python') class RmakeRecipe(CPackageRecipe, Python.VersionMixIn): name = 'rmake' - version = '2.0.1' + version = '2.0.3' buildRequires = [ 'conary:python', 'm2crypto:python', 'info-rmake:user', @@ -106,12 +106,13 @@ r.macros.proxydir = '%(servicedir)s/rmake-proxy' r.macros.proxyport = '7778' r.addSource('rmake-proxy.conf', - dir = '/etc/httpd/conf.d/', macros=True, + dest = '%(sysconfdir)s/apache2/vhosts.d/15_rmake_proxy.conf', + macros=True, package='rmake-proxy') r.addSource('rmake-proxy.cnr', dir = '%(proxydir)s/config/', macros=True, package='rmake-proxy') - r.addSource('rmake-proxy-cleanup', dest = '/etc/cron.daily/', + r.addSource('rmake-proxy-cleanup', dest = '%(sysconfdir)s/cron.daily/', macros=True, package='rmake-proxy', mode=0755) r.Create('%(sysconfdir)s/rmake/server.d/proxy', @@ -125,20 +126,21 @@ r.PackageSpec('rmake-proxy', '%(proxydir)s/', - '/etc/httpd/conf.d/rmake-proxy.conf', - '/etc/cron.daily/rmake-proxy-cleanup', + '%(sysconfdir)s/apache2/vhosts.d/15_rmake_proxy.conf', + '%(sysconfdir)s/cron.daily/rmake-proxy-cleanup', '%(sysconfdir)s/rmake/server.d/proxy') r.ExcludeDirectories(exceptions='%(proxydir)s.*') # Runtime dependencies - r.Requires('mod_python:runtime', '/etc/httpd/conf.d/rmake-proxy.conf') + r.Requires('mod_python:runtime', '%(sysconfdir)s/apache2/vhosts.d/15_rmake_proxy.conf') ## package rmake-repos r.macros.reposdir = '%(servicedir)s/rmake-repos' r.macros.reposport = '7777' r.addSource('rmake-repos.conf', - dir = '/etc/httpd/conf.d/', macros=True, + dest = '%(sysconfdir)s/apache2/vhosts.d/10_rmake_repos.conf', + macros=True, package='rmake-repos') r.addSource('rmake-repos.cnr', dir = '%(reposdir)s/config/', macros=True, @@ -159,12 +161,12 @@ r.PackageSpec('rmake-repos', '%(reposdir)s/', - '/etc/httpd/conf.d/rmake-repos.conf', + '%(sysconfdir)s/apache2/vhosts.d/10_rmake_repos.conf', '%(sbindir)s/rmake-resetrepos', '%(sysconfdir)s/rmake/server.d/repos') # Runtime dependencies - r.Requires('mod_python:runtime', '/etc/httpd/conf.d/rmake-repos.conf') + r.Requires('mod_python:runtime', '%(sysconfdir)s/apache2/vhosts.d/10_rmake_repos.conf') ## package rmake-node rmake-2.0.3.tar.bz2: new rmake-2.0.1.tar.bz2: removed Committed by: brcha