diff --git a/.cvsignore b/.cvsignore index 4154435..b8d1861 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -openjade-1.3.tar.gz +openjade-1.3.1.tar.gz diff --git a/openjade.spec b/openjade.spec index 6cd3ec9..c07b42b 100644 --- a/openjade.spec +++ b/openjade.spec @@ -1,21 +1,14 @@ Summary: A DSSSL implementation. Name: openjade -Version: 1.3 -Release: 18 +Version: 1.3.1 +Release: 3 Prereq: sgml-common >= 0.5 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz -Patch0: openjade-1.3-decl.patch -Patch1: openjade-1.3-strdup.patch -# compiler bug. remove later. -Patch2: openjade-foo.patch -Patch3: openjade-1.3-size_t.patch -Patch4: openjade-1.3-31525.patch -Patch5: openjade-1.3-lt.patch -Patch6: http://indev.insu.com/openjade/openjade-1.3.patch -Patch7: openjade-1.3-ligature.patch -Copyright: Copyright 1997 James Clark +Patch0: openjade-1.3.1-lt.patch +Patch1: openjade-1.3-namesp.patch +License: Distributable Group: Applications/Text -BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Prefix: /usr Obsoletes: jade Provides: jade @@ -30,16 +23,6 @@ XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. %prep %setup -q -%patch0 -p1 -b .decl -%patch1 -p1 -b .strdup -%patch2 -p1 -b .foo -%ifarch s390 s390x -%patch3 -p1 -b .size_t -%endif -%patch4 -p1 -b .31525 -%patch5 -p1 -b .lt -%patch6 -p1 -%patch7 -p1 -b .ligature %build @@ -47,10 +30,12 @@ cp config/configure.in . %ifarch alpha export CXXFLAGS="-O0" %endif +libtoolize --copy --force %configure --prefix=%{prefix} --enable-static \ --enable-default-catalog=/etc/sgml/catalog \ --enable-default-search-path=/usr/share/sgml \ - --datadir=/usr/share/sgml/%{name}-%{version} + --datadir=/usr/share/sgml/%{name}-%{version} \ + --enable-http NRPROC=`egrep -c "^cpu[0-9]+" /proc/stat || :` [ "$NRPROC" = "0" ] && NRPROC=1 make -j$NRPROC @@ -66,9 +51,14 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT mkdir -p \ - $RPM_BUILD_ROOT/%{prefix}/{lib,bin,doc,share/sgml/openjade-1.3,include/sp/{generic,include,lib}} + $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 +%makeinstall datadir=$RPM_BUILD_ROOT/%{prefix}/share/sgml/openjade-1.3.1 +make install-man mandir=$RPM_BUILD_ROOT/%{_mandir} + +# Fix up libtool libraries +find $RPM_BUILD_ROOT -name '*.la' | \ + xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g" # oMy, othis ois osilly. ln -s openjade $RPM_BUILD_ROOT/%{prefix}/bin/jade @@ -99,9 +89,38 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/lib/* %{prefix}/share/sgml %{prefix}/include/* +%{_mandir}/*/* %changelog -* Wed Sep 12 2001 Tim Powers +* Thu Feb 21 2002 Tim Waugh 1.3.1-3 +- Rebuild in new environment. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-2 +- Ship man pages. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-1 +- 1.3.1. +- Patches no longer needed: decl, strdup, foo, size_t, 31525, indev, + ligature, twosidestartonright. +- Updated lt patch. + +* Mon Jan 14 2002 Tim Waugh 1.3-22 +- Enable build on GCC 3.0 onwards. +- Run libtoolize. + +* Fri Nov 2 2001 Tim Waugh 1.3-21 +- Enable HTTP support. Now a DocBook XML document can be processed by + either xsltproc or openjade. + +* Tue Oct 30 2001 Tim Waugh 1.3-20 +- Apply twosidestartonright patch from Ian Castle. + +* Thu Oct 11 2001 Tim Waugh 1.3-19 +- s/Copyright:/License:/ +- Use %%{_tmppath}. +- Fix up libtool libraries (bug #46212). + +* Wed Sep 12 2001 Tim Powers 1.3-18 - rebuild with new gcc and binutils * Fri Jun 15 2001 Tim Waugh 1.3-17 diff --git a/sources b/sources index f9934ae..d6fb228 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4cbc2a8c15431b3f08b4487a5702c938 openjade-1.3.tar.gz +c453a50001de6cdf132d85ecfb99a0f9 openjade-1.3.1.tar.gz