- FHS 2.0

- macros
- spec cleanup for PLD

Changed files:
    AfterStep-APPS.spec -> 1.2

diff --git a/AfterStep-APPS.spec b/AfterStep-APPS.spec
index 45b4d3d986f1afa355a14db37a3d60a0624eb10a..adf964f03e2e9790bb9dfc4c36915cfeccd593cb 100644 (file)
--- a/AfterStep-APPS.spec
+++ b/AfterStep-APPS.spec
@@ -1,18 +1,21 @@
-Summary: Applets you can use with AfterStep and compatible window managers.
-Name: AfterStep-APPS
-Version: 990329
-Release: 2
-Copyright: GPL
-Group: User Interface/Desktops
-BuildRoot: /var/tmp/afterstep-apps-root
-Source0: http://www.tigr.net/afterstep/as-apps/download/as-apps-%{version}.tar
-Patch0: AfterStep-APPS-1.5beta1-glibc.patch
-Patch1: ascp-paths.patch
-Patch2: as-apps-compile.patch
-Patch3: aterm-utmp.patch
-Patch4: xiterm-utmp.patch
-Prereq: /sbin/ldconfig
-Requires: /usr/sbin/utempter
+Summary:       Applets you can use with AfterStep and compatible window managers.
+Name:          AfterStep-APPS
+Version:       990329
+Release:       2
+Copyright:     GPL
+Group:         X11/Applications
+Source0:       http://www.tigr.net/afterstep/as-apps/download/as-apps-%{version}.tar
+Patch0:                AfterStep-APPS-1.5beta1-glibc.patch
+Patch1:                ascp-paths.patch
+Patch2:                as-apps-compile.patch
+Patch3:                aterm-utmp.patch
+Patch4:                xiterm-utmp.patch
+Prereq:                /sbin/ldconfig
+Requires:      /usr/sbin/utempter
+BuildRoot:     /tmp/%{name}-%{version}-root
+
+%define                _prefix /usr/X11R6
+%define                _mandir /usr/X11R6/man
 
 %description
 What's a cool window manager without some cool applets?
@@ -32,10 +35,10 @@ for archive in *.tar.gz ; do
        tar xzf $archive
        rm -f $archive
 done
-%patch0 -p1 -b .glibc
-%patch1 -p1 -b .paths
-%patch3 -p0 -b .autmp
-%patch4 -p1 -b .xiutmp
+%patch0 -p1
+%patch1 -p1
+%patch3 -p0
+%patch4 -p1
 
 %build
 for package in `ls` ; do
@@ -52,10 +55,13 @@ for package in `ls` ; do
 EOF
            patch -p2 -b --suffix .compile < %{PATCH2}
            xmkmf
-           make Makefiles
-           make MANDIR=/usr/X11R6/man/man1 \
-               BINDIR=/usr/X11R6/bin \
-               SHLIBDIR=/usr/X11R6/lib \
+           make Makefiles CXXDEBUGFLAGS="$RPM_OPT_FLAGS" \
+               CDEBUGFLAGS="$RPM_OPT_FLAGS"
+           make MANDIR=%{_mandir}/man1 \
+               BINDIR=%{_bindir} \
+               SHLIBDIR=%{_libdir} \
+               CXXDEBUGFLAGS="$RPM_OPT_FLAGS" \
+               CDEBUGFLAGS="$RPM_OPT_FLAGS"
            ;;
        
        asmount* | asDrinks* | asbutton* | asdm* | aspbm* | aspostit* | ascdc-* | astuner* | ASFiles* | as[R-W]* | asfaces* | asmon* | astrash* | asxmcd* )
@@ -63,34 +69,37 @@ EOF
            ;;
 
        aterm*)
-           CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr/X11R6 \
-               --enable-utmp
+           %configure --enable-utmp
            make
            ;;
 
        xiterm*)
            # cough cough, hack hack -- ewt
-           CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr/X11R6 \
-               --enable-xpm-background --enable-utmp --enable-wtmp \
-               --enable-menubar --enable-next-scroll
+           %configure \
+               --enable-xpm-background \
+               --enable-utmp \
+               --enable-wtmp \
+               --enable-menubar \
+               --enable-next-scroll
            xmkmf
            make Makefiles
            cd src
            sed -e "s/EXTRA_LIBRARIES =/EXTRA_LIBRARIES = -lutempter/" \
               Makefile > Makefile.foo
            sed -e "s/-lsocket //" Makefile.foo > Makefile
-           make
+           make CXXDEBUGFLAGS="$RPM_OPT_FLAGS" \
+               CDEBUGFLAGS="$RPM_OPT_FLAGS"
            ;;
        asclock*)
-           CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr/X11R6 << EOF
+           CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} << EOF
 classic
 
 EOF
-             make
+             make CFLAGS="$RPM_OPT_FLAGS"
             ;;
        *)
            #just about every other thing supports autoconf
-           CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr/X11R6 --datadir=/usr/share
+           %configure
            make
            ;;
     esac
@@ -98,21 +107,19 @@ EOF
 done
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man/man1
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
 for package in `ls` ; do
     cd $package 
     case $package in
        ascd-* | xiterm*)
            make install install.man \
-               AFTER_BIN_DIR=$RPM_BUILD_ROOT/usr/X11R6/bin \
-               AFTER_MAN_DIR=$RPM_BUILD_ROOT/usr/X11R6/man/man1 \
-               MANDIR=/usr/X11R6/man/man1 \
-               BINDIR=/usr/X11R6/bin \
-               SHLIBDIR=/usr/X11R6/lib \
+               AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+               AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+               MANDIR=%{_mandir}/man1 \
+               BINDIR=%{_bindir} \
+               SHLIBDIR=%{_libdir} \
                DESTDIR=$RPM_BUILD_ROOT 
            ;;
 
@@ -122,8 +129,8 @@ for package in `ls` ; do
 
         ascp-* )
            make install \
-               ASCP_BIN_DIR=$RPM_BUILD_ROOT/usr/X11R6/bin \
-               ASCP_MAN_DIR=$RPM_BUILD_ROOT/usr/X11R6/man/man1 \
+               ASCP_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+               ASCP_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
                prefx=$RPM_BUILD_ROOT \
                DESTDIR=$RPM_BUILD_ROOT
            ;;
@@ -131,30 +138,32 @@ for package in `ls` ; do
 
        asppp* | aterm* )
            make install \
-               AFTER_BIN_DIR=$RPM_BUILD_ROOT/usr/X11R6/bin \
-               AFTER_MAN_DIR=$RPM_BUILD_ROOT/usr/X11R6/man/man1 \
+               AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+               AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
                DESTDIR=$RPM_BUILD_ROOT
            ;;
        *)
            make install install.man \
-               AFTER_BIN_DIR=$RPM_BUILD_ROOT/usr/X11R6/bin \
-               AFTER_MAN_DIR=$RPM_BUILD_ROOT/usr/X11R6/man/man1 \
+               AFTER_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
+               AFTER_MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
                DESTDIR=$RPM_BUILD_ROOT
            ;;
     esac
     cd ..
 done
-rm -f $RPM_BUILD_ROOT/usr/X11R6/{bin,man/man1}/{sessreg,xpmroot,qplot}*
-strip $RPM_BUILD_ROOT/usr/X11R6/bin/*
+rm -f $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}/{sessreg,xpmroot,qplot}*
+strip --strip-unneeded $RPM_BUILD_ROOT%{_bindir}/*
+
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
-/usr/X11R6/bin/*
-/usr/share/afterstep/*
-/usr/X11R6/man/man1/*
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/*
+%{_datadir}/afterstep/*
+%{_mandir}/man1/*