From b8cda15a5037939971a835502c42fe237e87c019 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Tue, 10 Jul 2007 20:40:47 +0000
Subject: [PATCH] 	* fixed scrollkeeper to not write on /etc/xml/catalog
 directly, solving a 	  share with libxml

git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21624 10447126-35f2-4685-b0cf-6dd780d3921f
---
 gnome2/scrollkeeper/scrollkeeper-pkg.conf |  8 ++---
 gnome2/scrollkeeper/scrollkeeper.conf     |  9 ++---
 gnome2/scrollkeeper/xmlcatalog.patch      | 44 +++++++++++++++++++++++
 3 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 gnome2/scrollkeeper/xmlcatalog.patch

diff --git a/gnome2/scrollkeeper/scrollkeeper-pkg.conf b/gnome2/scrollkeeper/scrollkeeper-pkg.conf
index ddae449b3..dac5fdd1e 100644
--- a/gnome2/scrollkeeper/scrollkeeper-pkg.conf
+++ b/gnome2/scrollkeeper/scrollkeeper-pkg.conf
@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../scrollkeeper/scrollkeeper-pkg.conf
+# Filename: package/.../scrollkeeper/scrollkeeper-pkg.conf
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2004 Clifford Wolf
 # 
@@ -11,11 +12,10 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 # exclude some scrollkeeper files - so we do not need to patch every
 # single package ...
-#flistdel="$flistdel|etc/xml/catalog"
 if [ $pkg != "scrollkeeper" ] ; then
 	flistdel="$flistdel|var/.*scrollkeeper_.*cl.xml"
 	flistdel="$flistdel|var/.*scrollkeeper/scrollkeeper_docs"
diff --git a/gnome2/scrollkeeper/scrollkeeper.conf b/gnome2/scrollkeeper/scrollkeeper.conf
index 577c767ea..78724db34 100644
--- a/gnome2/scrollkeeper/scrollkeeper.conf
+++ b/gnome2/scrollkeeper/scrollkeeper.conf
@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../scrollkeeper/scrollkeeper.conf
+# Filename: package/.../scrollkeeper/scrollkeeper.conf
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2004 Clifford Wolf
 # 
@@ -11,8 +12,8 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 var_append confopt " " "--with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf:/opt/kde3/omf"
+var_append makeinstopt ' ' XMLCATALOG=yes
 
diff --git a/gnome2/scrollkeeper/xmlcatalog.patch b/gnome2/scrollkeeper/xmlcatalog.patch
new file mode 100644
index 000000000..99fe62e4d
--- /dev/null
+++ b/gnome2/scrollkeeper/xmlcatalog.patch
@@ -0,0 +1,44 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# Filename: package/.../scrollkeeper/xmlcatalog.patch
+# Copyright (C) 2007 The OpenSDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- ./extract/dtds/Makefile.in.orig	2003-12-06 05:18:01.000000000 -0300
++++ ./extract/dtds/Makefile.in	2007-07-10 16:25:39.000000000 -0400
+@@ -179,6 +179,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ CATALOG = @XML_CATALOG@
++XMLCATALOG = /usr/bin/xmlcatalog
+ dtdsdir = $(datadir)/xml/scrollkeeper/dtds
+ dtds_HEADERS = scrollkeeper-omf.dtd scrollkeeper-cl.dtd
+ subdir = extract/dtds
+@@ -408,7 +409,7 @@
+ 
+ # ScrollKeeper OMF Variation DTD V1.0
+ install-data-hook:
+-	-/usr/bin/xmlcatalog --noout --add "public" \
++	-$(XMLCATALOG) --noout --add "public" \
+ 		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+ 		"$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG)
+ 
+@@ -418,7 +419,7 @@
+ 
+ # ScrollKeeper OMF Variation DTD V1.0
+ uninstall-local:
+-	-/usr/bin/xmlcatalog --noout --del \
++	-$(XMLCATALOG) --noout --del \
+ 		"$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.