Hello community,
here is the log from the commit of package opensp
checked in at Thu Nov 20 15:59:00 CET 2008.
--------
--- opensp/opensp.changes 2007-12-20 03:20:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/opensp/opensp.changes 2008-11-14 16:19:58.597017000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 14 16:19:40 CET 2008 - mrueckert@suse.de
+
+- sync opensp.spec and opensp-doc.spec
+
+-------------------------------------------------------------------
--- opensp/opensp-doc.changes 2007-05-17 19:25:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/opensp/opensp-doc.changes 2008-11-14 16:20:15.745016000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 14 16:20:05 CET 2008 - mrueckert@suse.de
+
+- sync opensp.spec and opensp-doc.spec
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensp-doc.spec ++++++
--- /var/tmp/diff_new_pack.M15045/_old 2008-11-20 15:57:51.000000000 +0100
+++ /var/tmp/diff_new_pack.M15045/_new 2008-11-20 15:57:51.000000000 +0100
@@ -1,27 +1,42 @@
#
# 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.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: opensp-doc
%define rname opensp
-BuildRequires: gcc-c++ xmlto
+%define doc_package 1
+BuildRequires: gcc-c++
+%if 0%{?doc_package}
+BuildRequires: xmlto
+%endif
License: X11/MIT
Group: Productivity/Publishing/SGML
AutoReqProv: on
Version: 1.5.2
-Release: 71
+Release: 176
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
+%if 0%{?doc_package}
+BuildArch: noarch
+%endif
Url: http://openjade.sourceforge.net/
%define regcat /usr/bin/sgml-register-catalog
PreReq: %{regcat}
@@ -59,12 +74,32 @@
Sebastian Rahtz
Terje Bless
+%if ! 0%{?doc_package}
+
+%package -n opensp-devel
+License: X11/MIT
+Summary: SGML parser tools (development package)
+Group: Productivity/Publishing/SGML
+Requires: %{name} = %{version} libstdc++-devel glibc-devel
+Provides: sp-devel OpenSP-devel
+Obsoletes: sp-devel
+
+%description -n opensp-devel
+Libraries and includes to compile applications that use the SGML parser
+tools (package 'opensp').
+
+
+
+%endif
%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
+%if 0%{?doc_package}
+%define MAKE_ARGS -C docsrc
+%endif
%prep
%setup -q -n OpenSP-%{version}
@@ -75,44 +110,31 @@
%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
+autoreconf -fi
# --datadir=%{sgml_dir}/openjade
# set XMLTO or consider --disable-doc-build
-./configure --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --mandir=%{_mandir} \
- --datadir=%{_datadir} \
+%configure \
--disable-nls \
--with-gnu-ld \
--enable-http \
- --enable-default-catalog="CATALOG:/etc/sgml/catalog:%{sgml_dir}/CATALOG"
-make -C docsrc
+%if ! 0%{?doc_package}
+ --disable-doc-build \
+%endif
+ --enable-default-catalog="CATALOG:/etc/sgml/catalog:%{sgml_dir}/CATALOG" \
+ --disable-static \
+ --with-pic
+make %{?MAKE_ARGS}
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
+make %{?MAKE_ARGS} install DESTDIR=$RPM_BUILD_ROOT
+%if ! 0%{?doc_package}
+make install-man DESTDIR=$RPM_BUILD_ROOT
+%endif
# Unwanted doc stuff
rm -fr $RPM_BUILD_ROOT%{_datadir}/{OpenSP,doc} \
$RPM_BUILD_ROOT%{_prefix}/doc
@@ -121,6 +143,7 @@
# ln -sf OpenSP opensp
# ln -sf opensp sp
# popd
+%if 0%{?doc_package}
if [ -d $RPM_BUILD_ROOT%{_mandir}/man1 ]; then
pushd $RPM_BUILD_ROOT%{_mandir}/man1
cp osx.1 s2x.1
@@ -131,7 +154,7 @@
rm -f sx*
popd
fi
-%if 0
+%else
pushd $RPM_BUILD_ROOT%{_bindir}
for b in os* onsgmls; do
ln -sf ${b} ${b#o}
@@ -182,6 +205,7 @@
echo "OpenSP</a>, official documentation (html)"
} >index.html
find . -name .cvsignore | xargs rm
+%if 0%{?doc_package}
rm -rf $RPM_BUILD_ROOT/etc
rm -rf $RPM_BUILD_ROOT/usr/bin
rm -rf $RPM_BUILD_ROOT/usr/include
@@ -190,12 +214,29 @@
rm -rf $RPM_BUILD_ROOT/usr/share/locale
rm -rf $RPM_BUILD_ROOT/usr/share/sgml
rm -rf $RPM_BUILD_ROOT/var
+find unicode -name Makefile\* -print -delete
+%endif
+%if ! 0%{?doc_package}
+
+%post
+/sbin/ldconfig
+if [ -x %{regcat} ]; then
+ %{regcat} -a %{sgml_dir}/CATALOG.opensp >/dev/null 2>&1 || :
+fi
+
+%postun
+/sbin/ldconfig
+if [ "$1" = "0" -a -x %{regcat} ]; then
+ %{regcat} -r %{sgml_dir}/CATALOG.opensp >/dev/null 2>&1 || :
+fi
+%endif
%clean
rm -fr $RPM_BUILD_ROOT
%files
%defattr(-, root, root,755)
+%if 0%{?doc_package}
%doc %{DOCFILES} index.html
%doc html
%doc unicode
@@ -205,7 +246,32 @@
%{_mandir}/*/*s2x*
%{_mandir}/*/*sx*
%{_mandir}/*/*sgml*
+%else
+%config %{_sysconfdir}/profile.d/opensp.*
+%{_bindir}/*nsgmls
+%{_bindir}/*sgmlnorm
+%{_bindir}/*spcat
+%{_bindir}/*spam
+%{_bindir}/*spent
+%{_bindir}/osx
+%{_bindir}/*s2x
+%{_bindir}/*sgml2xml
+%{_libdir}/lib*.so.*
+%{sgml_dir_pkg}
+%dir %{sgml_var_dir}
+%config %{sgml_var_dir}/CATALOG.opensp
+%{sgml_dir}/CATALOG.opensp
+# %{_datadir}/locale/*/LC_MESSAGES/*.mo
+
+%files -n opensp-devel
+%defattr(-, root, root)
+%{_includedir}/OpenSP
+%{_libdir}/lib*.so
+%exclude %{_libdir}/*a
+%endif
%changelog
-* Thu May 17 2007 - ro@suse.de
+* Fri Nov 14 2008 mrueckert@suse.de
+- sync opensp.spec and opensp-doc.spec
+* Thu May 17 2007 ro@suse.de
- created package, split off from opensp
++++++ opensp.spec ++++++
--- /var/tmp/diff_new_pack.M15045/_old 2008-11-20 15:57:51.000000000 +0100
+++ /var/tmp/diff_new_pack.M15045/_new 2008-11-20 15:57:51.000000000 +0100
@@ -1,22 +1,35 @@
#
# spec file for package opensp (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.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: opensp
+%define rname opensp
+%define doc_package 0
BuildRequires: gcc-c++
+%if 0%{?doc_package}
+BuildRequires: xmlto
+%endif
License: X11/MIT
Group: Productivity/Publishing/SGML
AutoReqProv: on
Version: 1.5.2
-Release: 38
+Release: 92
Source: http://unc.dl.sourceforge.net/sourceforge/openjade/OpenSP-%{version}.tar.gz
Patch10: opensp-multilib.patch
Patch11: opensp-nodeids.patch
@@ -58,7 +71,10 @@
Sebastian Rahtz
Terje Bless
+%if ! 0%{?doc_package}
+
%package -n opensp-devel
+License: X11/MIT
Summary: SGML parser tools (development package)
Group: Productivity/Publishing/SGML
Requires: %{name} = %{version} libstdc++-devel glibc-devel
@@ -71,12 +87,16 @@
+%endif
%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
+%if 0%{?doc_package}
+%define MAKE_ARGS -C docsrc
+%endif
%prep
%setup -q -n OpenSP-%{version}
@@ -94,11 +114,13 @@
--disable-nls \
--with-gnu-ld \
--enable-http \
+%if ! 0%{?doc_package}
--disable-doc-build \
+%endif
--enable-default-catalog="CATALOG:/etc/sgml/catalog:%{sgml_dir}/CATALOG" \
--disable-static \
--with-pic
-make
+make %{?MAKE_ARGS}
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
@@ -106,8 +128,10 @@
%install
%{INSTALL_DIR} $RPM_BUILD_ROOT%{_libdir}
# %{INSTALL_DIR} $RPM_BUILD_ROOT%{_includedir}/opensp
-make install DESTDIR=$RPM_BUILD_ROOT
+make %{?MAKE_ARGS} install DESTDIR=$RPM_BUILD_ROOT
+%if ! 0%{?doc_package}
make install-man DESTDIR=$RPM_BUILD_ROOT
+%endif
# Unwanted doc stuff
rm -fr $RPM_BUILD_ROOT%{_datadir}/{OpenSP,doc} \
$RPM_BUILD_ROOT%{_prefix}/doc
@@ -116,7 +140,7 @@
# ln -sf OpenSP opensp
# ln -sf opensp sp
# popd
-%if 0
+%if 0%{?doc_package}
if [ -d $RPM_BUILD_ROOT%{_mandir}/man1 ]; then
pushd $RPM_BUILD_ROOT%{_mandir}/man1
cp osx.1 s2x.1
@@ -127,7 +151,7 @@
rm -f sx*
popd
fi
-%endif
+%else
pushd $RPM_BUILD_ROOT%{_bindir}
for b in os* onsgmls; do
ln -sf ${b} ${b#o}
@@ -138,6 +162,7 @@
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}
@@ -177,6 +202,18 @@
echo "OpenSP</a>, official documentation (html)"
} >index.html
find . -name .cvsignore | xargs rm
+%if 0%{?doc_package}
+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
+find unicode -name Makefile\* -print -delete
+%endif
+%if ! 0%{?doc_package}
%post
/sbin/ldconfig
@@ -189,12 +226,24 @@
if [ "$1" = "0" -a -x %{regcat} ]; then
%{regcat} -r %{sgml_dir}/CATALOG.opensp >/dev/null 2>&1 || :
fi
+%endif
%clean
rm -fr $RPM_BUILD_ROOT
%files
%defattr(-, root, root,755)
+%if 0%{?doc_package}
+%doc %{DOCFILES} index.html
+%doc html
+%doc unicode
+# pubtext comes with html-dtd
+# %doc pubtext
+%{_mandir}/*/*sp*
+%{_mandir}/*/*s2x*
+%{_mandir}/*/*sx*
+%{_mandir}/*/*sgml*
+%else
%config %{_sysconfdir}/profile.d/opensp.*
%{_bindir}/*nsgmls
%{_bindir}/*sgmlnorm
@@ -216,15 +265,18 @@
%{_includedir}/OpenSP
%{_libdir}/lib*.so
%exclude %{_libdir}/*a
+%endif
%changelog
-* Thu Dec 20 2007 - crrodriguez@suse.de
+* Fri Nov 14 2008 mrueckert@suse.de
+- sync opensp.spec and opensp-doc.spec
+* Thu Dec 20 2007 crrodriguez@suse.de
- add missing ldconfig calls
- remove static libraries and "la" files
-* Thu May 17 2007 - ro@suse.de
+* 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
+* Wed May 16 2007 ke@suse.de
- Update to version 1.5.2 (bug fix release); proposed by Sierk
Bornemann [# 273561].
- Remove obsolete GCC patches.
@@ -232,21 +284,21 @@
- Build manpages using xmlto.
- Apply opensp-nodeids.patch from the Fedora opensp-1.5.2-4.fc7.src.rpm
package.
-* Sun Oct 29 2006 - meissner@suse.de
+* Sun Oct 29 2006 meissner@suse.de
- use RPM_OPT_FLAGS also for the C snippets.
-* Thu May 04 2006 - sbrabec@suse.cz
+* Thu May 04 2006 sbrabec@suse.cz
- Fixed devel dependencies.
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Tue Oct 11 2005 - meissner@suse.de
+* Tue Oct 11 2005 meissner@suse.de
- fixed C++ problem in gcc4.1.
-* Wed Apr 21 2004 - meissner@suse.de
+* Wed Apr 21 2004 meissner@suse.de
- removed warnings by adding 2 missing returns.
-* Tue Jan 13 2004 - meissner@suse.de
+* Tue Jan 13 2004 meissner@suse.de
- Fixed gcc3.4 build.
-* Sat Jan 10 2004 - adrian@suse.de
+* Sat Jan 10 2004 adrian@suse.de
- build as user
-* Mon Oct 13 2003 - ke@suse.de
+* Mon Oct 13 2003 ke@suse.de
- Update to version 1.5.1; from NEWS:
* With SP_MESSAGE_FORMAT environment variable enable run time
selection of message format (XML, NONE, TRADITIONAL).
@@ -259,31 +311,31 @@
* Enhancements to osx. Preserve case option, security fixes,
- Recreate auto* files on SL > 8.0 only.
- Add 'tr' and update 'de' translation file from IRO.UMontreal.CA.
-* Mon Oct 06 2003 - kukuk@suse.de
+* Mon Oct 06 2003 kukuk@suse.de
- Remove sgml-skel from needed for build
- Add /var/lib/sgml to filelist
-* Thu Sep 04 2003 - kukuk@suse.de
+* Thu Sep 04 2003 kukuk@suse.de
- opensp-devel should not Obsolete openjade
-* Wed Jun 04 2003 - kukuk@suse.de
+* Wed Jun 04 2003 kukuk@suse.de
- Fix syntax error in postinstall script
-* Mon May 26 2003 - ke@suse.de
+* Mon May 26 2003 ke@suse.de
- Cleanup $RPM_BUILD_ROOT.
-* Wed May 21 2003 - ke@suse.de
+* Wed May 21 2003 ke@suse.de
- Use %%postun instead of %%preun and don't run it while updating;
reported by Ruediger Oertel.
- Don't install .cvsignore file.
-* Mon May 19 2003 - ro@suse.de
+* Mon May 19 2003 ro@suse.de
- remove wrong obsoletes for jade_dsl
-* Tue May 06 2003 - ro@suse.de
+* Tue May 06 2003 ro@suse.de
- move AttributeValue class declaration to the top of Attribute.h
-* Thu Jan 30 2003 - ke@suse.de
+* Thu Jan 30 2003 ke@suse.de
- Add osx to the %%files list; reported by Togan Muftuoglu.
-* Thu Jan 23 2003 - coolo@suse.de
+* Thu Jan 23 2003 coolo@suse.de
- fixing script syntax
-* Mon Dec 16 2002 - ke@suse.de
+* Mon Dec 16 2002 ke@suse.de
- Comment out SGMLDECL statements in CATALOG.opensp; thus the builtin
SGML declaration will be used.
-* Mon Nov 25 2002 - ke@suse.de
+* Mon Nov 25 2002 ke@suse.de
- Update to version 1.5; from NEWS:
* Support for "-restricted" option to restrict parsing of web based
documents to local files only.
@@ -329,8 +381,8 @@
- Default catalogs are now: CATALOG, /etc/sgml/catalog, and
/usr/share/sgml/CATALOG (in this order); /etc/sgml/catalog is new.
- Make it a package on its own (separated from openjade).
-* Sat Nov 23 2002 - olh@suse.de
+* Sat Nov 23 2002 olh@suse.de
- do not fail in pre/postinstall scripts
-* Tue Nov 19 2002 - ke@suse.de
+* Tue Nov 19 2002 ke@suse.de
- Update to version 1.5pre9:
- Make it a package on its own (separated from openjade).
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org