rpms/gtk-doc/devel gtk-doc-1.7-docdir.patch, NONE, 1.1 gtk-doc.spec, 1.25, 1.26

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

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/devel/gtk-doc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gtk-doc.spec	20 Dec 2006 15:08:11 -0000	1.25
+++ gtk-doc.spec	2 Feb 2007 20:05:29 -0000	1.26
@@ -1,12 +1,13 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.7
-Release: 2%{?dist}
+Release: 3%{?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
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gtk.org/gtk-doc
 
 BuildRequires: docbook-utils 
@@ -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
 
@@ -68,6 +71,9 @@
 %{_datadir}/omf/gtk-doc/
 
 %changelog
+* Fri Feb  2 2007 Matthias Clasen <mclasen at redhat.com> - 1.7-3
+- Fix the omf file (#223684)
+
 * Wed Dec 20 2006 Matthias Clasen <mclasen at redhat.com> - 1.7-2
 - Own the /usr/share/gtk-doc/html directory (#220230)