rpms/gtk-doc/F-8 rebase.patch, NONE, 1.1 gtk-doc.spec, 1.40, 1.41 sources, 1.14, 1.15

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk-doc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19530

Modified Files:
	gtk-doc.spec sources 
Added Files:
	rebase.patch 
Log Message:
1.9


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 gtkdoc-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/F-8/gtk-doc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gtk-doc.spec	19 Oct 2007 23:55:08 -0000	1.40
+++ gtk-doc.spec	7 Jan 2008 15:41:10 -0000	1.41
@@ -1,10 +1,12 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
-Version: 1.8
+Version: 1.9
 Release: 3%{?dist}
 License: GPLv2+ and GFDL+
 Group: Development/Tools
-Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.8/gtk-doc-%{version}.tar.bz2 
+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
@@ -14,6 +16,7 @@
 BuildRequires: libxslt 
 BuildRequires: docbook-style-xsl
 BuildRequires: scrollkeeper
+BuildRequires: autoconf automake libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -39,6 +42,8 @@
 %prep
 
 %setup -q
+%patch0 -p1 -b .docdir
+%patch1 -p1 -b .rebase
 
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
@@ -78,6 +83,15 @@
 %{_datadir}/omf/gtk-doc/
 
 %changelog
+* Mon Jan  7 2008 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
+
+* Sun Nov 18 2007 Matthias Clasen <mclasen at redhat.com> - 1.9-1
+- Update to 1.9
+
 * Tue Aug  7 2007 Matthias Clasen <mclasen at redhat.com> - 1.8-3
 - Update the license field
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-doc/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Oct 2007 23:55:08 -0000	1.14
+++ sources	7 Jan 2008 15:41:10 -0000	1.15
@@ -1 +1 @@
-e61595df21431db28c83fe4c7d4a4fa8  gtk-doc-1.8.tar.bz2
+bcd002f381385812737a05538eb8b21e  gtk-doc-1.9.tar.bz2