- removed obsolete DESTDIR patch, use -O0 for debug on alpha too

  (BTW, is -O0 workaround on alpha still needed?)

Changed files:
    OpenSP-DESTDIR.patch -> 1.2
    opensp.spec -> 1.33

diff --git a/OpenSP-DESTDIR.patch b/OpenSP-DESTDIR.patch
deleted file mode 100644 (file)
index ecc5284..0000000
--- a/OpenSP-DESTDIR.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- OpenSP-1.4/po/Makefile.in.in.wiget Tue Dec 21 21:48:06 1999
-+++ OpenSP-1.4/po/Makefile.in.in       Thu Apr 27 09:31:35 2000
-@@ -113,9 +113,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 +125,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 \
-@@ -155,12 +155,12 @@
-       done
-       if test "$(PACKAGE)" = "gettext"; then \
-         if test -r "$(MKINSTALLDIRS)"; then \
--          $(MKINSTALLDIRS) $(gettextsrcdir); \
-+          $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-         else \
--          $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-+          $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-         fi; \
-         $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
--                        $(gettextsrcdir)/Makefile.in.in; \
-+                        $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-       else \
-         : ; \
-       fi
-@@ -173,12 +173,12 @@
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
--        rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
--        rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
--        rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
--        rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-+        rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-+        rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-+        rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-+        rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-       done
--      rm -f $(gettextsrcdir)/po-Makefile.in.in
-+      rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
- 
- check: all
- 

diff --git a/opensp.spec b/opensp.spec
index 8a860016db820891f6bc0c81723cb589d6b1f5ed..225b22a93fd94eb8422f0ec1ec876b60a59226d7 100644 (file)
--- a/opensp.spec
+++ b/opensp.spec
@@ -7,7 +7,6 @@ Release:        1
 License:       Free (Copyright (C) 1999 The OpenJade group)
 Group:         Applications/Publishing/SGML
 Source0:       ftp://download.sourceforge.net/pub/sourceforge/openjade/%{arname}-%{version}.tar.gz
-#Patch0:               OpenSP-DESTDIR.patch
 URL:           http://openjade.sourceforge.net/
 Requires:      sgml-common >= 0.5-1
 Provides:      sgmlparser
@@ -50,7 +49,6 @@ Biblioteki statyczne OpenSP.
 
 %prep
 %setup -q -n %{arname}-%{version}
-#%patch -p1
 
 %build
 #please don't run gettextize --copy --force
@@ -62,7 +60,7 @@ Biblioteki statyczne OpenSP.
        --enable-http
 
 %ifarch alpha
-%{__make} CXXFLAGS="%{!?debug:-O0}%{?debug:-O -g}"
+%{__make} CXXFLAGS="%{!?debug:-O0}%{?debug:-O0 -g}"
 %else
 %{__make}
 %endif