[html401-dtds] Add system entries to catalog. Drop specfile constructs no longer needed with Fedora or EL6+.
Ville Skyttä
scop at fedoraproject.org
Thu Dec 1 22:41:42 UTC 2011
commit 50198ec74e9a2c89a0700eb2ac005325e2cd43a0
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Fri Dec 2 00:41:28 2011 +0200
Add system entries to catalog.
Drop specfile constructs no longer needed with Fedora or EL6+.
html401-dtds-catalog.patch | 56 ++++++++++++++++++++++++++++++-------------
html401-dtds.spec | 46 ++++++++++++++++-------------------
2 files changed, 60 insertions(+), 42 deletions(-)
---
diff --git a/html401-dtds-catalog.patch b/html401-dtds-catalog.patch
index d5d15a5..cf2447b 100644
--- a/html401-dtds-catalog.patch
+++ b/html401-dtds-catalog.patch
@@ -1,27 +1,49 @@
---- HTML4.cat.orig 1999-12-25 01:26:00.000000000 +0200
-+++ HTML4.cat 2004-06-20 14:03:06.021819048 +0300
-@@ -6,3 +6,24 @@
+diff -up html401-dtds/HTML4.cat.orig html401-dtds/HTML4.cat
+--- html401-dtds/HTML4.cat.orig 1999-12-25 01:26:00.000000000 +0200
++++ html401-dtds/HTML4.cat 2011-12-02 00:34:21.235252388 +0200
+@@ -6,3 +6,45 @@ PUBLIC "-//W3C//DTD HTML 4.01 Frameset//
PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML" HTMLlat1.ent
PUBLIC "-//W3C//ENTITIES Special//EN//HTML" HTMLspecial.ent
PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML" HTMLsymbol.ent
+
++-- Fedora modification: added SYSTEMs --
++
++SYSTEM "http://www.w3.org/TR/html4/strict.dtd" "strict.dtd"
++SYSTEM "http://www.w3.org/TR/html4/loose.dtd" "loose.dtd"
++SYSTEM "http://www.w3.org/TR/html4/frameset.dtd" "frameset.dtd"
++SYSTEM "http://www.w3.org/TR/html4/HTMLlat1.ent" "HTMLlat1.ent"
++SYSTEM "http://www.w3.org/TR/html4/HTMLsymbol.ent" "HTMLsymbol.ent"
++SYSTEM "http://www.w3.org/TR/html4/HTMLspecial.ent" "HTMLspecial.ent"
++SYSTEM "http://www.w3.org/TR/html401/strict.dtd" "strict.dtd"
++SYSTEM "http://www.w3.org/TR/html401/loose.dtd" "loose.dtd"
++SYSTEM "http://www.w3.org/TR/html401/frameset.dtd" "frameset.dtd"
++SYSTEM "http://www.w3.org/TR/html401/HTMLlat1.ent" "HTMLlat1.ent"
++SYSTEM "http://www.w3.org/TR/html401/HTMLsymbol.ent" "HTMLsymbol.ent"
++SYSTEM "http://www.w3.org/TR/html401/HTMLspecial.ent" "HTMLspecial.ent"
++SYSTEM "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd" "strict.dtd"
++SYSTEM "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd" "loose.dtd"
++SYSTEM "http://www.w3.org/TR/1999/REC-html401-19991224/frameset.dtd" "frameset.dtd"
++SYSTEM "http://www.w3.org/TR/1999/REC-html401-19991224/HTMLlat1.ent" "HTMLlat1.ent"
++SYSTEM "http://www.w3.org/TR/1999/REC-html401-19991224/HTMLsymbol.ent" "HTMLsymbol.ent"
++SYSTEM "http://www.w3.org/TR/1999/REC-html401-19991224/HTMLspecial.ent" "HTMLspecial.ent"
++
+-- Fedora modification: added DTDDECLs --
+
-+DTDDECL "-//W3C//DTD HTML 4.01//EN" HTML4.decl
-+DTDDECL "-//W3C//DTD HTML 4.01 Transitional//EN" HTML4.decl
-+DTDDECL "-//W3C//DTD HTML 4.01 Frameset//EN" HTML4.decl
-+DTDDECL "-//W3C//ENTITIES Latin1//EN//HTML" HTML4.decl
-+DTDDECL "-//W3C//ENTITIES Special//EN//HTML" HTML4.decl
-+DTDDECL "-//W3C//ENTITIES Symbols//EN//HTML" HTML4.decl
++DTDDECL "-//W3C//DTD HTML 4.01//EN" "HTML4.decl"
++DTDDECL "-//W3C//DTD HTML 4.01 Transitional//EN" "HTML4.decl"
++DTDDECL "-//W3C//DTD HTML 4.01 Frameset//EN" "HTML4.decl"
++DTDDECL "-//W3C//ENTITIES Latin1//EN//HTML" "HTML4.decl"
++DTDDECL "-//W3C//ENTITIES Special//EN//HTML" "HTML4.decl"
++DTDDECL "-//W3C//ENTITIES Symbols//EN//HTML" "HTML4.decl"
+
+-- Fedora modification: added additional public id "aliases" defined in
+ ISO-HTML Annex B, http://purl.org/NET/ISO+IEC.15445/Users-Guide.html#DTD --
+
-+PUBLIC "-//W3C//ENTITIES Latin alphabet No. 1//EN//HTML" HTMLlat1.ent
-+PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML" HTMLlat1.ent
-+PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML" HTMLlat1.ent
-+PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML" HTMLsymbol.ent
-+DTDDECL "-//W3C//ENTITIES Latin alphabet No. 1//EN//HTML" HTML4.decl
-+DTDDECL "-//W3C//ENTITIES Full Latin 1//EN//HTML" HTML4.decl
-+DTDDECL "-//W3C//ENTITIES Latin 1//EN//HTML" HTML4.decl
-+DTDDECL "-//W3C//ENTITIES Symbolic//EN//HTML" HTML4.decl
++PUBLIC "-//W3C//ENTITIES Latin alphabet No. 1//EN//HTML" "HTMLlat1.ent"
++PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML" "HTMLlat1.ent"
++PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML" "HTMLlat1.ent"
++PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML" "HTMLsymbol.ent"
++DTDDECL "-//W3C//ENTITIES Latin alphabet No. 1//EN//HTML" "HTML4.decl"
++DTDDECL "-//W3C//ENTITIES Full Latin 1//EN//HTML" "HTML4.decl"
++DTDDECL "-//W3C//ENTITIES Latin 1//EN//HTML" "HTML4.decl"
++DTDDECL "-//W3C//ENTITIES Symbolic//EN//HTML" "HTML4.decl"
diff --git a/html401-dtds.spec b/html401-dtds.spec
index d1600b4..7657969 100644
--- a/html401-dtds.spec
+++ b/html401-dtds.spec
@@ -8,10 +8,9 @@
Name: html401-dtds
Version: 4.01
-Release: %{date}.11
+Release: %{date}.12
Summary: HTML 4.01 document type definitions
-Group: Applications/Text
# W3C Software License for DTDs etc:
# http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620#DTD
License: W3C
@@ -20,7 +19,6 @@ URL: http://www.w3.org/TR/1999/REC-html401-%{date}/
Source0: %{name}-%{date}.tar.bz2
Source99: %{name}-prepare-tarball.sh
Patch0: %{name}-catalog.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: sgml-common
@@ -36,14 +34,13 @@ SGMLSpm.
%prep
%setup -q -n %{name}
-%patch0 -p0
+%patch0 -p1
%build
%install
-rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/sgml/html/4.01
install -pm 644 *.dtd *.cat *.ent *.decl \
@@ -56,10 +53,6 @@ ln -s %{name}-%{version}-%{release}.soc %{name}.soc
cd -
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
/usr/bin/install-catalog --add \
%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc \
@@ -72,13 +65,16 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(644,root,root,755)
%ghost %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc
%{_sysconfdir}/sgml/%{name}.soc
%{_datadir}/sgml/html/
%changelog
+* Thu Dec 1 2011 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.12
+- Add system entries to catalog.
+- Drop specfile constructs no longer needed with Fedora or EL6+.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.01-19991224.11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -88,54 +84,54 @@ rm -rf $RPM_BUILD_ROOT
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.01-19991224.9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Fri Feb 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.8
+* Fri Feb 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.8
- Prune nondistributable content from source tarball.
-* Mon Aug 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.5
+* Mon Aug 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.5
- Don't use %%{dist}.
-* Mon Aug 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.4
+* Mon Aug 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.4
- Don't ship the docs, the W3C Documentation License is not an acceptable
one per Fedora licensing guidelines.
- License: W3C
-* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.3
+* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.3
- Rebuild.
-* Tue Jun 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.2
+* Tue Jun 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.2
- Require install-catalog at post-install and pre-uninstall time (#181068).
-* Sun Jun 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.1
+* Sun Jun 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 4.01-19991224.1
- Include specification date in release field (#181068).
- Make doc symlinks relative.
-* Sat Feb 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 4.01-0.3
+* Sat Feb 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 4.01-0.3
- Improve description (#181068).
- Fold specification into main package as %%doc (#181068).
-* Wed Jun 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 4.01-0.2
+* Wed Jun 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 4.01-0.2
- Rebuild for FC4.
-* Sat Apr 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 4.01-0.1
+* Sat Apr 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 4.01-0.1
- Use -maxdepth before other options to find(1).
-* Tue Jun 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.6
+* Tue Jun 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.6
- Move files below %%{_datadir}/sgml/html/4.01, remove alternatives.
- Add non-versioned %%{_sysconfdir}/sgml/%%{name}.soc symlink.
-* Sun Jun 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.5
+* Sun Jun 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.5
- Add additional public id "aliases" for entities to SGML catalog as defined
in ISO-HTML Annex B, http://purl.org/NET/ISO+IEC.15445/Users-Guide.html#DTD
-* Sat Jun 19 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.4
+* Sat Jun 19 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.4
- Add DTDDECLs to SGML catalog.
-* Sun Dec 7 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.3
+* Sun Dec 7 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.3
- Use alternatives to install preferred HTML DTD location.
-* Sat Dec 6 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.2
+* Sat Dec 6 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.2
- Install dir directly under %%{_datadir}/sgml.
- Spec cleanups.
-* Tue Dec 2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.1
+* Tue Dec 2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:4.01-0.fdr.1
- First build.
More information about the scm-commits
mailing list