rpms/gtk2/devel gtkdoc-rebase.patch,NONE,1.1 gtk2.spec,1.272,1.273

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28322

Modified Files:
	gtk2.spec 
Added Files:
	gtkdoc-rebase.patch 
Log Message:
try to make it build


gtkdoc-rebase.patch:

--- NEW FILE gtkdoc-rebase.patch ---
diff -up gtk+-2.12.3/gtk-doc.make.rebase gtk+-2.12.3/gtk-doc.make
--- gtk+-2.12.3/gtk-doc.make.rebase	2007-12-18 12:09:09.000000000 -0500
+++ gtk+-2.12.3/gtk-doc.make	2007-12-18 12:11:22.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
 	
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- gtk2.spec	18 Dec 2007 05:00:28 -0000	1.272
+++ gtk2.spec	18 Dec 2007 17:14:12 -0000	1.273
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -40,6 +40,9 @@
 # backport from svn trunk
 Patch5: im-setting.patch
 
+# fix a gtk-doc issue
+Patch6: gtkdoc-rebase.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -119,6 +122,7 @@
 %patch3 -p1 -b .system-log-crash
 %patch4 -p1 -b .tab-label
 %patch5 -p1 -b .im-setting
+%patch6 -p1 -b .gtkdoc-rebase
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -154,7 +158,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 # Deriving /etc/gtk-2.0/$host location
 # NOTE: Duplicated below
 #
@@ -302,6 +305,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Dec 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.3-4
+- Fix a gtk-doc problem
+
 * Mon Dec 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.3-3
 - Add a setting to change input methods