rpms/gtk-doc/FC-6 gtk-doc-1.7-docdir.patch, NONE, 1.1 gtk-doc.spec, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gtk-doc/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv6374

Modified Files:
	gtk-doc.spec 
Added Files:
	gtk-doc-1.7-docdir.patch 
Log Message:
fix the omf file


gtk-doc-1.7-docdir.patch:
 Makefile.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gtk-doc-1.7-docdir.patch ---
--- gtk-doc-1.7/help/manual/C/Makefile.in.docdir	2007-02-02 15:11:28.000000000 -0500
+++ gtk-doc-1.7/help/manual/C/Makefile.in	2007-02-02 15:11:52.000000000 -0500
@@ -382,7 +382,7 @@
 
 @ENABLE_SCROLLKEEPER_TRUE at omf_timestamp: $(omffile)
 @ENABLE_SCROLLKEEPER_TRUE@	-for file in $(omffile); do \
- at ENABLE_SCROLLKEEPER_TRUE@	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
+ at ENABLE_SCROLLKEEPER_TRUE@	  scrollkeeper-preinstall $(gtkdochelpdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
 @ENABLE_SCROLLKEEPER_TRUE@	done
 @ENABLE_SCROLLKEEPER_TRUE@	touch omf_timestamp
 


Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/FC-6/gtk-doc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtk-doc.spec	2 Aug 2006 19:26:45 -0000	1.24
+++ gtk-doc.spec	2 Feb 2007 20:22:03 -0000	1.25
@@ -1,10 +1,11 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.6/gtk-doc-%{version}.tar.bz2 
+Patch0: gtk-doc-1.7-docdir.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gtk.org/gtk-doc
@@ -31,6 +32,8 @@
 %prep
 
 %setup -q
+%patch0 -p1 -b .docdir
+
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
 
@@ -66,6 +69,9 @@
 %{_datadir}/omf/gtk-doc/
 
 %changelog
+* Fri Feb  2 2007 Matthias Clasen <mclasen at redhat.com> - 1.7-2
+- Fix the omf file (#223684)
+
 * Wed Aug  2 2006 Matthias Clasen <mclasen at redhat.com> - 1.7-1.fc6
 - Update to 1.7