commit opensp

17 May 2007

Hello community,

here is the log from the commit of package opensp
checked in at Thu May 17 19:31:52 CEST 2007.

--------

--- opensp/opensp.changes	2007-05-16 16:48:29.000000000 +0200
+++ /mounts/work_users/ro/STABLE/opensp/opensp.changes	2007-05-17 19:31:38.607145000 +0200
@@ -1,0 +2,6 @@
+Thu May 17 19:25:49 CEST 2007 - ro@suse.de
+
+- remove xmlto from buildrequires this causes tons of cycles 
+- split off opensp-doc package in it's own specfile
+
+-------------------------------------------------------------------
New Changes file:

--- /dev/null	2006-06-16 15:54:00.000000000 +0200
+++ /mounts/work_users/ro/STABLE/opensp/opensp-doc.changes	2007-05-17 19:25:46.900060000 +0200
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Thu May 17 19:25:36 CEST 2007 - ro@suse.de
+
+- created package, split off from opensp 
+

New:
----
  opensp-doc.changes
  opensp-doc.spec

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

Other differences:
------------------
++++++ opensp-doc.spec ++++++
#
# spec file for package opensp-doc (Version 1.5.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild

Name:           opensp-doc
%define rname opensp
BuildRequires:  gcc-c++ xmlto
License:        X11/MIT
Group:          Productivity/Publishing/SGML
Autoreqprov:    on
Version:        1.5.2
Release:        1
Source:         http://unc.dl.sourceforge.net/sourceforge/openjade/OpenSP-%{version}.tar.gz
Patch10:        opensp-multilib.patch
Patch11:        opensp-nodeids.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
URL:            http://openjade.sourceforge.net/
%define regcat /usr/bin/sgml-register-catalog
PreReq:         %{regcat}
Summary:        The OpenJade Group's SGML and XML Parsing Tools
Provides:       sp_libs sp OpenSP
Obsoletes:      sp_libs sp

%description
The tools in this package provide the ability to manage SGML and XML
documents.

This package contains the parser nsgmls and the related programs
sgmlnorm, spcat, spam, spent, and sgml2xml (previously known as sx).
Sgml2xml is useful as a tool for converting from SGML to XML, the
coming WWW standard.

This package is a fork from James Clark's SP suite.



Authors:
--------
    Avi Kivity
    Cees de Groot   
    David Megginson 
    Didier PH Martin
    Henry Thompson
    Ian Castle 
    James Clark     
    Kathleen Marszalek
    Matthias Clasen
    Paul Prescod    
    Peter Newcomb
    Peter Nilsson
    Sebastian Rahtz 
    Terje Bless 

%define INSTALL install -m755 -s
%define INSTALL_DIR install -d -m755
%define INSTALL_DATA install -m644
%define sgml_dir %{_datadir}/sgml
%define sgml_dir_pkg %{sgml_dir}/%{name}
%define sgml_var_dir /var/lib/sgml
%prep
%setup -q -n OpenSP-%{version}
# %patch0 -p1
# %patch1 -p1
%patch11 -p1

%build
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
%{?suse_update_config:%{suse_update_config}}
aclocal
%if %suse_version > 800
automake -f -c
libtoolize --copy --force
autoconf --force
%endif
%if %sles_version > 8
automake -f -c
libtoolize --copy --force
autoconf --force
%endif
%if %ul_version > 0
automake -f -c
libtoolize --copy --force
autoconf --force
%endif
# --datadir=%{sgml_dir}/openjade
#  set XMLTO or consider --disable-doc-build
./configure --prefix=%{_prefix} \
            --libdir=%{_libdir} \
            --mandir=%{_mandir} \
            --datadir=%{_datadir} \
            --disable-nls \
            --with-gnu-ld \
            --enable-http \
            --enable-default-catalog="CATALOG:/etc/sgml/catalog:%{sgml_dir}/CATALOG"
