diff options
Diffstat (limited to 'poldek-dirdeps.patch')
| -rw-r--r-- | poldek-dirdeps.patch | 106 |
1 files changed, 21 insertions, 85 deletions
diff --git a/poldek-dirdeps.patch b/poldek-dirdeps.patch index 7922f80..b099396 100644 --- a/poldek-dirdeps.patch +++ b/poldek-dirdeps.patch @@ -1,87 +1,23 @@ ---- poldek-0.21-cvs20070703.00/doc/poldek.conf.xml~ 2007-06-30 10:32:47.000000000 +0300 -+++ poldek-0.21-cvs20070703.00/doc/poldek.conf.xml 2008-01-13 16:36:22.437311829 +0200 -@@ -414,8 +414,10 @@ - <option name="dependency engine version" type="integer" default="2" hidden="yes"> - </option> - -- <option name="auto directory dependencies" type="boolean3" default="auto" op="AUTODIRDEP"> -+ <option name="auto directory dependencies" type="boolean3" default="no" op="AUTODIRDEP"> -+ <description> - RPM 4.4.6 introduces auto dependencies based on package directories. Option controls this feature. -+ </description> - </option> - - <option name="follow" type="boolean" default="yes" op="FOLLOW"> ---- poldek/doc/Makefile.am~ 2005-11-06 23:00:58.000000000 +0200 -+++ poldek/doc/Makefile.am 2008-01-14 10:11:50.113470814 +0200 -@@ -8,7 +8,7 @@ +--- poldek-0.21-cvs20070703.00/conf/poldek.conf~ 2008-02-14 16:12:15.604671074 +0200 ++++ poldek-0.21-cvs20070703.00/conf/poldek.conf 2008-02-14 16:13:12.373118918 +0200 +@@ -160,6 +160,9 @@ + # Subtle dependency processing options, they should not be changed + # unless you know what you are doing - # xml configuration description & co. - CONFXMLS = poldek.conf.xml conf-xml2.sh \ -- conf-xml2conf.xsl conf-xml2refentry.xsl conf-xml2docb.xsl -+ conf-xml2c.xsl conf-xml2conf.xsl conf-xml2refentry.xsl conf-xml2docb.xsl - - # manual sources - MANUALS = manual.xml manual.css manual.xsl ---- /dev/null 2006-03-28 14:00:37.000000000 +0300 -+++ poldek/doc/conf-xml2c.xsl 2005-11-01 21:08:20.000000000 +0200 -@@ -0,0 +1,59 @@ -+<xsl:stylesheet version="1.0" -+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> -+ -+<!-- poldek.conf.xml -> conf_sections.c --> -+<!-- $Id$ --> -+ -+<xsl:output method="text" indent="no" /> -+<xsl:template match="/"> -+/* This file is generated from poldek.conf.xml. Do not edit */ -+#include <stdlib.h> -+#include "conf_intern.h" -+#include "poldek_ts.h" -+ <xsl:for-each select="config/confsection"> -+static struct poldek_conf_tag <xsl:value-of select="@name"/>_tags[] = { -+ <xsl:for-each select="optiongroup"> -+ <xsl:for-each select="option"> -+ { "<xsl:value-of select="@name"/>", -+ CONF_TYPE_<xsl:value-of select="translate(@type,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/> -+ <xsl:if test="@multiple='yes'"> | CONF_TYPE_F_MULTI</xsl:if> -+ <xsl:if test="@required='yes'"> | CONF_TYPE_F_REQUIRED</xsl:if> -+ <xsl:if test="@env='yes'"> | CONF_TYPE_F_ENV</xsl:if> -+ <xsl:if test="@list='yes'"> | CONF_TYPE_F_LIST</xsl:if> -+ <xsl:if test="@path='yes'"> | CONF_TYPE_F_PATH</xsl:if> -+ <xsl:if test="@obsoleted='yes'"> | CONF_TYPE_F_OBSL</xsl:if>, -+ <xsl:choose> -+ <xsl:when test="string-length(@default) > 0">"<xsl:value-of select="@default"/>"</xsl:when> -+ <xsl:otherwise>NULL</xsl:otherwise> -+ </xsl:choose>, -+ <xsl:choose> -+ <xsl:when test="string-length(@op) > 0">POLDEK_OP_<xsl:value-of select="@op"/></xsl:when> -+ <xsl:otherwise>0</xsl:otherwise> -+ </xsl:choose>, { 0 } }, -+ <xsl:for-each select="alias"> -+ { "<xsl:value-of select="@name"/>", CONF_TYPE_F_ALIAS<xsl:if test="@obsoleted='yes'"> | CONF_TYPE_F_OBSL</xsl:if>, NULL, 0, { 0 } }, -+ </xsl:for-each> -+ -+ </xsl:for-each> -+ </xsl:for-each> -+ { NULL, 0, NULL, 0, { 0 } } -+}; -+ -+ </xsl:for-each> -+ -+ -+struct poldek_conf_section poldek_conf_sections[] = { -+ <xsl:for-each select="config/confsection"> -+ { "<xsl:value-of select="@name"/>", <xsl:value-of select="@name"/>_tags, -+ <xsl:choose> -+ <xsl:when test="@multiple='yes'">1</xsl:when> -+ <xsl:otherwise>0</xsl:otherwise> -+ </xsl:choose>, -+ }, -+ </xsl:for-each> -+ { NULL, 0, 0 } -+}; -+ -+</xsl:template> -+</xsl:stylesheet> ++# RPM 4.4.6 introduces auto dependencies based on package directories. Option controls this feature. ++auto directory dependencies = no + + # Automatically install packages required by installed ones. + #follow = yes + +--- poldek-0.21-cvs20070703.00/conf_sections.c~ 2007-06-30 10:42:33.000000000 +0300 ++++ poldek-0.21-cvs20070703.00/conf_sections.c 2008-02-15 05:00:16.039094830 +0200 +@@ -205,7 +205,7 @@ + + { "auto directory dependencies", + CONF_TYPE_BOOLEAN3, +- "auto", ++ "no", + POLDEK_OP_AUTODIRDEP, { 0 } }, + + { "follow", |