OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Jan-2003 20:18:56
Branch: HEAD Handle: 2003013119185501
Modified files:
openpkg-src/ddd ddd.patch ddd.spec
Log:
- canonicalize the Autoconf patching to being able to use %patch
- filter %description through the usual par(1) formatting
- fix homepage URL
- get rid of g++ warnings by using -Wno-deprecated
- fix broken datadir redirection
Summary:
Revision Changes Path
1.2 +4 -18 openpkg-src/ddd/ddd.patch
1.5 +18 -20 openpkg-src/ddd/ddd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 ddd.patch
--- openpkg-src/ddd/ddd.patch 31 Jan 2003 16:18:15 -0000 1.1
+++ openpkg-src/ddd/ddd.patch 31 Jan 2003 19:18:55 -0000 1.2
@@ -1,18 +1,5 @@
-diff -Naur ddd-3.3.1.orig/ddd/config.h ddd-3.3.1/ddd/config.h
---- ddd-3.3.1.orig/ddd/config.h Tue Jan 28 14:28:12 2003
-+++ ddd-3.3.1/ddd/config.h Fri Jan 31 14:53:34 2003
-@@ -139,7 +139,7 @@
- /* #undef HAVE_FREEZE_OSTRSTREAMBUF */
-
- /* Define if the ios::iostate type is defined or declared in <iostream.h>. */
--/* #undef HAVE_IOSTATE */
-+#define HAVE_IOSTATE 1
-
- /* Define if your C++ compiler supports long long types. */
- #define HAVE_LONG_LONG 1
-diff -Naur ddd-3.3.1.orig/ddd/logplayer.C ddd-3.3.1/ddd/logplayer.C
---- ddd-3.3.1.orig/ddd/logplayer.C Wed Jan 29 17:55:33 2003
-+++ ddd-3.3.1/ddd/logplayer.C Wed Jan 29 17:55:51 2003
+--- ddd/logplayer.C Wed Jan 29 17:55:33 2003
++++ ddd/logplayer.C Wed Jan 29 17:55:51 2003
@@ -42,12 +42,14 @@
#include "config.h"
#include "streampos.h"
@@ -33,9 +20,8 @@
#include <setjmp.h>
#include <signal.h>
-diff -Naur ddd-3.3.1.orig/ddd/strclass.C ddd-3.3.1/ddd/strclass.C
---- ddd-3.3.1.orig/ddd/strclass.C Fri Mar 30 14:31:46 2001
-+++ ddd-3.3.1/ddd/strclass.C Thu Jan 30 13:59:13 2003
+--- ddd/strclass.C Fri Mar 30 14:31:46 2001
++++ ddd/strclass.C Thu Jan 30 13:59:13 2003
@@ -41,14 +41,16 @@
#include "strclass.h"
#include "config.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 ddd.spec
--- openpkg-src/ddd/ddd.spec 31 Jan 2003 17:33:44 -0000 1.4
+++ openpkg-src/ddd/ddd.spec 31 Jan 2003 19:18:56 -0000 1.5
@@ -26,8 +26,8 @@
# package information
Name: ddd
Summary: GNU Data Display Debugger
-URL: http://www.ddd.org/
-Vendor: Dorothea L�TKEHAUS, Andreas ZELLER
+URL: http://www.gnu.org/software/ddd/
+Vendor: Dorothea L�tkehaus, Andreas Zeller
Packager: The OpenPKG Project
Distribution: OpenPKG [EVAL]
Group: Development
@@ -48,24 +48,30 @@
AutoReqProv: no
%description
- GNU DDD is a graphical front-end for command-line debuggers such
- as GDB, DBX, WDB, Ladebug, JDB, XDB, the Perl debugger, or the
- Python debugger. Besides 'usual' front-end features such as
- viewing source texts, DDD has become famous through its
- interactive graphical data display, where data structures
- are displayed as graphs.
+ GNU DDD is a graphical front-end for command-line debuggers such as
+ GDB, DBX, WDB, Ladebug, JDB, XDB, the Perl debugger, or the Python
+ debugger. Besides 'usual' front-end features such as viewing source
+ texts, DDD has become famous through its interactive graphical data
+ display, where data structures are displayed as graphs.
%prep
%setup -q
+ %patch -p0
%build
+ %{l_shtool} subst \
+ -e 's;$(pkgdatadir)-@VERSION@;$(pkgdatadir);g' \
+ -e 's;$(pkgdatadir)-$(VERSION);$(pkgdatadir);g' \
+ `find . -type f -name Makefile.in -print`
+ echo "ice_cv_have_iostate=yes" >config.cache
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
- CXXFLAGS="%{l_cxxflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O} -Wno-deprecated" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
--x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
@@ -73,22 +79,14 @@
--with-motif-includes=%{l_prefix} \
--with-motif-libraries=%{l_prefix} \
--with-readline-libraries=%{l_prefix}
- %{l_patch} -p1 <%{SOURCE ddd.patch}
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
- $RPM_BUILD_ROOT%{l_prefix}/share/ddd-%{version}/ddd \
- $RPM_BUILD_ROOT%{l_prefix}/share/ddd-%{version}/themes \
- $RPM_BUILD_ROOT%{l_prefix}/share/ddd-%{version}/vsllib
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/info
- rm $RPM_BUILD_ROOT%{l_prefix}/share/ddd-%{version}/COPYING
- rm $RPM_BUILD_ROOT%{l_prefix}/share/ddd-%{version}/NEWS
- mv $RPM_BUILD_ROOT%{l_prefix}/share/ddd-%{version}
$RPM_BUILD_ROOT%{l_prefix}/share/ddd
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ rm $RPM_BUILD_ROOT%{l_prefix}/share/ddd/COPYING
+ rm $RPM_BUILD_ROOT%{l_prefix}/share/ddd/NEWS
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
