auto-import changelog data from sgml-common-0.6.3-9.src.rpm

Thu Feb 21 2002 Tim Waugh <twaugh@redhat.com> 0.6.3-9 - Rebuild in new environment. Thu Jan 17 2002 Tim Waugh <twaugh@redhat.com> 0.6.3-8 - Back to /usr/share/sgml. Now install docbook-dtds. - Use a real install-sh, not the symlink shipped in the tarball. Wed Jan 09 2002 Tim Powers <timp@redhat.com> 0.6.3-7 - automated rebuild Mon Nov 05 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-6 - Don't create a useless empty catalog. - Don't try to put install things outside the build root. - Build requires a libxml2 that actually works. Mon Nov 05 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-4 - Use (and handle) catalog files with quotes in install-catalog. Thu Nov 01 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-3 - Create default XML Catalog at build time, not install time. Fri Oct 05 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-2 - Move XML things into /usr/share/xml, and split them out into separate xml-common package. Mon Oct 01 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-1 - 0.6.3. Incorporates oldsyntax and quiet patches. - Make /etc/sgml/sgml.conf noreplace. - Own /etc/sgml, various other directories (bug #47485, bug #54180).
2004-09-09 12:19:15 +00:00 · 2004-09-09 12:19:15 +00:00 · e57bba033d
commit e57bba033d
parent 01cd12d1c0
6 changed files with 206 additions and 31 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1,2 @@
-sgml-common-0.5.tgz
+sgml-common-0.6.3.tgz
+sgml-common-automake.tar.gz
--- a/sgml-common-quotes.patch
+++ b/sgml-common-quotes.patch
@ -0,0 +1,94 @@
+--- sgml-common-0.6.3/bin/install-catalog.in.quotes	Mon Nov  5 11:19:23 2001
+++ sgml-common-0.6.3/bin/install-catalog.in	Mon Nov  5 11:20:12 2001
+@@ -39,8 +39,8 @@
+ # Process actions
+ case $1 in
+    -a|--add)    SGML_ACTION="addition"
+-		SGML_CENTRALIZED=$2
+-		SGML_ORDINARY=$3
+		SGML_CENTRALIZED="$2"
+		SGML_ORDINARY="$3"
+ 		;;
+    -r|--remove)	if [ -z "$3" -o "$3" = "--version" ]
+ 		then
+@@ -48,8 +48,8 @@
+ 		  exit 0
+ 		fi
+    		SGML_ACTION="removal"
+-		SGML_CENTRALIZED=$2
+-		SGML_ORDINARY=$3
+		SGML_CENTRALIZED="$2"
+		SGML_ORDINARY="$3"
+ 		;;
+    -h|--help)	echo -e $SGML_HELP_MESSAGE
+ 		exit 0
+@@ -96,14 +96,14 @@
+ fi
+ case $SGML_ACTION in
+    addition)
+-	if [ -e $SGML_CENTRALIZED -a ! -w $SGML_CENTRALIZED ]
+	if [ -e "$SGML_CENTRALIZED" -a ! -w "$SGML_CENTRALIZED" ]
+ 	then
+ 	  echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2
+ 	  exit 2
+ 	fi
+ 	;;
+    removal)
+-	if [ ! -w $SGML_CENTRALIZED ]
+	if [ ! -w "$SGML_CENTRALIZED" ]
+ 	then
+ 	  echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2
+ 	  exit 2
+@@ -119,7 +119,7 @@
+ fi
+ case $SGML_ACTION in
+    addition)
+-	if [ ! -s $SGML_ORDINARY ]
+	if [ ! -s "$SGML_ORDINARY" ]
+ 	then
+ 	  echo "`basename $0`: \"$SGML_ORDINARY\" does not exist or is empty." >&2
+ 	  exit 2
+@@ -131,33 +131,33 @@
+ case $SGML_ACTION in
+     addition)
+ 	echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED"
+-	if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null
+	if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null
+ 	then
+ 	  echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2
+ 	else
+-	  echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED
+	  echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> "$SGML_CENTRALIZED"
+ 	fi
+-	grep -q $SGML_CENTRALIZED /etc/sgml/catalog 2>/dev/null
+	grep -q "$SGML_CENTRALIZED" /etc/sgml/catalog 2>/dev/null
+ 	if [ $? -ne 0 ]
+ 	then
+ 	  echo "`basename $0`: addition of $SGML_CENTRALIZED in /etc/sgml/catalog"
+-	  echo "$SGML_POINTER $SGML_CENTRALIZED" >> /etc/sgml/catalog
+	  echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> /etc/sgml/catalog
+ 	fi
+ 	;;
+    removal)
+ 	echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED"
+-	if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null
+	if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null
+ 	then
+-          sed -e "\:$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED > ${SGML_CENTRALIZED}.new
+-          mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED
+          sed -e "\:$SGML_POINTER \"\\?$SGML_ORDINARY\"\\?:d" < "$SGML_CENTRALIZED" > "${SGML_CENTRALIZED}.new"
+          mv "${SGML_CENTRALIZED}.new" "$SGML_CENTRALIZED"
+ 	else
+ 	  echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2
+ 	fi
+-	if [ ! -s $SGML_CENTRALIZED ]
+	if [ ! -s "$SGML_CENTRALIZED" ]
+ 	then
+-	  rm $SGML_CENTRALIZED
+	  rm "$SGML_CENTRALIZED"
+ 	  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
+          sed -e "\:$SGML_POINTER \"\\?$SGML_CENTRALIZED\"\\?:d" < /etc/sgml/catalog > /etc/sgml/catalog.new
+           mv /etc/sgml/catalog.new /etc/sgml/catalog
+ 	fi
+ 	;;
--- a/sgml-common-umask.patch
+++ b/sgml-common-umask.patch
@ -1,5 +1,5 @@
--- sgml-common-0.5/bin/install-catalog.umask	Mon May 21 11:48:37 2001
-+++ sgml-common-0.5/bin/install-catalog	Mon May 21 12:00:34 2001
+--- sgml-common-0.6.3/bin/install-catalog.in.umask	Mon May 21 11:48:37 2001
+++ sgml-common-0.6.3/bin/install-catalog.in	Mon May 21 12:00:34 2001
@@ -13,6 +13,9 @@
 \040 -h, --help: \t\t\t\t Print this help message and exit\n\
 \040 -v, --version: \t\t\t Print the version number and exit\n"
