auto-import changelog data from openjade-1.3.2-8.src.rpm

Mon Oct 20 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-8
- Rebuilt.
Tue Sep 23 2003 Florian La Roche <Florian.LaRoche@redhat.de> 1.3.2-7
- do not link against -lnsl
Thu Aug 07 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-6
- Rebootstrap to create a libtool that actually works.
Wed Aug 06 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-5
- Rebuilt.
Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> 1.3.2-4
- rebuilt
Thu May 22 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-3
- Fixes for GCC 3.3.
- Use --parents for %doc.
Tue Mar 18 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-2
- Provide sgml2xml man page (bug #83759).
- Add devel subpackage.
Fri Mar 14 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-1
- OpenSP 1.5, openjade 1.3.2.
- Renumber patches.
Thu Feb 13 2003 Elliot Lee <sopwith@redhat.com> 1.3.1-13
- Add openjade-ppc64.patch
This commit is contained in:
cvsdist 2004-09-09 09:33:46 +00:00
parent 403a4e3ed2
commit 39aec48a2b
5 changed files with 168 additions and 44 deletions

View File

@ -1 +1,2 @@
openjade-1.3.1.tar.gz
OpenSP-1.5.tar.gz
openjade-1.3.2.tar.gz

21
openjade-1.3.1-nsl.patch Normal file
View File

@ -0,0 +1,21 @@
--- openjade-1.3.1/config/configure.in.lr 2003-09-12 08:03:22.000000000 -0600
+++ openjade-1.3.1/config/configure.in 2003-09-12 08:03:44.000000000 -0600
@@ -156,7 +156,6 @@
then
AC_MSG_RESULT(yes)
AC_DEFINE(SP_HAVE_SOCKET)
- AC_CHECK_LIB(nsl,main,LIBS="$LIBS -lnsl")
AC_CHECK_LIB(socket,main,LIBS="$LIBS -lsocket")
AC_MSG_CHECKING(h_errno in netdb.h)
AC_EGREP_HEADER(h_errno,netdb.h,
--- openjade-1.3.1/configure.lr 2003-09-12 08:35:55.000000000 -0600
+++ openjade-1.3.1/configure 2003-09-12 08:36:07.000000000 -0600
@@ -5530,7 +5530,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
+LIBS="-lXXXnsl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"

27
openjade-ppc64.patch Normal file
View File

@ -0,0 +1,27 @@
--- openjade-1.3.1/Makefile.prog.in.sopwith 2002-01-22 06:57:53.000000000 -0500
+++ openjade-1.3.1/Makefile.prog.in 2003-02-11 16:59:44.000000000 -0500
@@ -1,3 +1,4 @@
+
#
# Makefile.prog.in - Makerules for bilding programs
#
@@ -11,15 +12,17 @@
LINKFLAGS = @LINKFLAGS@
ALL_LIBS = $(XLIBS) $(LIBS)
+LT_LIBS = $(shell echo $(XLIBS) | sed 's/\.a/.la/g')
+LT_ALL_LIBS = $(shell echo $(ALL_LIBS) | sed 's/\.a/.la/g')
Makefile.lt:
- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
+ echo > Makefile.lt
PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
all: $(PROG)
$(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
- $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
+ $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_ALL_LIBS)
install: $(PROG)
-test -d $(DESTDIR)$(bindir) || \

View File

@ -1,14 +1,17 @@
%define opensp_ver 1.5
Summary: A DSSSL implementation.
Name: openjade
Version: 1.3.1
Release: 12
Version: 1.3.2
Release: 8
Prereq: sgml-common >= 0.5
Prereq: docbook-dtds
Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
Patch0: openjade-1.3.1-lt.patch
Patch1: openjade-1.3-namesp.patch
Patch2: openjade-1.3.1-manpage.patch
Patch3: openjade-1.3.1-httphost.patch
Source0: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
Source1: http://download.sourceforge.net/openjade/OpenSP-%{opensp_ver}.tar.gz
Patch0: openjade-1.3.1-manpage.patch
Patch1: openjade-ppc64.patch
Patch2: openjade-1.3.1-httphost.patch
Patch3: opensp-1.5-gcc33.patch
Patch4: openjade-1.3.1-nsl.patch
License: Distributable
Group: Applications/Text
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -16,6 +19,8 @@ Prefix: /usr
Obsoletes: jade
Provides: jade
BuildRequires: autoconf, automake
%description
OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL
(Document Style Semantics and Specification Language). OpenJade is
@ -24,42 +29,70 @@ command-line application and a set of components. The DSSSL engine
inputs an SGML or XML document and can output a variety of formats:
XML, RTF, TeX, MIF (FrameMaker), SGML, or XML.
%package devel
Summary: Files for developing applications that use openjade/OpenSP.
Requires: %{name} = %{version}
Group: Development/Libraries
%description devel
The header files, static library, libtool library and man pages for
developing applications that use openjade/OpenSP.
%define openjadetop %{_builddir}/%{name}-%{version}
%prep
%setup -q
%patch2 -p1 -b .manpage
%patch3 -p1 -b .httphost
%setup -q -c -a1
pushd %{openjadetop}/openjade-%{version}
%patch0 -p1 -b .manpage
%patch1 -p1 -b .ppc64
%patch4 -p1
popd
pushd %{openjadetop}/OpenSP-%{opensp_ver}
%patch2 -p1 -b .httphost
%patch3 -p1 -b .gcc33
popd
%build
cp config/configure.in .
%ifarch alpha
export CXXFLAGS="-O0"
%endif
pushd %{openjadetop}/OpenSP-%{opensp_ver}
aclocal
libtoolize --copy --force
%configure --prefix=%{prefix} --enable-static \
automake --add-missing --copy
autoconf --force
%configure --enable-http --datadir=/usr/share/sgml/%{name}-%{version} \
--enable-default-catalog=/etc/sgml/catalog \
--enable-default-search-path=/usr/share/sgml \
--datadir=/usr/share/sgml/%{name}-%{version} \
--enable-http
NRPROC=`egrep -c "^cpu[0-9]+" /proc/stat || :`
[ "$NRPROC" = "0" ] && NRPROC=1
make -j$NRPROC
--enable-default-search-path=/usr/share/sgml
make %{?_smp_mflags}
# This is needed because openjade has an awful hack in its own config.h.
cp config.h include
# This is to catch #include <OpenSP/...>
ln -s . include/OpenSP
popd
pushd %{openjadetop}/openjade-%{version}
#cp config/configure.in .
#libtoolize --copy --force
%configure --enable-http --datadir=/usr/share/sgml/%{name}-%{version} \
--enable-spincludedir=%{openjadetop}/OpenSP-%{opensp_ver}/include \
--enable-splibdir=%{openjadetop}/OpenSP-%{opensp_ver}/lib \
--enable-default-catalog=/etc/sgml/catalog \
--enable-default-search-path=/usr/share/sgml
make %{?_smp_mflags}
popd
%install
# NOTE: in installing I am also copying a bunch of .h files into
# $(prefix)/include/sp/{generic,include,lib}. This is so that the
# library API can be used. It's an ugly kludge, and the best way
# would be for James Clark to tell us what the appropriate list of
# files to be included is.
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
mkdir -p \
$RPM_BUILD_ROOT/%{prefix}/{lib,bin,doc,share/sgml/openjade-1.3.1,include/sp/{generic,include,lib}}
%makeinstall datadir=$RPM_BUILD_ROOT/%{prefix}/share/sgml/openjade-1.3.1
pushd %{openjadetop}/OpenSP-%{opensp_ver}
%makeinstall datadir=$RPM_BUILD_ROOT/usr/share/sgml/%{name}-%{version}
make install-man mandir=$RPM_BUILD_ROOT/%{_mandir}
popd
pushd %{openjadetop}/openjade-%{version}
%makeinstall datadir=$RPM_BUILD_ROOT/usr/share/sgml/%{name}-%{version}
make install-man mandir=$RPM_BUILD_ROOT/%{_mandir}
popd
# Fix up libtool libraries
find $RPM_BUILD_ROOT -name '*.la' | \
@ -67,19 +100,25 @@ find $RPM_BUILD_ROOT -name '*.la' | \
# oMy, othis ois osilly.
ln -s openjade $RPM_BUILD_ROOT/%{prefix}/bin/jade
echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1
for file in nsgmls sgmlnorm spam spent sx ; do
ln -s o$file $RPM_BUILD_ROOT/%{prefix}/bin/$file
echo ".so man1/o${file}.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/${file}.1
done
mv $RPM_BUILD_ROOT/%{prefix}/bin/sx $RPM_BUILD_ROOT/%{prefix}/bin/sgml2xml
install generic/*.h $RPM_BUILD_ROOT/%{prefix}/include/sp/generic/
install include/*.h $RPM_BUILD_ROOT/%{prefix}/include/sp/include/
install lib/*.h $RPM_BUILD_ROOT/%{prefix}/include/sp/lib/
mv $RPM_BUILD_ROOT/%{_mandir}/man1/{sx,sgml2xml}.1
# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade
cp dsssl/catalog $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}/
cp dsssl/dsssl.dtd dsssl/style-sheet.dtd dsssl/fot.dtd \
cp %{openjadetop}/openjade-%{version}/dsssl/catalog $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}/
cp %{openjadetop}/openjade-%{version}/dsssl/dsssl.dtd \
%{openjadetop}/openjade-%{version}/dsssl/style-sheet.dtd \
%{openjadetop}/openjade-%{version}/dsssl/fot.dtd \
$RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}
rm -rf $RPM_BUILD_ROOT/usr/doc/OpenSP
rm -rf $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}/doc
%clean
rm -rf $RPM_BUILD_ROOT
@ -89,16 +128,51 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc doc/ jadedoc/ dsssl/ pubtext/ unicode/ README COPYING VERSION
%doc */doc/ openjade-*/jadedoc/ openjade-*/dsssl/ */pubtext/ */unicode/
%doc --parents */README */COPYING openjade-*/VERSION
%{_bindir}/*
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so*
%{_libdir}/*.so.*
%{prefix}/share/sgml
%{prefix}/include/*
%{_mandir}/*/*
%files devel
%defattr(-,root,root)
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/*.la
%{_includedir}/*
%changelog
* Mon Oct 20 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-8
- Rebuilt.
* Tue Sep 23 2003 Florian La Roche <Florian.LaRoche@redhat.de> 1.3.2-7
- do not link against -lnsl
* Thu Aug 7 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-6
- Rebootstrap to create a libtool that actually works.
* Wed Aug 6 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-5
- Rebuilt.
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> 1.3.2-4
- rebuilt
* Thu May 22 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-3
- Fixes for GCC 3.3.
- Use --parents for %doc.
* Tue Mar 18 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-2
- Provide sgml2xml man page (bug #83759).
- Add devel subpackage.
* Fri Mar 14 2003 Tim Waugh <twaugh@redhat.com> 1.3.2-1
- OpenSP 1.5, openjade 1.3.2.
- Renumber patches.
* Thu Feb 13 2003 Elliot Lee <sopwith@redhat.com> 1.3.1-13
- Add openjade-ppc64.patch
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt

View File

@ -1 +1,2 @@
c453a50001de6cdf132d85ecfb99a0f9 openjade-1.3.1.tar.gz
87f56e79ae0c20397f4207d61d154303 OpenSP-1.5.tar.gz
7df692e3186109cc00db6825b777201e openjade-1.3.2.tar.gz