- macros

- FHS 2.0
- cleanup

Changed files:
    ddd.spec -> 1.14

diff --git a/ddd.spec b/ddd.spec
index 6af93442393881b04e9cabb6b3a660af96a36ae5..9511c30dfa9d73ac324f7d67371db454667f084c 100644 (file)
--- a/ddd.spec
+++ b/ddd.spec
@@ -11,6 +11,9 @@ Icon:         ddd.xpm
 URL:           http://www.cs.tu-bs.de/softech/ddd/
 Buildroot:     /tmp/%{name}-%{version}-root
 
+%define                _prefix /usr/X11R6
+%define                _mandir /usr/X11R6/man
+
 %description
 The Data Display Debugger (DDD) is a common graphical user interface for
 GDB, DBX, and XDB, the popular UNIX debuggers.  Besides ``classical''
@@ -39,26 +42,25 @@ Data Display Debugger - python debugger.
 
 %prep
 %setup -q
-%patch -p1
+#%patch -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure %{_target_platform} \
-       --with-motif \
-       --prefix=/usr/X11R6
+%configure --with-motif
 make CXXOPT="-DNDEBUG $RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{etc/X11/wmconfig,usr/{lib/python-1.5,X11R6/lib/X11/app-defaults}}
+install -d $RPM_BUILD_ROOT/{etc/X11/wmconfig,usr/lib/python-1.5,%{_libdir}/X11/app-defaults}
 
-make install prefix=$RPM_BUILD_ROOT/usr/X11R6
+make install prefix=$RPM_BUILD_ROOT%{_prefix} \
+       mandir=$RPM_BUILD_ROOT%{_mandir} \
+       bindir=$RPM_BUILD_ROOT%{_bindir} \
+       libdir=$RPM_BUILD_ROOT%{_libdir}
 
-install pydb/pydb.py $RPM_BUILD_ROOT/usr/X11R6/bin
-install pydb/{pydbcmd,pydbsupt}.py $RPM_BUILD_ROOT%{_libdir}/python-1.5
+install pydb/pydb.py $RPM_BUILD_ROOT%{_bindir}
+install pydb/{pydbcmd,pydbsupt}.py $RPM_BUILD_ROOT/usr/lib/python-1.5
 
-install ddd/Ddd $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
-gzip -9nf $RPM_BUILD_ROOT/usr/X11R6/man/man1/*
+install ddd/Ddd $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults
 
 cat > $RPM_BUILD_ROOT/etc/X11/wmconfig/ddd <<EOF
 ddd name "DDD"
@@ -74,21 +76,22 @@ ddd exec "/usr/X11R6/bin/ddd --pydb"
 ddd group "Development"
 EOF
 
+gzip -9nf ANNOUNCE BUGS ChangeLog NEWS* OPENBUGS PROBLEMS README TIPS \
+       TODO $RPM_BUILD_ROOT%{_mandir}/man1/*
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE BUGS ChangeLog NEWS* OPENBUGS PROBLEMS README TIPS TODO doc/sample.dddinit
+%doc {ANNOUNCE,BUGS,ChangeLog,NEWS*,OPENBUGS,PROBLEMS,README,TIPS,TODO}.gz
+%doc doc/sample.dddinit
 /etc/X11/wmconfig/ddd
-%attr(755,root,root) /usr/X11R6/bin/*
-
-/usr/X11R6/lib/X11/app-defaults/Ddd
-
-/usr/X11R6/man/man1/*
+%attr(755,root,root) %{_bindir}/*
+%{_libdir}/X11/app-defaults/Ddd
+%{_mandir}/man1/*
 
 %files python
 %defattr(644,root,root,755)
 /etc/X11/wmconfig/ddd-python
-%attr(755,root,root) /usr/X11R6/bin/pydb.py
-%{_libdir}/python*/*
+%attr(755,root,root) %{_bindir}/pydb.py
+/usr/lib/python*/*