--- a/sgml-common-xmldir.patch
+++ b/sgml-common-xmldir.patch
@ -0,0 +1,8 @@
+--- sgml-common-0.6.3/xml-iso-entities/Makefile.am.xmldir	Fri Oct  5 16:37:43 2001
+++ sgml-common-0.6.3/xml-iso-entities/Makefile.am	Fri Oct  5 16:37:57 2001
+@@ -1,4 +1,4 @@
+-isoentdir = $(prefix)/share/sgml/xml-iso-entities-8879.1986
+isoentdir = $(prefix)/share/xml/xml-iso-entities-8879.1986
+ isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent \
+               ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent \
+               ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent \
--- a/sgml-common.spec
+++ b/sgml-common.spec
@ -1,6 +1,6 @@
 Name: sgml-common
-Version: 0.5
-Release: 7
+Version: 0.6.3
+Release: 9
 Group: Applications/Text

 Summary: Common SGML catalog and DTD files.
@ -8,17 +8,17 @@ Summary: Common SGML catalog and DTD files.
 License: GPL
 URL: http://www.iso.ch/cate/3524030.html

-Requires: sh-utils fileutils textutils grep
-
-BuildRoot: %{_tmppath}/%{name}-%{version}
-
 BuildArch: noarch
-Source0: %{name}-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}
+Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz
 Source1: sgml-common-CHANGES
-Patch0: sgml-common-oldsyntax.patch
-Patch1: sgml-common-quiet.patch
-Patch2: sgml-common-umask.patch
+Source2: sgml-common-automake.tar.gz
+Patch0: sgml-common-umask.patch
+Patch1: sgml-common-xmldir.patch
+Patch2: sgml-common-quotes.patch

+Requires: sh-utils fileutils textutils grep
+BuildRequires: libxml2 >= 2.4.8-2

 %description
 The sgml-common package contains a collection of entities and DTDs
@ -26,29 +26,61 @@ that are useful for processing SGML, but that don't need to be
 included in multiple packages.  Sgml-common also includes an
 up-to-date Open Catalog file.

+%package -n xml-common
+Group: Applications/Text
+Summary: Common XML catalog and DTD files.
+License: GPL
+URL: http://www.iso.ch/cate/3524030.html
+Requires: sh-utils fileutils textutils grep
+
+%description -n xml-common
+The xml-common package contains a collection of entities and DTDs
+that are useful for processing XML, but that don't need to be
+included in multiple packages.
+

 %prep
 %setup -q
-%patch0 -p1 -b .oldsyntax
-%patch1 -p1 -b .quiet
-%patch2 -p1 -b .umask
+%patch0 -p1 -b .umask
+%patch1 -p1 -b .xmldir
+%patch2 -p1 -b .quotes
+rm install-sh missing mkinstalldirs
+tar zxf %{SOURCE2}
+

 %build
