rpms/gtk-doc/devel rebase.patch,NONE,1.1 gtk-doc.spec,1.41,1.42

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27961

Modified Files:
	gtk-doc.spec 
Added Files:
	rebase.patch 
Log Message:
fix a problem in gtk-doc.make


rebase.patch:

--- NEW FILE rebase.patch ---
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:


Index: gtk-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gtk-doc.spec	18 Nov 2007 17:13:34 -0000	1.41
+++ gtk-doc.spec	18 Dec 2007 17:03:00 -0000	1.42
@@ -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 @@
 
 %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 @@
 %{_datadir}/omf/gtk-doc/
 
 %changelog
+* Tue Dec 18 2007 Matthias Clasen <mclasen at redhat.com> - 1.9-2
+- Fix a problem in gtk-doc.make
+
 * Sun Nov 18 2007 Matthias Clasen <mclasen at redhat.com> - 1.9-1
 - Update to 1.9