rpms/gtk-doc/devel fix-fixxref.patch,NONE,1.1 gtk-doc.spec,1.59,1.60

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk-doc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12579

Modified Files:
	gtk-doc.spec 
Added Files:
	fix-fixxref.patch 
Log Message:
fix issues with gtkdoc-fixxref


fix-fixxref.patch:
 gtkdoc-fixxref.in |   56 +++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

--- NEW FILE fix-fixxref.patch ---
diff -up gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref gtk-doc-1.13/gtkdoc-fixxref.in
--- gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref	2009-12-17 14:36:51.000000000 -0500
+++ gtk-doc-1.13/gtkdoc-fixxref.in	2010-01-06 17:56:55.457121567 -0500
@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
     }
 }
 
-open (INPUT, "$MODULE-sections.txt")
-	|| die "Can't open $MODULE-sections.txt: $!";
-my $subsection = "";
-while (<INPUT>) {
-    if (m/^#/) {
-        next;
-
-    } elsif (m/^<SECTION>/) {
-        $subsection = "";
-    } elsif (m/^<SUBSECTION\s*(.*)>/i) {
-        $subsection = $1;
-    } elsif (m/^<SUBSECTION>/) {
-        next;
-    } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
-        next;
-    } elsif (m/^<FILE>(.*)<\/FILE>/) {
-        next;
-    } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
-        next;
-    } elsif (m/^<\/SECTION>/) {
-        next;
-    } elsif (m/^(\S+)/) {
-        my $symbol=CreateValidSGMLID($1);
-
-        if ($subsection eq "Standard" || $subsection eq "Private") {
-            $NoLinks{$symbol} = 1;
+if (defined($MODULE)) {
+    open (INPUT, "$MODULE-sections.txt")
+            || die "Can't open $MODULE-sections.txt: $!";
+    my $subsection = "";
+    while (<INPUT>) {
+        if (m/^#/) {
+            next;
+
+        } elsif (m/^<SECTION>/) {
+            $subsection = "";
+        } elsif (m/^<SUBSECTION\s*(.*)>/i) {
+            $subsection = $1;
+        } elsif (m/^<SUBSECTION>/) {
+            next;
+        } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
+            next;
+        } elsif (m/^<FILE>(.*)<\/FILE>/) {
+            next;
+        } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
+            next;
+        } elsif (m/^<\/SECTION>/) {
+            next;
+        } elsif (m/^(\S+)/) {
+            my $symbol=CreateValidSGMLID($1);
+
+            if ($subsection eq "Standard" || $subsection eq "Private") {
+                $NoLinks{$symbol} = 1;
+            }
         }
     }
+    close (INPUT);
 }
-close (INPUT);
 
 &FixCrossReferences ($MODULE_DIR);
 


Index: gtk-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- gtk-doc.spec	22 Dec 2009 16:20:15 -0000	1.59
+++ gtk-doc.spec	6 Jan 2010 23:01:28 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.13/gtk-doc-%{version}.tar.bz2
@@ -28,6 +28,9 @@ Requires: sgml-common
 Source1: filter-requires-gtk-doc.sh
 %define __perl_requires %{SOURCE1}
 
+# upstream fix
+Patch0: fix-fixxref.patch
+
 %description
 gtk-doc is a tool for generating API reference documentation.
 It is used for generating the documentation for GTK+, GLib
@@ -36,6 +39,7 @@ and GNOME.
 %prep
 
 %setup -q
+%patch0 -R -p1 -b .fix-fixxref
 
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
@@ -69,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omf/gtk-doc-manual
 
 %changelog
+* Wed Jan  6 2010 Matthias Clasen <mclasen at redhat.com> - 1.13-2
+- Fix issues with gtkdoc-fixxref
+
 * Tue Dec 22 2009 Matthias Clasen <mclasen at redhat.com> - 1.13-1
 - Update to 1.13