commit dita

29 Nov 2007

Hello community,

here is the log from the commit of package dita
checked in at Thu Nov 29 18:29:28 CET 2007.

--------

--- dita/dita.changes	2007-03-29 11:47:19.000000000 +0200
+++ /mounts/work_src_done/NOARCH/dita/dita.changes	2007-11-29 12:54:48.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 29 12:54:17 CET 2007 - ke@suse.de
+
+- Update to version 1.1.
+- Fix Requires and PreReq.
+
+-------------------------------------------------------------------

Old:
----
  dita10.zip
  dita-catalog.diff

New:
----
  dita1.1.zip

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dita.spec ++++++
--- /var/tmp/diff_new_pack.d31436/_old	2007-11-29 18:29:14.000000000 +0100
+++ /var/tmp/diff_new_pack.d31436/_new	2007-11-29 18:29:14.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package dita (Version 1.0.1)
+# spec file for package dita (Version 1.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,25 +12,25 @@
 
 Name:           dita
 BuildRequires:  sgml-skel unzip
-URL:            http://www.oasis-open.org/committees/dita/
+Url:            http://www.oasis-open.org/committees/dita/
 License:        Other uncritical OpenSource License
 Group:          Productivity/Publishing/XML
-Requires:       sgml-skel libxml2
+Requires:       sgml-skel
 %define regcat /usr/bin/sgml-register-catalog
 PreReq:         %{regcat} /usr/bin/xmlcatalog /usr/bin/edit-xml-catalog
-PreReq:         sed grep awk
-Autoreqprov:    on
+PreReq:         sed grep awk coreutils
+AutoReqProv:    on
 Summary:        OASIS Darwin Information Typing Architecture (DITA)
-Version:        1.0.1
-Release:        42
-Source0:        http://www.oasis-open.org/committees/download.php/15316/dita10.zip
+Version:        1.1
+Release:        1
+Source0:        http://www.oasis-open.org/committees/download.php/24944/dita1.1.zip
 Source1:        http://www.oasis-open.org/committees/download.php/15396/dita-document-defini...
-Patch:          dita-catalog.diff
+# Patch:          dita-catalog.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArchitectures: noarch
+BuildArch:      noarch
 
 %description
-The package contains the DITA specifications, DTDs, and schemas.
+This package contains the DITA specifications, DTDs, and schemas.
 
 
 
@@ -54,9 +54,12 @@
 %define sgml_sysconf_dir %{_sysconfdir}/sgml
 %define xml_config_dir /var/lib/xml
 %define xml_sysconf_dir %{_sysconfdir}/xml
+
 %prep
-%setup -n %{name}10
-for z in archspechtml.zip langspechtml.zip dtd.zip schema.zip; do
+%setup -c -n %{name}1.1
+source="archspec-source.zip langspec-source.zip"
+zip="archspec-html.zip langspec-html.zip ditadtd.zip ditaschema.zip"
+for z in $zip; do
   unzip -a $z
 done
 unzip -a -o %{S:1}
@@ -69,13 +72,15 @@
 $xmlcatbin --create --noout $CATALOG
 %define FOR_ROOT_CAT for-catalog-%{name}-%{version}-%{release}.xml
 CATALOG=etc/xml/$CATALOG
-cat42=%{xml_pack_dtd_dir}/1.0/catalog.xml
+cat42=%{xml_pack_dtd_dir}/1.1/catalog-dita.xml
 rm -f %{FOR_ROOT_CAT}.tmp
 $xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp
 for s in \
   "-//OASIS//DTD DITA" \
   "-//OASIS//ELEMENTS DITA Concept//EN" \
-  "-//OASIS//ENTITIES DITA Topic Class//EN"
+  "-//OASIS//ENTITIES DITA Topic Class//EN" \
+  "-//OASIS//ELEMENTS DITA" \
+  "-//OASIS//ENTITIES DITA"
 do
   $xmlcatbin --noout --add "delegatePublic" "$s" \
     "file://$cat42" %{FOR_ROOT_CAT}.tmp
@@ -90,48 +95,30 @@
 %install
 #%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_config_dir}
 #%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_config_dir}
-%{INSTALL_DIR} $RPM_BUILD_ROOT{%{xml_pack_xsd_dir},%{xml_pack_dtd_dir}}/1.0
+%{INSTALL_DIR} $RPM_BUILD_ROOT{%{xml_pack_xsd_dir},%{xml_pack_dtd_dir}}/1.1
 # catalog-dita.txt
 # catalog-dita.xml
