From 3f8b8f70d7d81c956e0f4e3dbc66d97e91d4e55b Mon Sep 17 00:00:00 2001 From: Bogdano Arendartchuk Date: Tue, 5 Feb 2008 20:54:35 +0000 Subject: Moved all old defaults to repsys-example.conf and document it better Only a few configuration options in repsys.conf are really useful. Removed the remaining [template] section. --- CHANGES | 2 ++ repsys-example.conf | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ repsys.conf | 3 --- setup.py | 3 ++- 4 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 repsys-example.conf diff --git a/CHANGES b/CHANGES index bad90d2..223528c 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,8 @@ section, to allow forcing the use of --strict - the fix for the unreleased commits problem in the previous release was wrong, really fixed it +- moved all configuration options that will hardly be changed to + repsys-example.conf; we now have a shorter repsys.conf - fixed the use of file:/// URLs when using just the package name - don't give the wrong message "invalid command 'CMD'" when this is not the case diff --git a/repsys-example.conf b/repsys-example.conf new file mode 100644 index 0000000..99c5d30 --- /dev/null +++ b/repsys-example.conf @@ -0,0 +1,62 @@ +[global] +verbose = no +default_parent = svn+ssh://svn.mandriva.com/svn/packages/cooker +url-map = svn\+ssh://svn\.mandriva\.com/(.*) file:///\1 +#tempdir = /tmp + +[log] +oldurl = svn+ssh://svn.mandriva.com/svn/packages/misc +# controls up to which revision the rpm changelog +# will be constructed (default zero, i.e., oldest +# commit) +revision-offset = 0 +# commit lines containing this string won't be shown in the changelog: +ignore-string = SILENT +# and in case of only allowing a few lines to be visible, use this: +#unignore-string = CLOG + +[template] +# set the cheetah template used to generate the spec changelog from svn +path = /usr/share/repsys/default.chlog + +[helper] +# create-srpm is called by repsys on the server-side when submitting a +# package +create-srpm = /usr/share/repsys/create-srpm +# upload-srpm is called by create-srpm to copy the generated .src.rpm to +# the proper build queue +upload-srpm = /usr/local/bin/youri.devel + +# this section maps usernames found in svn commits to the ones that must be +# shown in the changelog +# users can be retrieved from LDAP through the use of the repsys-ldap +# plugin +[users] +# jsmith = John Smith + +[submit] +host = kenobi.mandriva.com +default = Cooker + +[submit Cooker] +target = /export/home/repsys +allowed = svn+ssh://svn.mandriva.com/svn/packages/cooker +scripts = /usr/share/repsys/rebrand-mdk +## +## rpm-macros refers to the sections containing the macros used for this +## target. The values will be used to build the rpmbuild command line. For +## example: +## +## [macros cooker] +## a = b +## c = %a +## +## will render in the command line: --define "a b" --define "c %a". +## +#rpm-macros = global cooker + +#[macros global] +#distsuffix = mdv + +#[macros cooker] +#mandriva_release = 2007.1 diff --git a/repsys.conf b/repsys.conf index 2b119c3..0d1ddc5 100644 --- a/repsys.conf +++ b/repsys.conf @@ -6,9 +6,6 @@ default_parent = svn+ssh://svn.mandriva.com/svn/packages/cooker [log] oldurl = svn+ssh://svn.mandriva.com/svn/packages/misc -[template] -path = /usr/share/repsys/default.chlog - [helper] create-srpm = /usr/share/repsys/create-srpm upload-srpm = /usr/local/bin/youri.devel diff --git a/setup.py b/setup.py index 7c4814c..2df6e49 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,8 @@ setup(name="repsys", "oldfashion.chlog", "compatv15.chlog", "create-srpm", - "rebrand-mdk"]), + "rebrand-mdk", + "repsys-example.conf"]), ("/etc/", ["repsys.conf"])] ) -- cgit v1.2.1