rpms/gtk-doc/devel gtk-doc.spec,1.42,1.43 rebase.patch,1.2,1.3

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gtk-doc.spec rebase.patch 
Log Message:
Improve the previous fix



Index: gtk-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gtk-doc.spec	18 Dec 2007 17:03:00 -0000	1.42
+++ gtk-doc.spec	7 Jan 2008 15:18:54 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.9
-Release: 2%{?dist}
+Release: 3%{?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 
@@ -83,6 +83,9 @@
 %{_datadir}/omf/gtk-doc/
 
 %changelog
+* Mon Jan  7 2007 Matthias Clasen <mclasen at redhat.com> - 1.9-3
+- Improve the fix 
+
 * Tue Dec 18 2007 Matthias Clasen <mclasen at redhat.com> - 1.9-2
 - Fix a problem in gtk-doc.make
 

rebase.patch:

Index: rebase.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk-doc/devel/rebase.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rebase.patch	18 Dec 2007 17:10:11 -0000	1.2
+++ rebase.patch	7 Jan 2008 15:18:54 -0000	1.3
@@ -8,8 +8,8 @@
 -	  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) ; \
++	  (which gtkdoc-rebase >& /dev/null && \
++            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || : \
  	fi