-cp dtd/* $RPM_BUILD_ROOT%{xml_pack_dtd_dir}/1.0
+cp dtd/* $RPM_BUILD_ROOT%{xml_pack_dtd_dir}/1.1
 # DTDDECL "-//OASIS//DTD DocBook XML V4.1.2//EN" /usr/share/sgml/opensp/xml.dcl
 {
   echo OVERRIDE YES
   grep  '\.dtd\"' dtd/catalog-dita.txt \
     | awk -F\" '{printf "DTDDECL \"%s\" /usr/share/sgml/opensp/xml.dcl\n", $2}'
   cat dtd/catalog-dita.txt
-} > $RPM_BUILD_ROOT%{xml_pack_dtd_dir}/1.0/%{name}.cat
-ln -s %{xml_pack_dtd_dir}/1.0/catalog-dita.xml \
-  $RPM_BUILD_ROOT%{xml_pack_dtd_dir}/1.0/catalog.xml
-cp schema/* $RPM_BUILD_ROOT%{xml_pack_xsd_dir}/1.0
+} > $RPM_BUILD_ROOT%{xml_pack_dtd_dir}/1.1/%{name}.cat
+ln -s %{xml_pack_dtd_dir}/1.1/catalog-dita.xml \
+  $RPM_BUILD_ROOT%{xml_pack_dtd_dir}/1.1/catalog.xml
+cp schema/* $RPM_BUILD_ROOT%{xml_pack_xsd_dir}/1.1
 %{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_pack_dtd_dir}
-ln -s %{xml_pack_dtd_dir}/1.0 \
-  $RPM_BUILD_ROOT%{sgml_pack_dtd_dir}/1.0
-# %{INSTALL_DATA} CATALOG.* $RPM_BUILD_ROOT%{sgml_config_dir}
-# # for CATALOG.* links
-# %define my_all_cat docbook_4 db41xml db42xml db43xml db44xml
-# for v in 4.1 4.2 4.3 4.4; do
-#   vl=${v/\.}
-#   %{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir}/$v
-#   %{INSTALL_DATA} dtd/${v}/* $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir}/${v}
-#   %{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_docbook_dtd_dir}/$v
-#   cp -a ${v}xml/* $RPM_BUILD_ROOT%{xml_docbook_dtd_dir}/$v
-#   ln -s %{xml_docbook_dtd_dir}/$v $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir}/${v}xml
-#   ln -sf %{sgml_config_dir}/CATALOG.db${vl}xml \
-#     $RPM_BUILD_ROOT%{sgml_dir}/CATALOG.db${vl}xml
-# done
-# ln -sf %{sgml_docbook_dtd_dir}/4.1 $RPM_BUILD_ROOT%{sgml_dir}/%{name}.1
-# ln -sf %{sgml_config_dir}/CATALOG.%{name} \
-#   $RPM_BUILD_ROOT%{sgml_dir}/CATALOG.%{name}
-# ln -sf %{sgml_config_dir}/CATALOG.%{name} \
-#   $RPM_BUILD_ROOT%{sgml_dir}/CATALOG.docbk41
+ln -s %{xml_pack_dtd_dir}/1.1 \
+  $RPM_BUILD_ROOT%{sgml_pack_dtd_dir}/1.1
 cat_dir=%{buildroot}/etc/xml
 %{INSTALL_DIR} $cat_dir
 %{INSTALL_DATA} %{FOR_ROOT_CAT} $cat_dir
 
 %post
 if [ -x %{regcat} ]; then
-  %{regcat} -a %{xml_pack_dtd_dir}/1.0/%{name}.cat \
+  %{regcat} -a %{xml_pack_dtd_dir}/1.1/%{name}.cat \
     >/dev/null 2>&1 || true
 fi
 edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
@@ -140,7 +127,7 @@
 
 %postun
 if [ "$1" = "0" -a -x %{regcat} ]; then
-  for c in %{xml_pack_dtd_dir}/1.0/%{name}.cat; do
+  for c in %{xml_pack_dtd_dir}/1.1/%{name}.cat; do
     %{regcat} -r $c \
       >/dev/null 2>&1 || true
   done
@@ -154,7 +141,7 @@
 
 %files
 %defattr(-, root, root)
-%doc archspechtml langspechtml
+%doc archspec langspec
 # %config %{sgml_config_dir}/CATALOG.*
 # %doc README.SuSE
 # %{sgml_dir}/CATALOG.*
@@ -163,6 +150,9 @@
 %config %{xml_sysconf_dir}/%{FOR_ROOT_CAT}
 
 %changelog
+* Thu Nov 29 2007 - ke@suse.de
+- Update to version 1.1.
+- Fix Requires and PreReq.
 * Thu Mar 29 2007 - coolo@suse.de
 - fix BuildRequires
 * Thu Jan 11 2007 - ke@suse.de



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)