- removed obsolete DESTDIR patch, use -g if debug on alpha

  (is -O0 workaround still needed?)
- added ac25x needed for autoconf 2.53

Changed files:
    openjade-DESTDIR.patch -> 1.2
    openjade-ac25x.patch -> 1.1
    openjade.spec -> 1.31

diff --git a/openjade-DESTDIR.patch b/openjade-DESTDIR.patch
deleted file mode 100644 (file)
index 5886225..0000000
--- a/openjade-DESTDIR.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur openjade-20000320/po/Makefile.in.in openjade-20000320.new/po/Makefile.in.in
---- openjade-20000320/po/Makefile.in.in        Wed Jan  5 11:22:25 2000
-+++ openjade-20000320.new/po/Makefile.in.in    Sun Mar 26 00:08:28 2000
-@@ -25,6 +25,8 @@
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
- 
-+DESTDIR =
-+
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
-@@ -113,9 +115,9 @@
- install-data-no: all
- install-data-yes: all
-       if test -r "$(MKINSTALLDIRS)"; then \
--        $(MKINSTALLDIRS) $(datadir); \
-+        $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-       else \
--        $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+        $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-       fi
-       @catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-@@ -125,7 +127,7 @@
-           *)     destdir=$(localedir);; \
-         esac; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
--        dir=$$destdir/$$lang/LC_MESSAGES; \
-+        dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-         if test -r "$(MKINSTALLDIRS)"; then \
-           $(MKINSTALLDIRS) $$dir; \
-         else \

diff --git a/openjade-ac25x.patch b/openjade-ac25x.patch
new file mode 100644 (file)
index 0000000..5e4b86a
--- /dev/null
+++ b/openjade-ac25x.patch
@@ -0,0 +1,10 @@
+--- openjade-20020409/configure.in.orig        Tue Apr  9 18:41:50 2002
++++ openjade-20020409/configure.in     Wed Apr 10 20:24:06 2002
+@@ -233,7 +233,6 @@
+             [define this to build the html backend])
+   AC_MSG_RESULT(yes))
+ 
+-AC_SUBST(LIBOBJS)
+ AC_OUTPUT([${PACKAGE}-${VERSION}.spec:spec.in Makefile msggen.pl style/Makefile grove/Makefile spgrove/Makefile
+       jade/Makefile dsssl/Makefile jadedoc/Makefile 
+       jadedoc/images/Makefile intl/Makefile po/Makefile.in],

diff --git a/openjade.spec b/openjade.spec
index 74df181a3b1500dfcfda60d82bd443dc3af4c871..050ed001ca3018d28b8dcc122b5f9d530ed15c93 100644 (file)
--- a/openjade.spec
+++ b/openjade.spec
@@ -6,8 +6,8 @@ Release:        8.20020409
 License:       Free (Copyright (C) 1999 The OpenJade group)
 Group:         Applications/Publishing/SGML
 Source0:       %{name}-20020409.tar.gz
-#Patch0:               %{name}-DESTDIR.patch
-Patch1:                %{name}-table.patch
+Patch0:                %{name}-table.patch
+Patch1:                %{name}-ac25x.patch
 URL:           http://openjade.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -59,7 +59,8 @@ Biblioteki statyczne OpenJade.
 
 %prep
 %setup -q -n %{name}-20020409
-%patch1 -p0
+%patch0 -p0
+%patch1 -p1
 
 %build
 #missing files required by Makefile.am
@@ -74,15 +75,13 @@ automake -a -c -f
 #aclocal
 autoconf
 %ifarch alpha
-CXXFLAGS="-O0"
-export CXXFLAGS
+CXXFLAGS="-O0 %{?debug:-g}"
 %endif
 %configure \
        --enable-default-catalog=/etc/sgml/catalog \
-       --enable-default-search-path=/usr/share/sgml \
+       --enable-default-search-path=/usr/share/sgml
 
-
-# it has /usr/share/Openjade hardcoded somewhere so it des not work
+# it has /usr/share/Openjade hardcoded somewhere so it does not work
        # --datadir=%{_datadir}/sgml
 
 %{__make}