From db71168141a75374ac329faa9e5fc198607793d1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 25 Apr 2008 03:36:07 +0000 Subject: [PATCH] fix up spec --- docdir.patch | 284 --------------------------------------------------- gtk-doc.spec | 5 + 2 files changed, 5 insertions(+), 284 deletions(-) diff --git a/docdir.patch b/docdir.patch index e52c210..62007c5 100644 --- a/docdir.patch +++ b/docdir.patch @@ -1,287 +1,3 @@ -diff -up gtk-doc-1.9/help/manual/C/Makefile.in.docdir gtk-doc-1.9/help/manual/C/Makefile.in ---- gtk-doc-1.9/help/manual/C/Makefile.in.docdir 2007-11-18 11:28:36.000000000 -0500 -+++ gtk-doc-1.9/help/manual/C/Makefile.in 2007-11-18 11:28:48.000000000 -0500 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -75,15 +75,11 @@ - # http://scrollkeeper.sourceforge.net/ - # Version: 0.1.3 (last updated: March 20, 2002) - # --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -113,16 +109,12 @@ DIST_SOURCES = - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ --BUILD_TESTS_FALSE = @BUILD_TESTS_FALSE@ --BUILD_TESTS_TRUE = @BUILD_TESTS_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ -@@ -140,16 +132,11 @@ ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_SCROLLKEEPER_FALSE = @ENABLE_SCROLLKEEPER_FALSE@ --ENABLE_SCROLLKEEPER_TRUE = @ENABLE_SCROLLKEEPER_TRUE@ - EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - GREP = @GREP@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -162,9 +149,8 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +164,7 @@ PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ - RANLIB = @RANLIB@ - SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SGML_FORMAT_TYPE = @SGML_FORMAT_TYPE@ - SHELL = @SHELL@ -@@ -188,13 +175,13 @@ VERSION = @VERSION@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ - XSLTPROC = @XSLTPROC@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -206,13 +193,9 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ -- --# ********** Begin of section some packagers may need to modify ********** --# This variable (docdir) specifies where the documents should be installed. --# This default value should work for most packages. --@ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang) - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ -@@ -240,14 +223,22 @@ psdir = @psdir@ - sbindir = @sbindir@ - scrollkeeper_config = @scrollkeeper_config@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - figdir = - docname = gtk-doc-manual - lang = C - omffile = gtk-doc-manual-C.omf - entities = fdl-appendix.xml - -+# ********** Begin of section some packagers may need to modify ********** -+# This variable (docsdir) specifies where the documents should be installed. -+# This default value should work for most packages. -+@ENABLE_SCROLLKEEPER_TRUE@docsdir = $(datadir)/gnome/help/$(docname)/$(lang) -+ - # ********** You should not have to edit below this line ********** - @ENABLE_SCROLLKEEPER_TRUE@xml_files = $(entities) $(docname).xml - @ENABLE_SCROLLKEEPER_TRUE@EXTRA_DIST = $(xml_files) $(omffile) -@@ -294,10 +285,6 @@ mostlyclean-libtool: - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: - tags: TAGS - TAGS: - -@@ -307,23 +294,21 @@ CTAGS: - @ENABLE_SCROLLKEEPER_FALSE@dist-hook: - - distdir: $(DISTFILES) -- $(mkdir_p) $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -376,7 +361,7 @@ clean-am: clean-generic clean-libtool cl - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool -+distclean-am: clean-am distclean-generic - - dvi: dvi-am - -@@ -392,12 +377,20 @@ install-data-am: install-data-local - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -416,18 +409,22 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am uninstall-local -+uninstall-am: uninstall-local -+ -+.MAKE: install-am install-data-am install-strip - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local dist-hook distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ -- install-data-hook install-data-local install-exec \ -- install-exec-am install-info install-info-am install-man \ -+ install-data-hook install-data-local install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-info-am uninstall-local -+ uninstall uninstall-am uninstall-local - - - # At some point, it may be wise to change to something like this: -@@ -478,15 +475,15 @@ uninstall-am: uninstall-info-am uninstal - @ENABLE_SCROLLKEEPER_TRUE@ fi - - @ENABLE_SCROLLKEEPER_TRUE@install-data-local: omf --@ENABLE_SCROLLKEEPER_TRUE@ $(mkinstalldirs) $(DESTDIR)$(docdir) -+@ENABLE_SCROLLKEEPER_TRUE@ $(mkinstalldirs) $(DESTDIR)$(docsdir) - @ENABLE_SCROLLKEEPER_TRUE@ for file in $(xml_files); do \ --@ENABLE_SCROLLKEEPER_TRUE@ cp $(srcdir)/$$file $(DESTDIR)$(docdir); \ -+@ENABLE_SCROLLKEEPER_TRUE@ cp $(srcdir)/$$file $(DESTDIR)$(docsdir); \ - @ENABLE_SCROLLKEEPER_TRUE@ done - @ENABLE_SCROLLKEEPER_TRUE@ if test "$(figdir)"; then \ --@ENABLE_SCROLLKEEPER_TRUE@ $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \ -+@ENABLE_SCROLLKEEPER_TRUE@ $(mkinstalldirs) $(DESTDIR)$(docsdir)/$(figdir); \ - @ENABLE_SCROLLKEEPER_TRUE@ for file in $(srcdir)/$(figdir)/*.png; do \ - @ENABLE_SCROLLKEEPER_TRUE@ basefile=`echo $$file | sed -e 's,^.*/,,'`; \ --@ENABLE_SCROLLKEEPER_TRUE@ $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ -+@ENABLE_SCROLLKEEPER_TRUE@ $(INSTALL_DATA) $$file $(DESTDIR)$(docsdir)/$(figdir)/$$basefile; \ - @ENABLE_SCROLLKEEPER_TRUE@ done \ - @ENABLE_SCROLLKEEPER_TRUE@ fi - -@@ -498,14 +495,14 @@ uninstall-am: uninstall-info-am uninstal - @ENABLE_SCROLLKEEPER_TRUE@ -if test "$(figdir)"; then \ - @ENABLE_SCROLLKEEPER_TRUE@ for file in $(srcdir)/$(figdir)/*.png; do \ - @ENABLE_SCROLLKEEPER_TRUE@ basefile=`echo $$file | sed -e 's,^.*/,,'`; \ --@ENABLE_SCROLLKEEPER_TRUE@ rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ -+@ENABLE_SCROLLKEEPER_TRUE@ rm -f $(DESTDIR)$(docsdir)/$(figdir)/$$basefile; \ - @ENABLE_SCROLLKEEPER_TRUE@ done; \ --@ENABLE_SCROLLKEEPER_TRUE@ rmdir $(DESTDIR)$(docdir)/$(figdir); \ -+@ENABLE_SCROLLKEEPER_TRUE@ rmdir $(DESTDIR)$(docsdir)/$(figdir); \ - @ENABLE_SCROLLKEEPER_TRUE@ fi - @ENABLE_SCROLLKEEPER_TRUE@ -for file in $(xml_files); do \ --@ENABLE_SCROLLKEEPER_TRUE@ rm -f $(DESTDIR)$(docdir)/$$file; \ -+@ENABLE_SCROLLKEEPER_TRUE@ rm -f $(DESTDIR)$(docsdir)/$$file; \ - @ENABLE_SCROLLKEEPER_TRUE@ done --@ENABLE_SCROLLKEEPER_TRUE@ -rmdir $(DESTDIR)$(docdir) -+@ENABLE_SCROLLKEEPER_TRUE@ -rmdir $(DESTDIR)$(docsdir) - - @ENABLE_SCROLLKEEPER_TRUE@clean-local: clean-local-doc clean-local-omf - diff -up gtk-doc-1.9/xmldocs.make.docdir gtk-doc-1.9/xmldocs.make --- gtk-doc-1.9/xmldocs.make.docdir 2007-02-05 11:51:22.000000000 -0500 +++ gtk-doc-1.9/xmldocs.make 2007-11-18 11:27:57.000000000 -0500 diff --git a/gtk-doc.spec b/gtk-doc.spec index f5e5ed4..dee08d5 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -5,6 +5,7 @@ Release: 1%{?dist} License: GPLv2+ and GFDL+ Group: Development/Tools Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.9/gtk-doc-%{version}.tar.bz2 +Patch0: docdir.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gtk.org/gtk-doc @@ -40,6 +41,10 @@ and GNOME. %prep %setup -q +%patch0 -p1 -b .docdir + +aclocal +automake # Move this doc file to avoid name collisions mv doc/README doc/README.docs