Summary: | app-admin/elektra-0.7.1 fails applying "elektra-0.7.1-ltdl.patch" | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Chris Reffett (RETIRED) <creffett> |
Component: | Current packages | Assignee: | Michael Weber (RETIRED) <xmw> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 402473 | ||
Attachments: |
build.log
elektra-0.7.1-ltdl.patch.out |
Description
Chris Reffett (RETIRED)
![]() ![]() Created attachment 301323 [details]
build.log
Created attachment 301325 [details]
elektra-0.7.1-ltdl.patch.out
Yes. what the heck? doc/Mailfile.am starts with "# $Id: $", thus the old unified patch contained that on it's third line (after --- and +++). This got cvs tagged. I've altered the patch to not list that line. I blame `repoman commit` post-commit hook for that. -@@ -1,4 +1,5 @@ - # $Id: elektra-0.7.1-ltdl.patch,v 1.1 2012/02/08 04:43:23 xmw Exp $ Index: elektra-0.7.1-ltdl.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/elektra/files/elektra-0.7.1-ltdl.patch,v retrieving revision 1.1 diff -u -B -r1.1 elektra-0.7.1-ltdl.patch --- elektra-0.7.1-ltdl.patch 8 Feb 2012 04:43:23 -0000 1.1 +++ elektra-0.7.1-ltdl.patch 9 Feb 2012 23:49:43 -0000 @@ -4,15 +4,18 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libltdl src doc benchmarks examples scripts xmlschema tests -+SUBDIRS = src doc benchmarks examples scripts xmlschema tests ++SUBDIRS = src doc benchmarks examples scripts xmlschema tests EXTRA_DIST=elektra.pc elektratools.pc elektracpp.pc elektra.spec elektra.mandriva.spec elektra.xml pkgconfigdir = $(ulibdir)/pkgconfig --- elektra-0.7.1/doc/Makefile.am +++ elektra-0.7.1/doc/Makefile.am -@@ -1,4 +1,5 @@ - # $Id: elektra-0.7.1-ltdl.patch,v 1.1 2012/02/08 04:43:23 xmw Exp $ +@@ -7,6 +7,8 @@ + EXTRA_DIST+=$(all_mans) + EXTRA_DIST+= $(HTML_TITLE_LAYOUT_XSL) + +develdocDATA_INSTALL = install ++ + SUBDIRS=images standards - EXTRA_DIST=kdb.1.xml elektra.7.xml elektra.5.xml - EXTRA_DIST+=author.xml bestpract.xml rgexample.xml rgcmd.xml storage.xml overview.xml apiexample.xml api.xml compared.xml garbage.xml html-params.xsl html-titlepage-layout.tpl society.xml storage.xml UPLOAD + # Dependencies for Doxygen documentation Just checked viewvcs [1], should be fine now. [1] http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-admin/elektra/files/elektra-0.7.1-ltdl.patch?r1=1.1&r2=1.2 |