diff --git a/gtk-doc.spec b/gtk-doc.spec index 9b3d890..82bf155 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -1,11 +1,12 @@ Summary: API documentation generation tool for GTK+ and GNOME Name: gtk-doc Version: 1.9 -Release: 1%{?dist} +Release: 2%{?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 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gtk.org/gtk-doc @@ -42,6 +43,7 @@ and GNOME. %setup -q %patch0 -p1 -b .docdir +%patch1 -p1 -b .rebase # Move this doc file to avoid name collisions mv doc/README doc/README.docs @@ -81,6 +83,9 @@ scrollkeeper-update -q %{_datadir}/omf/gtk-doc/ %changelog +* Tue Dec 18 2007 Matthias Clasen - 1.9-2 +- Fix a problem in gtk-doc.make + * Sun Nov 18 2007 Matthias Clasen - 1.9-1 - Update to 1.9 diff --git a/rebase.patch b/rebase.patch new file mode 100644 index 0000000..e3c4f78 --- /dev/null +++ b/rebase.patch @@ -0,0 +1,29 @@ +diff -up gtk-doc-1.9/gtk-doc.make.rebase gtk-doc-1.9/gtk-doc.make +--- gtk-doc-1.9/gtk-doc.make.rebase 2007-12-18 11:57:20.000000000 -0500 ++++ gtk-doc-1.9/gtk-doc.make 2007-12-18 12:00:35.000000000 -0500 +@@ -139,9 +139,8 @@ install-data-local: + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ +- if test `which gtkdoc-rebase` != ""; then \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ +- fi \ ++ which gtkdoc-rebase > /dev/null && \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + +diff -up gtk-doc-1.9/gtk-doc.notmpl.make.rebase gtk-doc-1.9/gtk-doc.notmpl.make +--- gtk-doc-1.9/gtk-doc.notmpl.make.rebase 2007-12-18 11:59:06.000000000 -0500 ++++ gtk-doc-1.9/gtk-doc.notmpl.make 2007-12-18 11:59:56.000000000 -0500 +@@ -124,9 +124,8 @@ install-data-local: + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ +- if test `which gtkdoc-rebase` != ""; then \ ++ which gtk-doc-rebase > /dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ +- fi \ + fi + + uninstall-local: