fixed build

diff --git a/CATALOG b/CATALOG
new file mode 100644 (file)
index 0000000..861a037
--- /dev/null
+++ b/CATALOG
@@ -0,0 +1,39 @@
+    -- ISO 8879 official entity sets --
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" /usr/share/sgml/ISO_8879:1986/entities/Added_Math_Symbols:_Arrow_Relations
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" /usr/share/sgml/ISO_8879:1986/entities/Added_Math_Symbols:_Binary_Operators
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" /usr/share/sgml/ISO_8879:1986/entities/Added_Math_Symbols:_Delimiters
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" /usr/share/sgml/ISO_8879:1986/entities/Added_Math_Symbols:_Negated_Relations
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" /usr/share/sgml/ISO_8879:1986/entities/Added_Math_Symbols:_Ordinary
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" /usr/share/sgml/ISO_8879:1986/entities/Added_Math_Symbols:_Relations
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" /usr/share/sgml/ISO_8879:1986/entities/Added_Latin_1
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" /usr/share/sgml/ISO_8879:1986/entities/Added_Latin_2
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" /usr/share/sgml/ISO_8879:1986/entities/Alternative_Greek_Symbols
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" /usr/share/sgml/ISO_8879:1986/entities/Box_and_Line_Drawing
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" /usr/share/sgml/ISO_8879:1986/entities/Diacritical_Marks
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" /usr/share/sgml/ISO_8879:1986/entities/General_Technical
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" /usr/share/sgml/ISO_8879:1986/entities/Greek_Letters
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" /usr/share/sgml/ISO_8879:1986/entities/Greek_Symbols
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" /usr/share/sgml/ISO_8879:1986/entities/Monotoniko_Greek
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" /usr/share/sgml/ISO_8879:1986/entities/Non-Russian_Cyrillic
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" /usr/share/sgml/ISO_8879:1986/entities/Numeric_and_Special_Graphic
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" /usr/share/sgml/ISO_8879:1986/entities/Publishing
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" /usr/share/sgml/ISO_8879:1986/entities/Russian_Cyrillic
+
+    -- 9573-13:1991 : revised sets --
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Arrow Relations//EN" /usr/share/sgml/ISO_9573-13:1991/entities/Added_Math_Symbols:_Arrow_Relations
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Binary Operators//EN" /usr/share/sgml/ISO_9573-13:1991/entities/Added_Math_Symbols:_Binary_Operators
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Delimiters//EN" /usr/share/sgml/ISO_9573-13:1991/entities/Added_Math_Symbols:_Delimiters
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Negated Relations//EN" /usr/share/sgml/ISO_9573-13:1991/entities/Added_Math_Symbols:_Negated_Relations
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Ordinary//EN" /usr/share/sgml/ISO_9573-13:1991/entities/Added_Math_Symbols:_Ordinary
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Relations//EN" /usr/share/sgml/ISO_9573-13:1991/entities/Added_Math_Symbols:_Relations
+
+    -- 9573-13:1991 : revised extra set --
+PUBLIC "ISO 9573-15:1993//ENTITIES Extra Classical Greek Letters//EN" /usr/share/sgml/ISO_9573-15:1991/entities/Extra_Classical_Greek_Letters
+
+
+-- CATALOG ends here. --
+
+
+

diff --git a/packaging/ISOgrk5.gz b/packaging/ISOgrk5.gz
new file mode 100644 (file)
index 0000000..5e5974e
Binary files /dev/null and b/packaging/ISOgrk5.gz differ

diff --git a/packaging/iso_ent.spec b/packaging/iso_ent.spec
index 685d120..80358f6 100644 (file)
--- a/packaging/iso_ent.spec
+++ b/packaging/iso_ent.spec
@@ -17,27 +17,28 @@
 
 
 Name:           iso_ent
+BuildRequires:  sgml-skel
+BuildRequires:  unzip
+BuildArch:      noarch
+Provides:       iso-ent
+Provides:       iso-entities
+%define regcat /usr/bin/sgml-register-catalog
+PreReq:         %{regcat}
 Version:        2000.11.03
 Release:        0
-License:        SUSE-Permissive
 Summary:        Character Entity Sets for ISO 8879:1986
+License:        SUSE-Permissive
 Group:          Productivity/Publishing/SGML
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define ke_pkg ISOEnts.zip
 Source0:        http://www.oasis-open.org/cover/ISOEnts.zip
 Source1:        ISOgrk5.gz
-Patch0:         iso_ent.dif
-BuildRequires:  sgml-skel
-BuildRequires:  unzip
-%define regcat /usr/bin/sgml-register-catalog
-Requires(pre):  %{regcat}
-Provides:       iso-ent
-Provides:       iso-entities
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
+Patch:          iso_ent.dif
 
 %description
 Character entity sets for ISO 8879:1986.
 
+
 %define INSTALL install -m755 -s
 %define INSTALL_DIR install -d -m755
 %define INSTALL_DATA install -m644
@@ -49,24 +50,23 @@ Character entity sets for ISO 8879:1986.
 unzip -aq $RPM_SOURCE_DIR/%{ke_pkg}
 cp -p $RPM_SOURCE_DIR/ISOgrk5.gz .
 gunzip ISOgrk5.gz
-%patch0 -p1
 
 %build
 
 %install
-root=%{buildroot}
+root=$RPM_BUILD_ROOT
 # sgml_dir=${root}%{_datadir}/sgml
 # sgml_dir_config=${root}/var/lib/sgml
-sgml_dir_iso=%{buildroot}%{sgml_dir}/iso-ent
-sgml_dir_ISO=%{buildroot}%{sgml_dir}/ISO_8879:1986/entities
-%{INSTALL_DIR} %{buildroot}%{sgml_config_dir}
-%{INSTALL_DIR} %{buildroot}%{sgml_dir}/iso-ent
-%{INSTALL_DIR} %{buildroot}%{sgml_dir}/{ISO_8879:1986,ISO_9573-15:1993}/entities
-%{INSTALL_DATA} ISO* %{buildroot}%{sgml_dir}/iso-ent
-%{INSTALL_DATA} CATALOG %{buildroot}%{sgml_config_dir}/CATALOG.iso_ent
-pushd %{buildroot}%{sgml_dir}
+sgml_dir_iso=$RPM_BUILD_ROOT%{sgml_dir}/iso-ent
+sgml_dir_ISO=$RPM_BUILD_ROOT%{sgml_dir}/ISO_8879:1986/entities
+%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_config_dir}
+%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_dir}/iso-ent
+%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_dir}/{ISO_8879:1986,ISO_9573-15:1993}/entities
+%{INSTALL_DATA} ISO* $RPM_BUILD_ROOT%{sgml_dir}/iso-ent
+%{INSTALL_DATA} CATALOG $RPM_BUILD_ROOT%{sgml_config_dir}/CATALOG.iso_ent
+pushd $RPM_BUILD_ROOT%{sgml_dir}
 ln -sf ../../../var/lib/sgml/CATALOG.iso_ent CATALOG.iso_ent
-rm -f ISO_8879-1986
+rm -f ISO_8879-1986 
 ln -s ISO_8879:1986 ISO_8879-1986
 popd
 pushd ${sgml_dir_ISO}
@@ -91,11 +91,11 @@ ln -s ../../iso-ent/ISOnum Numeric_and_Special_Graphic
 ln -s ../../iso-ent/ISOpub Publishing
 ln -s ../../iso-ent/ISOtech General_Technical
 popd
-pushd %{buildroot}%{sgml_dir}
+pushd $RPM_BUILD_ROOT%{sgml_dir}
 rm -f ISO_9573-15-1993
 ln -s ISO_9573-15:1993 ISO_9573-15-1993
 popd
-pushd %{buildroot}%{sgml_dir}/ISO_9573-15:1993/entities
+pushd $RPM_BUILD_ROOT%{sgml_dir}/ISO_9573-15:1993/entities
 rm -f * 2>/dev/null
 ln -s ../../iso-ent/ISOgrk5 Extra_Classical_Greek_Letters
 popd
@@ -116,10 +116,13 @@ if [  "$1" = "0" -a -x %{regcat} ]; then
   done
 fi
 
+%clean
+rm -fr $RPM_BUILD_ROOT
+
 %files
 %defattr(-, root, root)
 # %doc README.SuSE
-%config %{_localstatedir}/lib/sgml/CATALOG.iso_ent
+%config /var/lib/sgml/CATALOG.iso_ent
 %{sgml_dir}/CATALOG.iso_ent
 %{sgml_dir}/iso-ent
 %{sgml_dir}/ISO_8879-1986