spacewalk/certs-tools/gen-rpm.sh | 7 ++++
utils/spacewalk-clone-by-date.sgml | 52 ++++++++++++++++++-------------------
2 files changed, 32 insertions(+), 27 deletions(-)
New commits:
commit 78b015a8727ba101965a17d232072414bb081be6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 31 15:45:11 2012 +0100
862349 - create rpms compatible with RHEL5
fixing
Retrieving
http://172.22.xxx.xxx/pub/rhn-org-trusted-ssl-cert-1.0-1.noarch.rpm
error: Failed dependencies:
rpmlib(FileDigests) <= 4.6.0-1 is needed by
rhn-org-trusted-ssl-cert-1.0-1.noarch
rpmlib(PayloadIsXz) <= 5.2-1 is needed by
rhn-org-trusted-ssl-cert-1.0-1.noarch
diff --git a/spacewalk/certs-tools/gen-rpm.sh b/spacewalk/certs-tools/gen-rpm.sh
index 2dd7715..32a8ee1 100755
--- a/spacewalk/certs-tools/gen-rpm.sh
+++ b/spacewalk/certs-tools/gen-rpm.sh
@@ -340,7 +340,12 @@ RPMOPTS="--define \"_topdir $RPM_BUILD_DIR\"\
--define '_sourcedir %{_topdir}'\
--define '_specdir %{_topdir}'\
--define '_rpmdir %{_topdir}'\
- --define '_srcrpmdir %{_topdir}'"
+ --define '_srcrpmdir %{_topdir}'\
+ --define '_source_filedigest_algorithm md5'\
+ --define '_binary_filedigest_algorithm md5'\
+ --define '_source_payload nil'\
+ --define '_binary_payload nil'\
+ "
eval "rpmbuild -ta $RPMOPTS --clean $RPM_BUILD_DIR/$TARBALL" || exit 1
commit 84001381847a7664f3ac05a1da3719c4566b5b87
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 31 15:24:04 2012 +0100
fixed spacing in man page
diff --git a/utils/spacewalk-clone-by-date.sgml b/utils/spacewalk-clone-by-date.sgml
index ebde5ff..29e92aa 100644
--- a/utils/spacewalk-clone-by-date.sgml
+++ b/utils/spacewalk-clone-by-date.sgml
@@ -24,50 +24,50 @@ Utility for cloning errata by date.
<arg>options <replaceable>...</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg> -c <replaceable>CONFIGFILE</replaceable></arg>
- <arg>
--config=<replaceable>CONFIGFILE</replaceable></arg>
+ <arg>-c <replaceable>CONFIGFILE</replaceable></arg>
+
<arg>--config=<replaceable>CONFIGFILE</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg> -m </arg><arg> --sample-config</arg>
+ <arg>-m</arg><arg>--sample-config</arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-u<replaceable>USERNAME</replaceable></arg>
+ <arg>-u <replaceable>USERNAME</replaceable></arg>
<arg>--username=<replaceable>USERNAME</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-p<replaceable>PASSWORD</replaceable></arg>
+ <arg>-p <replaceable>PASSWORD</replaceable></arg>
<arg>--password=<replaceable>PASSWORD</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-l<replaceable>SRC DEST</replaceable></arg>
+ <arg>-l <replaceable>SRC DEST</replaceable></arg>
<arg>--channels=<replaceable>SRC
DEST</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg> -d=<replaceable>YYYY-MM-DD</replaceable></arg>
- <arg>
--to_date=<replaceable>YYYY-MM-DD</replaceable></arg>
+ <arg>-d=<replaceable>YYYY-MM-DD</replaceable></arg>
+
<arg>--to_date=<replaceable>YYYY-MM-DD</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-b<replaceable>PKG1,PKG2,PKG3</replaceable></arg>
+ <arg>-b <replaceable>PKG1,PKG2,PKG3</replaceable></arg>
<arg>--blacklist=<replaceable>PKG1,PKG2,PKG3</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-r<replaceable>PKG1,PKG2,PKG3</replaceable></arg>
+ <arg>-r <replaceable>PKG1,PKG2,PKG3</replaceable></arg>
<arg>--removelist=<replaceable>PKG1,PKG2,PKG3</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-v</arg><arg> --validate </arg>
+ <arg>-v</arg><arg>--validate</arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-k</arg><arg> --skip_depsolve </arg>
+ <arg>-k</arg><arg>--skip_depsolve</arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-y</arg><arg> --assumeyes </arg>
+ <arg>-y</arg><arg>--assumeyes</arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-o</arg><arg> --security_only </arg>
+ <arg>-o</arg><arg>--security_only</arg>
</cmdsynopsis>
<cmdsynopsis>
- <arg>-g</arg><arg> --background</arg>
+ <arg>-g</arg><arg>--background</arg>
</cmdsynopsis>
<cmdsynopsis>
<arg>-h</arg><arg>--help</arg>
@@ -122,56 +122,56 @@ Utility for cloning errata by date.
</listitem>
</varlistentry>
<varlistentry>
- <term>-u<replaceable>USERNAME</replaceable>,
--username=<replaceable>USERNAME</replaceable></term>
+ <term>-u <replaceable>USERNAME</replaceable>,
--username=<replaceable>USERNAME</replaceable></term>
<listitem>
<para>username of user that has administrative access.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>-p<replaceable>PASSWORD</replaceable>,
--password=<replaceable>PASSWORD</replaceable></term>
+ <term>-p <replaceable>PASSWORD</replaceable>,
--password=<replaceable>PASSWORD</replaceable></term>
<listitem>
<para>password of user that has administrative access. If not
provided, password will be prompted for.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>-l<replaceable>SRC_LABEL DEST_LABEL</replaceable>,
--channels=<replaceable>SRC_LABEL DEST_LABEL</replaceable></term>
+ <term>-l <replaceable>SRC_LABEL DEST_LABEL</replaceable>,
--channels=<replaceable>SRC_LABEL DEST_LABEL</replaceable></term>
<listitem>
<para>Space separated list of source channel and destination channel.
Can be specified multiple times to provide base channel and child channel pairs of a
single channel tree. To specify more than one channel tree, specify a config
file.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term> -y --assumeyes</term>
+ <term>-y --assumeyes</term>
<listitem>
<para>Instead of asking for confirmation before cloning a channel or
errata, continue uninterrupted.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term> -o --security_only</term>
+ <term>-o --security_only</term>
<listitem>
<para>Clone only security errata (and their
dependencies).</para>
</listitem>
</varlistentry>
<varlistentry>
- <term> -v --validate</term>
+ <term>-v --validate</term>
<listitem>
<para>Run repoclosure on all provided channels. This overrides
--to_date and will not perform any cloning.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term> -k --skip_depsolve</term>
+ <term>-k --skip_depsolve</term>
<listitem>
<para>Do not attempt to ensure added packages have needed dependencies
(Not recommended). </para>
</listitem>
</varlistentry>
<varlistentry>
- <term> -d <replaceable>YYYY-MM-DD</replaceable>,
--to_date=<replaceable>YYYY-MM-DD</replaceable> </term>
+ <term>-d <replaceable>YYYY-MM-DD</replaceable>,
--to_date=<replaceable>YYYY-MM-DD</replaceable></term>
<listitem>
<para>All errata on or before the specified date will be cloned if it
does not already exist in the destination channel(s).
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term> -b <replaceable>PKG1,PKG2,PKG3</replaceable>,
--blacklist=<replaceable>PKG1,PKG2,PKG3</replaceable> </term>
+ <term>-b <replaceable>PKG1,PKG2,PKG3</replaceable>,
--blacklist=<replaceable>PKG1,PKG2,PKG3</replaceable></term>
<listitem>
<para>Comma separated list of package names to be removed after
cloning. Perl-style regular expressions also supported. Only newly added packages will
removed if they are on the blacklist. Dependency resolution is not ensured on resulting
repository.
</para>
@@ -181,7 +181,7 @@ Utility for cloning errata by date.
</listitem>
</varlistentry>
<varlistentry>
- <term> -r <replaceable>PKG1,PKG2,PKG3</replaceable>,
--removelist=<replaceable>PKG1,PKG2,PKG3</replaceable> </term>
+ <term>-r <replaceable>PKG1,PKG2,PKG3</replaceable>,
--removelist=<replaceable>PKG1,PKG2,PKG3</replaceable></term>
<listitem>
<para>Comma separated list of package names to be removed after
cloning. Perl-style regular expressions are also supported. All packages are considered
for removal, even those not added by errata/channel cloning. Dependency resolution is not
ensured on resulting repository.
</para>
@@ -191,7 +191,7 @@ Utility for cloning errata by date.
</listitem>
</varlistentry>
<varlistentry>
- <term> -g --background</term>
+ <term>-g --background</term>
<listitem>
<para>This option makes the cloning of the errata into the destination
channel happen asynchronously in the background, allowing the script to return much
faster.
</para>