[packages/sgml-common] - rediffed

[hawk]

commit d6eccd838e5bc805eeb29993de00cfe3e83a5abf
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Sat Dec 2 23:50:38 2023 +0100

    - rediffed

 sgml-common-chmod.patch | 16 ++++++++--------
 sgml-common.spec        |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/sgml-common.spec b/sgml-common.spec
index cf5e0c2..70dd9e7 100644
--- a/sgml-common.spec
+++ b/sgml-common.spec
@@ -2,7 +2,7 @@ Summary:	Common SGML catalog and DTD files
 Summary(pl.UTF-8):	Opisane w normie ISO 8879/1986 katalogi i DTD SGML-owe
 Name:		sgml-common
 Version:	0.6.3
-Release:	8
+Release:	9
 #Copyright:	(C) International Organization for Standardization 1986
 License:	distributable
 URL:		http://www.iso.ch/cate/3524030.html
diff --git a/sgml-common-chmod.patch b/sgml-common-chmod.patch
index a95985f..c249d88 100644
--- a/sgml-common-chmod.patch
+++ b/sgml-common-chmod.patch
@@ -1,8 +1,8 @@
-diff -Nur --exclude *~ sgml-common-0.5/bin/install-catalog sgml-common-0.5.new/bin/install-catalog
---- sgml-common-0.5/bin/install-catalog.in	Mon Feb 12 15:43:14 2001
-+++ sgml-common-0.5.new/bin/install-catalog.in	Mon Feb 12 15:46:26 2001
-@@ -133,12 +133,14 @@
- 	  echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED"
+diff -urNp -x '*.orig' sgml-common-0.6.3.org/bin/install-catalog.in sgml-common-0.6.3/bin/install-catalog.in
+--- sgml-common-0.6.3.org/bin/install-catalog.in	2001-01-12 16:35:39.000000000 +0100
++++ sgml-common-0.6.3/bin/install-catalog.in	2023-12-02 23:50:22.637916811 +0100
+@@ -133,12 +133,14 @@ case $SGML_ACTION in
+ 	  echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2
  	else
  	  echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED
 +	  chmod 644 $SGML_CENTRALIZED
@@ -16,15 +16,15 @@ diff -Nur --exclude *~ sgml-common-0.5/bin/install-catalog sgml-common-0.5.new/b
  	fi
  	;;
     removal)
-@@ -147,6 +149,7 @@
+@@ -147,6 +149,7 @@ case $SGML_ACTION in
  	then
            sed -e "\:$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED > ${SGML_CENTRALIZED}.new
            mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED
 +	  chmod 644 $SGML_CENTRALIZED
  	else
- 	  echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED"
+ 	  echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2
  	fi
-@@ -156,6 +159,7 @@
+@@ -156,6 +159,7 @@ case $SGML_ACTION in
  	  echo "`basename $0`: removal of $SGML_CENTRALIZED from /etc/sgml/catalog"
            sed -e "\:$SGML_POINTER $SGML_CENTRALIZED:d" < /etc/sgml/catalog > /etc/sgml/catalog.new
            mv /etc/sgml/catalog.new /etc/sgml/catalog
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sgml-common.git/commitdiff/d6eccd838e5bc805eeb29993de00cfe3e83a5abf