+%configure


 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/share/sgml/sgml-iso-entities-8879.1986
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/etc/sgml
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
-install -m 0644 *.dcl $RPM_BUILD_ROOT/usr/share/sgml
-install -m 0644 iso-entities/*.ent $RPM_BUILD_ROOT/usr/share/sgml/sgml-iso-entities-8879.1986
-install -m 0644 iso-entities/catalog $RPM_BUILD_ROOT/usr/share/sgml/sgml-iso-entities-8879.1986
-install -m 0755 bin/* $RPM_BUILD_ROOT/usr/bin/
-install -m 0644 config/* $RPM_BUILD_ROOT/etc/sgml/
-install -m 0644 doc/man/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
+DESTDIR=$RPM_BUILD_ROOT
+rm -rf $DESTDIR
+%makeinstall
 cp %{SOURCE1} CHANGES
+mkdir $RPM_BUILD_ROOT/etc/xml
+mkdir $RPM_BUILD_ROOT/usr/share/sgml/docbook
+# Create an empty XML catalog.
+XMLCATALOG=$RPM_BUILD_ROOT/etc/xml/catalog
+/usr/bin/xmlcatalog --noout --create $XMLCATALOG
+# Now put the common DocBook entries in it
+/usr/bin/xmlcatalog --noout --add "delegatePublic" \
+	"-//OASIS//ENTITIES DocBook XML" \
+	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
+/usr/bin/xmlcatalog --noout --add "delegatePublic" \
+	"-//OASIS//DTD DocBook XML" \
+	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
+/usr/bin/xmlcatalog --noout --add "delegatePublic" \
+	"ISO 8879:1986" \
+	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
+/usr/bin/xmlcatalog --noout --add "delegateSystem" \
+	"http://www.oasis-open.org/docbook/" \
+	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
+/usr/bin/xmlcatalog --noout --add "delegateURI" \
+	"http://www.oasis-open.org/docbook/" \
+	"file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG
+# Also create the common DocBook catalog
+/usr/bin/xmlcatalog --noout --create \
+	$RPM_BUILD_ROOT/usr/share/sgml/docbook/xmlcatalog


 %clean
@ -58,15 +90,54 @@ rm -rf $DESTDIR

 %files
 %defattr (-,root,root)
-%doc doc/HTML/ CHANGES
-%config /etc/sgml/sgml.conf
-/usr/share/sgml/xml.dcl
+%doc CHANGES doc/HTML/*.html
+%dir /etc/sgml
+%config(noreplace) /etc/sgml/sgml.conf
+%dir /usr/share/sgml/sgml-iso-entities-8879.1986
 /usr/share/sgml/sgml-iso-entities-8879.1986/*
+/usr/share/sgml/xml.dcl
 /usr/bin/sgmlwhich
 /usr/bin/install-catalog
 %{_mandir}/*/*

+%files -n xml-common
+%defattr (-,root,root)
+%dir /etc/xml
+%config(noreplace) /etc/xml/catalog
+%dir /usr/share/sgml/docbook
+%config(noreplace) /usr/share/sgml/docbook/xmlcatalog
+
 %changelog
+* Thu Feb 21 2002 Tim Waugh <twaugh@redhat.com> 0.6.3-9
+- Rebuild in new environment.
+
+* Thu Jan 17 2002 Tim Waugh <twaugh@redhat.com> 0.6.3-8
+- Back to /usr/share/sgml.  Now install docbook-dtds.
+- Use a real install-sh, not the symlink shipped in the tarball.
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com> 0.6.3-7
+- automated rebuild
+
+* Mon Nov  5 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-6
+- Don't create a useless empty catalog.
+- Don't try to put install things outside the build root.
+- Build requires a libxml2 that actually works.
+
+* Mon Nov  5 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-4
+- Use (and handle) catalog files with quotes in install-catalog.
+
+* Thu Nov  1 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-3
+- Create default XML Catalog at build time, not install time.
+
+* Fri Oct  5 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-2
+- Move XML things into /usr/share/xml, and split them out into separate
+  xml-common package.
+
+* Mon Oct  1 2001 Tim Waugh <twaugh@redhat.com> 0.6.3-1
+- 0.6.3.  Incorporates oldsyntax and quiet patches.
+- Make /etc/sgml/sgml.conf noreplace.
+- Own /etc/sgml, various other directories (bug #47485, bug #54180).
+
 * Wed May 23 2001 Tim Waugh <twaugh@redhat.com> 0.5-7
 - Remove execute bit from data files.

--- a/3
+++ b/3
@ -1 +1,2 @@
-6a426886a34403f7612d48052999171b  sgml-common-0.5.tgz
+103c9828f24820df86e55e7862e28974  sgml-common-0.6.3.tgz
+85a611bea6fc1fcdb15c62b373a953e5  sgml-common-automake.tar.gz