merge DEVEL branch

Changed files:
    openjade.spec -> 1.42

diff --git a/openjade.spec b/openjade.spec
index 35a17d3d186fa0d72e464cf0a11365eb3d638567..b8bd363ee5c5342244243a4773a43c55c0ce396e 100644 (file)
--- a/openjade.spec
+++ b/openjade.spec
@@ -1,26 +1,23 @@
-%define                snap    20020409
+%define                snap    20020531
 Summary:       OpenJade -- DSSSL parser
 Summary(pl):   OpenJade -- parser DSSSL
 Name:          openjade
 Version:       1.4
-Release:       13.%{snap}
+Release:       12.%{snap}
 License:       Free (Copyright (C) 1999 The OpenJade group)
 Group:         Applications/Publishing/SGML
-Source0:       %{name}-%{snap}.tar.gz
-Patch0:                %{name}-table.patch
-Patch1:                %{name}-ac25x.patch
-Patch2:                %{name}-types.patch
+Source0:       OpenJade-%{version}devel.%{snap}.tar.gz
 URL:           http://openjade.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: gettext-devel
-BuildRequires: opensp-devel >= 1.5pre5
+BuildRequires: opensp-devel >= 1.6
 BuildRequires: perl
 Provides:      jade
 Provides:      dssslparser
 Requires:      sgmlparser
-Requires:      opensp >= 1.5pre5
+Requires:      opensp >= 1.6
 Prereq:                sgml-common
 Prereq:                /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,31 +57,19 @@ OpenJade static libraries.
 Biblioteki statyczne OpenJade.
 
 %prep
-%setup -q -n %{name}-%{snap}
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
+%setup -q -n OpenJade-%{version}devel
 
 %build
 #remove CVS dirs
-find . -type d -name CVS | xargs rm -rf
+find . -type d -name CVS -exec rm -rf {} \;
 #missing files required by Makefile.am
-touch ChangeLog
-rm -f missing
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal}
-echo "#undef SIZEOF_WCHAR_T" >> acconfig.h
-%{__autoheader}
-%{__automake}
-#aclocal
-%{__autoconf}
-%ifarch alpha
-CXXFLAGS="-O0 %{?debug:-g}"
-%endif
+LDFLAGS=""; export LDFLAGS
 %configure \
        --enable-default-catalog=/etc/sgml/catalog \
-       --enable-default-search-path=/usr/share/sgml
+       --enable-default-search-path=/usr/share/sgml \
+       --enable-mif \
+       --enable-html \
+       --enable-threads
 
 # it has /usr/share/Openjade hardcoded somewhere so it does not work
        # --datadir=%{_datadir}/sgml
@@ -95,47 +80,36 @@ CXXFLAGS="-O0 %{?debug:-g}"
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/sgml
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT \
+       pkgdocdir=%{_defaultdocdir}/%{name}-%{version} 
 
-cp -a unicode $RPM_BUILD_ROOT%{_datadir}/sgml
 ln -sf "../OpenJade" $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}-%{version}
 
-##ln -s "../OpenJade" $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}
-#install dsssl/catalog \
-#      dsssl/builtins.dsl dsssl/extensions.dsl \
-#      dsssl/dsssl.dtd dsssl/fot.dtd dsssl/spec.dtd dsssl/style-sheet.dtd \
-#      $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}-%{version}/
-#grep -v SYSTEM $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}/catalog > \
-#      $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}/%{name}.cat
-
-
 # simulate jade
 ln -sf openjade $RPM_BUILD_ROOT%{_bindir}/jade
 
-%find_lang OpenJade
+%find_lang jade
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/usr/bin/install-catalog --add /etc/sgml/dsssl-%{version}-%{release}.cat \
-       %{_datadir}/sgml/%{name}-%{version}/catalog
-/usr/bin/install-catalog --add /etc/sgml/jade-unicode-%{version}-%{release}.cat \
-       %{_datadir}/sgml/unicode/catalog
+if ! grep -q /etc/sgml/openjade.cat /etc/sgml/catalog ; then
+       /usr/bin/install-catalog --add /etc/sgml/openjade.cat \
+               %{_datadir}/OpenJade/catalog
+fi
 
 %postun
 /sbin/ldconfig
-if [ "$1" = "0" ]; then
-       /usr/bin/install-catalog --remove /etc/sgml/dsssl-%{version}.cat \
-               %{_datadir}/sgml/%{name}-%{version}/catalog
-       /usr/bin/install-catalog --remove /etc/sgml/jade-unicode-%{version}-%{release}.cat \
-               %{_datadir}/sgml/unicode/catalog
+if [ "$1" = "0" ] ; then
+       /usr/bin/install-catalog --remove /etc/sgml/openjade.cat \
+               %{_datadir}/OpenJade/catalog
 fi
 
-%files -f OpenJade.lang
+%files -f jade.lang
 %defattr(644,root,root,755)
-%doc jadedoc/ dsssl/ README COPYING
+%doc %{_defaultdocdir}/%{name}-%{version}
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_datadir}/sgml/*