make -C docsrc
perl -pi -e 's/sx/sgml2xml/g; s/SX/SGML2XML/g;' doc/sx.htm
perl -pi -e 's/>sx/>sgml2xml/g; s/>SX/>SGML2XML/g;' doc/{new,index}.htm
# make check

%install
[ "$RPM_BUILD_ROOT" != "" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
%{INSTALL_DIR} $RPM_BUILD_ROOT%{_libdir}
# %{INSTALL_DIR} $RPM_BUILD_ROOT%{_includedir}/opensp
make -C docsrc install DESTDIR=$RPM_BUILD_ROOT
#make install-man DESTDIR=$RPM_BUILD_ROOT
# Unwanted doc stuff
rm -fr $RPM_BUILD_ROOT%{_datadir}/{OpenSP,doc} \
  $RPM_BUILD_ROOT%{_prefix}/doc
/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
# pushd $RPM_BUILD_ROOT%{_includedir}
# ln -sf OpenSP opensp
# ln -sf opensp sp
# popd
if [ -d $RPM_BUILD_ROOT%{_mandir}/man1 ]; then
  pushd $RPM_BUILD_ROOT%{_mandir}/man1
  cp osx.1 s2x.1
  cp osx.1 osgml2xml.1
  for b in o*; do
    ln -sf ${b} ${b#o}
  done
  rm -f sx*
  popd
fi
%if 0
pushd $RPM_BUILD_ROOT%{_bindir}
for b in os* onsgmls; do
  ln -sf ${b} ${b#o}
done
# avoid conflict with rzsz package
rm -f sx
ln -sf osx s2x
ln -sf osx sgml2xml
ln -sf osx osgml2xml
popd
%endif
# %{INSTALL_DIR} $RPM_BUILD_ROOT/etc/profile.d
# %{INSTALL_DATA} sp.sh $RPM_BUILD_ROOT/etc/profile.d
%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_dir_pkg}
{
  for c in opensp-implied.dcl japan.dcl xml.dcl; do
    %{INSTALL_DATA} pubtext/$c $RPM_BUILD_ROOT%{sgml_dir_pkg}/$c
    echo "-- SGMLDECL \"%{sgml_dir_pkg}/$c\" --"
  done
} > CATALOG.opensp
sed 's|decl|dcl|' pubtext/xml.soc > $RPM_BUILD_ROOT%{sgml_dir_pkg}/xml.soc
%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_var_dir}
%{INSTALL_DATA} CATALOG.opensp $RPM_BUILD_ROOT%{sgml_var_dir}
ln -sf ../../../%{sgml_var_dir}/CATALOG.opensp \
  $RPM_BUILD_ROOT%{sgml_dir}/CATALOG.opensp
%{INSTALL_DIR} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
{
  echo '# Cf. %{_datadir}/doc/packages/opensp/html/charset.htm'
  echo '# SP_CHARSET_FIXED'
  echo '# SP_SYSTEM_CHARSET'
  echo '# SP_ENCODING'
  echo '# SP_BCTF'
} > opensp.sh
%{INSTALL_DATA} opensp.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/opensp.sh
sed -e 's/\(# \)/\1setenv /' opensp.sh \
...
$RPM_BUILD_ROOT%{_sysconfdir}/profile.d/opensp.csh
rm -fr html
mkdir html
cp doc/catalog doc/*htm html
%define DOCFILES COPYING README NEWS AUTHORS ABOUT-NLS
{
  echo "<html><head><title>OpenSP documentation directory</title></head>"
  echo "<body>"
  for f in %{DOCFILES}; do
    [ -f $f ] || continue
    echo "$f</a>"
  done
  echo "OpenSP</a>, official documentation (html)"
} >index.html
find . -name .cvsignore | xargs rm
rm -rf $RPM_BUILD_ROOT/etc
rm -rf $RPM_BUILD_ROOT/usr/bin
rm -rf $RPM_BUILD_ROOT/usr/include
rm -rf $RPM_BUILD_ROOT/usr/lib
rm -rf $RPM_BUILD_ROOT/usr/share/doc
rm -rf $RPM_BUILD_ROOT/usr/share/locale
rm -rf $RPM_BUILD_ROOT/usr/share/sgml
rm -rf $RPM_BUILD_ROOT/var

%clean
rm -fr $RPM_BUILD_ROOT

%files
%defattr(-, root, root,755)
%doc %{DOCFILES} index.html
%doc html
%doc unicode
# pubtext comes with html-dtd
# %doc pubtext
%{_mandir}/*/*sp*
%{_mandir}/*/*s2x*
%{_mandir}/*/*sx*
%{_mandir}/*/*sgml*

%changelog
* Thu May 17 2007 - ro@suse.de
- created package, split off from opensp
++++++ opensp.spec ++++++
--- /var/tmp/diff_new_pack.ORO852/_old	2007-05-17 19:31:44.000000000 +0200
+++ /var/tmp/diff_new_pack.ORO852/_new	2007-05-17 19:31:44.000000000 +0200
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           opensp
-BuildRequires:  gcc-c++ xmlto
+BuildRequires:  gcc-c++
 License:        X11/MIT
 Group:          Productivity/Publishing/SGML
 Autoreqprov:    on
 Version:        1.5.2
-Release:        1
+Release:        2
 Source:         http://unc.dl.sourceforge.net/sourceforge/openjade/OpenSP-%{version}.tar.gz
 Patch10:        opensp-multilib.patch
 Patch11:        opensp-nodeids.patch
@@ -113,6 +113,7 @@
             --disable-nls \
             --with-gnu-ld \
             --enable-http \
+	    --disable-doc-build \
             --enable-default-catalog="CATALOG:/etc/sgml/catalog:%{sgml_dir}/CATALOG"
 make
 perl -pi -e 's/sx/sgml2xml/g; s/SX/SGML2XML/g;' doc/sx.htm
@@ -133,6 +134,7 @@
 # ln -sf OpenSP opensp
 # ln -sf opensp sp
 # popd
+%if 0
 if [ -d $RPM_BUILD_ROOT%{_mandir}/man1 ]; then
   pushd $RPM_BUILD_ROOT%{_mandir}/man1
   cp osx.1 s2x.1
@@ -143,6 +145,7 @@
   rm -f sx*
   popd
 fi
+%endif
 pushd $RPM_BUILD_ROOT%{_bindir}
 for b in os* onsgmls; do
   ln -sf ${b} ${b#o}
@@ -209,11 +212,6 @@
 %files
 %defattr(-, root, root,755)
 %config %{_sysconfdir}/profile.d/opensp.*
-%doc %{DOCFILES} index.html
-%doc html
-%doc unicode
-# pubtext comes with html-dtd
-# %doc pubtext
 %{_bindir}/*nsgmls
 %{_bindir}/*sgmlnorm
 %{_bindir}/*spcat
@@ -227,10 +225,6 @@
 %dir %{sgml_var_dir}
 %config %{sgml_var_dir}/CATALOG.opensp
 %{sgml_dir}/CATALOG.opensp
-%{_mandir}/*/*sp*
-%{_mandir}/*/*s2x*
-%{_mandir}/*/*sx*
-%{_mandir}/*/*sgml*
 # %{_datadir}/locale/*/LC_MESSAGES/*.mo
 
 %files -n opensp-devel
@@ -242,6 +236,9 @@
 %{_libdir}/*a
 
 %changelog
+* Thu May 17 2007 - ro@suse.de
+- remove xmlto from buildrequires this causes tons of cycles
+- split off opensp-doc package in it's own specfile
 * Wed May 16 2007 - ke@suse.de
 - Update to version 1.5.2 (bug fix release); proposed by Sierk
   Bornemann [# 273561].


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



Remember to have fun...

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

    

commit opensp

root＠Hilbert.suse.de