Attachment 296535 Details for Bug 435651 – Upstream patch to fix this bug and update the specfile

[patch] Upstream patch to fix this bug and update the specfile

gtk-doc-make-dist.patch (text/plain), 2.28 KB, created by Todd Zullinger on 2008-03-03 01:49:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Todd Zullinger

Created: 2008-03-03 01:49:31 UTC

Size: 2.28 KB

patch

obsolete

>Index: gtk-doc.spec
>===================================================================
>RCS file: /cvs/extras/rpms/gtk-doc/devel/gtk-doc.spec,v
>retrieving revision 1.45
>diff -u -p -r1.45 gtk-doc.spec
>--- gtk-doc.spec	8 Jan 2008 15:31:20 -0000	1.45
>+++ gtk-doc.spec	3 Mar 2008 01:40:36 -0000
>@@ -1,12 +1,14 @@
> Summary: API documentation generation tool for GTK+ and GNOME
> Name: gtk-doc
> Version: 1.9
>-Release: 4%{?dist}
>+Release: 5%{?dist}
> License: GPLv2+ and GFDL+
> Group: Development/Tools
> Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.9/gtk-doc-%{version}.tar.bz2 
> Patch0: docdir.patch
> Patch1: rebase.patch
>+# http://bugzilla.gnome.org/509539
>+Patch2: make-dist.patch
> BuildArch: noarch
> BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> URL: http://www.gtk.org/gtk-doc
>@@ -44,6 +46,7 @@ and GNOME.
> %setup -q
> %patch0 -p1 -b .docdir
> %patch1 -p1 -b .rebase
>+%patch2 -p1 -b .make-dist
> 
> # Move this doc file to avoid name collisions
> mv doc/README doc/README.docs
>@@ -83,6 +86,10 @@ scrollkeeper-update -q
> %{_datadir}/omf/gtk-doc/
> 
> %changelog
>+* Sun Mar 02 2008 Todd Zullinger <tmz@pobox.com> - 1.9-5
>+- Add upstream patch to fix make dist when no .types file is present
>+  (gnome bz#509539)
>+
> * Tue Jan  8 2008 Matthias Clasen <mclasen@redhat.com> - 1.9-4
> - Try again 
> 
>Index: make-dist.patch
>===================================================================
>RCS file: make-dist.patch
>diff -N make-dist.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ make-dist.patch	3 Mar 2008 01:40:36 -0000
>@@ -0,0 +1,19 @@
>+This fixes http://bugzilla.gnome.org/509539 (Building documentation aborts when
>+no .types file is present)
>+
>+Taken from:
>+http://svn.gnome.org/viewvc/gtk-doc/trunk/gtk-doc.make?r1=541&r2=542&view=patch
>+
>+--- trunk/gtk-doc.make	2008/01/14 19:22:33	541
>++++ trunk/gtk-doc.make	2008/01/17 13:16:45	542
>+@@ -165,8 +165,8 @@
>+ 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
>+ 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
>+ 	cp $(srcdir)/html/* $(distdir)/html
>+-	cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
>+-	cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
>++	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
>++	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
>+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
>+ 	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
>+

Actions: View | Diff

Attachments on bug 435651: 296535