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 openpkg-web          Date:   07-Jul-2003 15:52:55
  Branch: HEAD                             Handle: 2003070714522133

  Modified files:
    openpkg-src/aide        aide.spec
    openpkg-src/arpd        arpd.spec
    openpkg-src/as-gui      as-gui.spec
    openpkg-src/audiofile   audiofile.spec
    openpkg-src/bc          bc.spec
    openpkg-src/cvs         cvs.spec
    openpkg-src/cvsd        cvsd.spec
    openpkg-src/ethereal    ethereal.spec
    openpkg-src/fsl         fsl.spec
    openpkg-src/honeyd      honeyd.spec
    openpkg-src/imapd       imapd.spec
    openpkg-src/inn         inn.spec
    openpkg-src/ircd        ircd.spec
    openpkg-src/j2ee        j2ee.spec
    openpkg-src/j2se        j2se.spec
    openpkg-src/kerberos    kerberos.spec
    openpkg-src/kermit      kermit.spec
    openpkg-src/lynx        lynx.spec
    openpkg-src/lzo         lzo.spec
    openpkg-src/mhash       mhash.spec
    openpkg-src/mirror      mirror.spec
    openpkg-src/monit       monit.spec
    openpkg-src/mysql       mysql.spec
    openpkg-src/nagios      nagios.spec
    openpkg-src/netcat      netcat.spec
    openpkg-src/nntpcache   nntpcache.spec
    openpkg-src/nsd         nsd.spec
    openpkg-src/ntp         ntp.spec
    openpkg-src/openldap    openldap.spec
    openpkg-src/openpkg     openpkg.spec
    openpkg-src/openssh     openssh.spec
    openpkg-src/petidomo    petidomo.spec
    openpkg-src/php         php.spec
    openpkg-src/pinfo       pinfo.spec
    openpkg-src/pks         pks.spec
    openpkg-src/portfwd     portfwd.spec
    openpkg-src/portsentry  portsentry.spec
    openpkg-src/postfix     postfix.spec
    openpkg-src/pound       pound.spec
    openpkg-src/powerdns    powerdns.spec
    openpkg-src/prngd       prngd.spec
    openpkg-src/procmail    procmail.spec
    openpkg-src/proftpd     proftpd.spec
    openpkg-src/pureftpd    pureftpd.spec
    openpkg-src/qpopper     qpopper.spec
    openpkg-src/rdist       rdist.spec
    openpkg-src/rt          rt.spec
    openpkg-src/samhain     samhain.spec
    openpkg-src/sasl        sasl.spec
    openpkg-src/scponly     scponly.spec
    openpkg-src/sendmail    sendmail.spec
    openpkg-src/smtpfeed    smtpfeed.spec
    openpkg-src/snmp        snmp.spec
    openpkg-src/ssmtp       ssmtp.spec
    openpkg-src/stunnel     stunnel.spec
    openpkg-src/sudo        sudo.spec
    openpkg-src/sysmon      sysmon.spec
    openpkg-src/teapop      teapop.spec
    openpkg-src/tex4ht      tex4ht.spec
    openpkg-src/tftp        tftp.spec
    openpkg-src/tinyca      tinyca.spec
    openpkg-src/vrrpd       vrrpd.spec
    openpkg-src/whoson      whoson.spec
    openpkg-src/xboard      xboard.spec
    openpkg-src/xv          xv.spec
    openpkg-web             news.txt

  Log:
    remove now officially deprecated usage of %{name} macro

  Summary:
    Revision    Changes     Path
    1.16        +4  -4      openpkg-src/aide/aide.spec
    1.12        +2  -2      openpkg-src/arpd/arpd.spec
    1.47        +2  -2      openpkg-src/as-gui/as-gui.spec
    1.11        +2  -2      openpkg-src/audiofile/audiofile.spec
    1.24        +2  -2      openpkg-src/bc/bc.spec
    1.56        +4  -4      openpkg-src/cvs/cvs.spec
    1.28        +5  -5      openpkg-src/cvsd/cvsd.spec
    1.21        +3  -3      openpkg-src/ethereal/ethereal.spec
    1.40        +2  -2      openpkg-src/fsl/fsl.spec
    1.19        +2  -2      openpkg-src/honeyd/honeyd.spec
    1.77        +2  -2      openpkg-src/imapd/imapd.spec
    1.67        +2  -2      openpkg-src/inn/inn.spec
    1.33        +3  -3      openpkg-src/ircd/ircd.spec
    1.11        +9  -9      openpkg-src/j2ee/j2ee.spec
    1.26        +17 -17     openpkg-src/j2se/j2se.spec
    1.22        +6  -5      openpkg-src/kerberos/kerberos.spec
    1.32        +5  -5      openpkg-src/kermit/kermit.spec
    1.26        +1  -1      openpkg-src/lynx/lynx.spec
    1.14        +2  -2      openpkg-src/lzo/lzo.spec
    1.10        +2  -2      openpkg-src/mhash/mhash.spec
    1.28        +2  -2      openpkg-src/mirror/mirror.spec
    1.11        +2  -2      openpkg-src/monit/monit.spec
    1.62        +23 -23     openpkg-src/mysql/mysql.spec
    1.9         +2  -2      openpkg-src/nagios/nagios.spec
    1.25        +2  -2      openpkg-src/netcat/netcat.spec
    1.29        +4  -4      openpkg-src/nntpcache/nntpcache.spec
    1.9         +3  -3      openpkg-src/nsd/nsd.spec
    1.37        +4  -4      openpkg-src/ntp/ntp.spec
    1.74        +4  -4      openpkg-src/openldap/openldap.spec
    1.166       +7  -7      openpkg-src/openpkg/openpkg.spec
    1.90        +2  -2      openpkg-src/openssh/openssh.spec
    1.39        +3  -3      openpkg-src/petidomo/petidomo.spec
    1.53        +1  -1      openpkg-src/php/php.spec
    1.31        +2  -2      openpkg-src/pinfo/pinfo.spec
    1.11        +30 -30     openpkg-src/pks/pks.spec
    1.18        +3  -3      openpkg-src/portfwd/portfwd.spec
    1.28        +5  -5      openpkg-src/portsentry/portsentry.spec
    1.144       +2  -2      openpkg-src/postfix/postfix.spec
    1.7         +2  -2      openpkg-src/pound/pound.spec
    1.18        +3  -3      openpkg-src/powerdns/powerdns.spec
    1.28        +5  -5      openpkg-src/prngd/prngd.spec
    1.27        +4  -4      openpkg-src/procmail/procmail.spec
    1.58        +1  -1      openpkg-src/proftpd/proftpd.spec
    1.44        +5  -5      openpkg-src/pureftpd/pureftpd.spec
    1.48        +3  -3      openpkg-src/qpopper/qpopper.spec
    1.4         +2  -2      openpkg-src/rdist/rdist.spec
    1.71        +3  -3      openpkg-src/rt/rt.spec
    1.44        +6  -6      openpkg-src/samhain/samhain.spec
    1.87        +2  -2      openpkg-src/sasl/sasl.spec
    1.25        +5  -5      openpkg-src/scponly/scponly.spec
    1.78        +2  -2      openpkg-src/sendmail/sendmail.spec
    1.45        +3  -3      openpkg-src/smtpfeed/smtpfeed.spec
    1.41        +4  -4      openpkg-src/snmp/snmp.spec
    1.35        +5  -5      openpkg-src/ssmtp/ssmtp.spec
    1.37        +4  -4      openpkg-src/stunnel/stunnel.spec
    1.43        +5  -5      openpkg-src/sudo/sudo.spec
    1.26        +4  -4      openpkg-src/sysmon/sysmon.spec
    1.25        +3  -3      openpkg-src/teapop/teapop.spec
    1.5         +6  -6      openpkg-src/tex4ht/tex4ht.spec
    1.17        +5  -5      openpkg-src/tftp/tftp.spec
    1.19        +7  -7      openpkg-src/tinyca/tinyca.spec
    1.12        +3  -3      openpkg-src/vrrpd/vrrpd.spec
    1.7         +3  -3      openpkg-src/whoson/whoson.spec
    1.14        +3  -3      openpkg-src/xboard/xboard.spec
    1.15        +3  -3      openpkg-src/xv/xv.spec
    1.5423      +46 -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/aide/aide.spec
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 aide.spec
  --- openpkg-src/aide/aide.spec        7 Jul 2003 08:10:28 -0000       1.15
  +++ openpkg-src/aide/aide.spec        7 Jul 2003 13:52:22 -0000       1.16
  @@ -86,7 +86,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/aide \
           $RPM_BUILD_ROOT%{l_prefix}/etc/aide
       %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
  @@ -99,20 +99,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.aide} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.aide} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.aide'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/arpd/arpd.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 arpd.spec
  --- openpkg-src/arpd/arpd.spec        7 Jul 2003 10:46:29 -0000       1.11
  +++ openpkg-src/arpd/arpd.spec        7 Jul 2003 13:52:23 -0000       1.12
  @@ -118,14 +118,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.arpd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
           '%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/arpd' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.arpd'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/as-gui/as-gui.spec
  ============================================================================
  $ cvs diff -u -r1.46 -r1.47 as-gui.spec
  --- openpkg-src/as-gui/as-gui.spec    7 Jul 2003 10:30:29 -0000       1.46
  +++ openpkg-src/as-gui/as-gui.spec    7 Jul 2003 13:52:23 -0000       1.47
  @@ -65,12 +65,12 @@
       accounting system. AS GUI is the graphical user interface client.
   
   %prep
  -    %setup -q -n %{name}-%{version}
  +    %setup -q -n as-gui-%{version}
   
   %build
       ./configure \
           --prefix=%{l_prefix} \
  -        --datadir=%{l_prefix}/share/%{name} \
  +        --datadir=%{l_prefix}/share/as-gui \
           --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
           --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
   %if "%{with_mico}" == "yes"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/audiofile/audiofile.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 audiofile.spec
  --- openpkg-src/audiofile/audiofile.spec      23 Apr 2003 08:21:45 -0000      1.10
  +++ openpkg-src/audiofile/audiofile.spec      7 Jul 2003 13:52:24 -0000       1.11
  @@ -33,10 +33,10 @@
   Group:        Audio
   License:      LGPL
   Version:      0.2.3
  -Release:      20030423
  +Release:      20030707
   
   #   list of sources
  -Source0:      
ftp://oss.sgi.com/projects/audiofile/download/%{name}-%{version}.tar.gz
  +Source0:      
ftp://oss.sgi.com/projects/audiofile/download/audiofile-%{version}.tar.gz
   
   #   build information
   Prefix:       %{l_prefix}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/bc/bc.spec
  ============================================================================
  $ cvs diff -u -r1.23 -r1.24 bc.spec
  --- openpkg-src/bc/bc.spec    3 Jan 2003 10:51:13 -0000       1.23
  +++ openpkg-src/bc/bc.spec    7 Jul 2003 13:52:24 -0000       1.24
  @@ -33,10 +33,10 @@
   Group:        Algorithm
   License:      GPL
   Version:      1.06
  -Release:      20020814
  +Release:      20030707
   
   #   list of sources
  -Source0:      ftp://ftp.gnu.org/gnu/bc/%{name}-%{version}.tar.gz
  +Source0:      ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz
   
   #   build information
   Prefix:       %{l_prefix}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cvs/cvs.spec
  ============================================================================
  $ cvs diff -u -r1.55 -r1.56 cvs.spec
  --- openpkg-src/cvs/cvs.spec  30 Jun 2003 08:40:35 -0000      1.55
  +++ openpkg-src/cvs/cvs.spec  7 Jul 2003 13:52:25 -0000       1.56
  @@ -37,7 +37,7 @@
   Group:        SCM
   License:      GPL
   Version:      %{V_cvs}
  -Release:      20030630
  +Release:      20030707
   
   #   optional support for applying the RSE patches
   %option       with_fsl                      yes
  @@ -155,20 +155,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.cvs} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.cvs} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.cvs' \
           '%attr(1777,-,-) %{l_prefix}/var/cvs/tmp'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cvsd/cvsd.spec
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 cvsd.spec
  --- openpkg-src/cvsd/cvsd.spec        3 Jul 2003 11:11:44 -0000       1.27
  +++ openpkg-src/cvsd/cvsd.spec        7 Jul 2003 13:52:25 -0000       1.28
  @@ -33,7 +33,7 @@
   Group:        SCM
   License:      GPL
   Version:      0.9.19
  -Release:      20030703
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -94,7 +94,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/cvsd \
           $RPM_BUILD_ROOT%{l_prefix}/etc/cvsd \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
   
  @@ -118,20 +118,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.cvsd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.cvsd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.cvsd'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ethereal/ethereal.spec
  ============================================================================
  $ cvs diff -u -r1.20 -r1.21 ethereal.spec
  --- openpkg-src/ethereal/ethereal.spec        12 Jun 2003 06:47:36 -0000      1.20
  +++ openpkg-src/ethereal/ethereal.spec        7 Jul 2003 13:52:26 -0000       1.21
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      0.9.13
  -Release:      20030612
  +Release:      20030707
   
   #   package options
   %option       with_zlib    no
  @@ -83,8 +83,8 @@
       LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
  -        --sysconfdir=%{l_prefix}/etc/%{name} \
  -        --with-plugins=%{l_prefix}/libexec/%{name} \
  +        --sysconfdir=%{l_prefix}/etc/ethereal \
  +        --with-plugins=%{l_prefix}/libexec/ethereal \
           --with-glib-prefix=%{l_prefix} \
           --with-gtk-prefix=%{l_prefix} \
           --with-pcap=%{l_prefix} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/fsl/fsl.spec
  ============================================================================
  $ cvs diff -u -r1.39 -r1.40 fsl.spec
  --- openpkg-src/fsl/fsl.spec  1 Jul 2003 15:11:47 -0000       1.39
  +++ openpkg-src/fsl/fsl.spec  7 Jul 2003 13:52:26 -0000       1.40
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT-style
   Version:      1.2.0
  -Release:      20030701
  +Release:      20030707
   
   #   package options
   %option       with_fsl_debuglogcode   no
  @@ -100,7 +100,7 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.fsl} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/honeyd/honeyd.spec
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 honeyd.spec
  --- openpkg-src/honeyd/honeyd.spec    7 Jul 2003 10:55:12 -0000       1.18
  +++ openpkg-src/honeyd/honeyd.spec    7 Jul 2003 13:52:27 -0000       1.19
  @@ -134,13 +134,13 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.honeyd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.honeyd'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/imapd/imapd.spec
  ============================================================================
  $ cvs diff -u -r1.76 -r1.77 imapd.spec
  --- openpkg-src/imapd/imapd.spec      7 Jul 2003 10:23:38 -0000       1.76
  +++ openpkg-src/imapd/imapd.spec      7 Jul 2003 13:52:27 -0000       1.77
  @@ -228,7 +228,7 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.imapd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   strip binaries
  @@ -238,7 +238,7 @@
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.imapd' \
           '%config %{l_prefix}/etc/imapd/imapd.conf' \
           '%config %{l_prefix}/etc/imapd/cyrus.conf' \
           '%dir %attr(0750,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/imapd' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/inn/inn.spec
  ============================================================================
  $ cvs diff -u -r1.66 -r1.67 inn.spec
  --- openpkg-src/inn/inn.spec  7 Jul 2003 10:25:43 -0000       1.66
  +++ openpkg-src/inn/inn.spec  7 Jul 2003 13:52:28 -0000       1.67
  @@ -189,7 +189,7 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.inn} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   strip binaries
  @@ -204,7 +204,7 @@
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.inn' \
           '%config %{l_prefix}/etc/inn/*' \
           '%attr(4550,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/rnews' \
           '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/inn/inndstart' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ircd/ircd.spec
  ============================================================================
  $ cvs diff -u -r1.32 -r1.33 ircd.spec
  --- openpkg-src/ircd/ircd.spec        7 Jul 2003 10:27:34 -0000       1.32
  +++ openpkg-src/ircd/ircd.spec        7 Jul 2003 13:52:22 -0000       1.33
  @@ -135,20 +135,20 @@
       %{l_shtool} install -c -m 755 \
           -e 's;@l_prefix@;%{l_prefix};g' \
           -e 's;@l_susr@;%{l_susr};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.ircd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.ircd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.ircd' \
           '%config %{l_prefix}/etc/ircd/*'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/j2ee/j2ee.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 j2ee.spec
  --- openpkg-src/j2ee/j2ee.spec        17 Jan 2003 15:34:55 -0000      1.10
  +++ openpkg-src/j2ee/j2ee.spec        7 Jul 2003 13:52:28 -0000       1.11
  @@ -38,12 +38,12 @@
   Group:        Language
   License:      Commercial
   Version:      %{V_openpkg}
  -Release:      20030117
  +Release:      20030707
   
   #   list of sources
   Source0:      http://java.sun.com/j2se/::/j2sdkee-%{V_sunjava}-solsparc.sh
   Source1:      http://java.sun.com/j2se/::/j2sdkee-%{V_sunjava}-linux.tar.gz
  -Source2:      rc.%{name}
  +Source2:      rc.j2ee
   %NoSource     0
   %NoSource     1
   
  @@ -92,20 +92,20 @@
             ix86-freebsd[45]* )
                 %{l_gzip} -d -c %{SOURCE j2sdkee-%{V_sunjava}-linux.tar.gz} |\
                     %{l_tar} xf -
  -              mv j2sdkee%{V_filesys} %{name}
  -              find %{name}/bin -type f -print | xargs chmod u+w
  +              mv j2sdkee%{V_filesys} j2ee
  +              find j2ee/bin -type f -print | xargs chmod u+w
                 brandelf -t Linux \
  -                  `find %{name}/bin/ -type f -print` \
  +                  `find j2ee/bin/ -type f -print` \
                     >/dev/null 2>&1 || true
                 ;;
             ix86-linux2.[2-5]* )
                 %{l_gzip} -d -c %{SOURCE j2sdkee-%{V_sunjava}-linux.tar.gz} |\
                     %{l_tar} xf -
  -              mv j2sdkee%{V_filesys} %{name}
  +              mv j2sdkee%{V_filesys} j2ee
                 ;;
             sparc64-solaris2.[6-9]* )
                 echo "yes" | sh %{SOURCE j2sdkee-%{V_sunjava}-solsparc.sh} >/dev/null
  -              mv j2sdkee%{V_filesys} %{name}
  +              mv j2sdkee%{V_filesys} j2ee
                 ;;
             * )
                 echo "Sorry, unsupported architecture '%{l_target}'" 1>&2
  @@ -119,13 +119,13 @@
         for bin in cleanup j2ee packager \
             cloudscape j2eeadmin realmtool \
             deploytool runclient verifier; do
  -          ln -s ../libexec/%{name}/bin/$bin .
  +          ln -s ../libexec/j2ee/bin/$bin .
         done
       )
   
       #   install run-command script
       %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.j2ee} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/j2se/j2se.spec
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 j2se.spec
  --- openpkg-src/j2se/j2se.spec        6 Jul 2003 10:52:15 -0000       1.25
  +++ openpkg-src/j2se/j2se.spec        7 Jul 2003 13:52:29 -0000       1.26
  @@ -42,7 +42,7 @@
   Group:        Language
   License:      Commercial
   Version:      %{V_openpkg}
  -Release:      20030706
  +Release:      20030707
   
   #   package options
   %option       with_native  yes
  @@ -51,8 +51,8 @@
   Source0:      http://java.sun.com/j2se/::/j2sdk-%{V_sol_dist}-solaris-sparc.sh
   Source1:      http://java.sun.com/j2se/::/j2sdk-%{V_lnx_dist}-linux-i586.bin
   Source2:      http://java.sun.com/j2se/::/jdk-%{V_bsd_dist}.tgz
  -Source3:      rc.%{name}
  -Source4:      %{name}.patch
  +Source3:      rc.j2se
  +Source4:      j2se.patch
   %NoSource     0
   %NoSource     1
   %NoSource     2
  @@ -78,7 +78,7 @@
   
   %prep
       %integrity
  -    %setup -q -c %{name} -T
  +    %setup -q -c j2se -T
   
   %build
       #   no-op
  @@ -100,25 +100,25 @@
             ix86-freebsd[45]* )
   %if "%{with_native}" == "yes"
                 %{l_gzip} -d -c %{SOURCE jdk-%{V_bsd_dist}.tgz} | %{l_tar} xf -
  -              mv jdk%{V_bsd_fsys} %{name}
  -              rm -f %{name}/+[A-Z]*
  +              mv jdk%{V_bsd_fsys} j2se
  +              rm -f j2se/+[A-Z]*
   %else
                 echo "yes" | sh %{SOURCE j2sdk-%{V_lnx_dist}-linux-i586.bin} 
>/dev/null
  -              mv jdk%{V_lnx_fsys} %{name}
  -              find %{name}/bin -type f -print | xargs chmod u+w
  -              ( cd %{name}; %{l_patch} -p0 <%{SOURCE %{name}.patch} )
  +              mv jdk%{V_lnx_fsys} j2se
  +              find j2se/bin -type f -print | xargs chmod u+w
  +              ( cd j2se; %{l_patch} -p0 <%{SOURCE j2se.patch} )
                 brandelf -t Linux \
  -                  `find %{name}/bin/ -type f -print` \
  +                  `find j2se/bin/ -type f -print` \
                     >/dev/null 2>&1 || true
   %endif
                 ;;
             ix86-linux2.[2-6]* )
                 echo "yes" | sh $RPM_SOURCE_DIR/j2sdk-%{V_lnx_dist}-linux-i586.bin 
>/dev/null
  -              mv jdk%{V_lnx_fsys} %{name}
  +              mv jdk%{V_lnx_fsys} j2se
                 ;;
             sparc64-solaris2.[6-9]* )
                 echo "yes" | sh $RPM_SOURCE_DIR/j2sdk-%{V_sol_dist}-solaris-sparc.sh 
>/dev/null
  -              mv j2sdk%{V_sol_fsys} %{name}
  +              mv j2sdk%{V_sol_fsys} j2se
                 ;;
             * )
                 echo "Sorry, unsupported architecture '%{l_target}'" |\
  @@ -129,10 +129,10 @@
       )
   
       #   post-adjustments to installation area
  -    rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/demo 2>/dev/null || true
  -    cp $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/man/man1/* \
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/demo 2>/dev/null || true
  +    cp $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/* \
          $RPM_BUILD_ROOT%{l_prefix}/man/man1/
  -    rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/man 2>/dev/null || true
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man 2>/dev/null || true
   
       #   activate binaries
       ( cd $RPM_BUILD_ROOT%{l_prefix}/bin
  @@ -140,13 +140,13 @@
             javac javadoc javah javap jdb keytool native2ascii \
             oldjava oldjavac oldjdb policytool rmic rmid rmiregistry \
             serialver tnameserv; do
  -          ln -s ../libexec/%{name}/bin/$bin .
  +          ln -s ../libexec/j2se/bin/$bin .
         done
       )
   
       #   install run-command script
       %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.j2se} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/kerberos/kerberos.spec
  ============================================================================
  $ cvs diff -u -r1.21 -r1.22 kerberos.spec
  --- openpkg-src/kerberos/kerberos.spec        3 Jul 2003 12:23:00 -0000       1.21
  +++ openpkg-src/kerberos/kerberos.spec        7 Jul 2003 13:52:29 -0000       1.22
  @@ -33,7 +33,7 @@
   Group:        Cryptography
   License:      MIT
   Version:      1.2.8
  -Release:      20030703
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -76,6 +76,7 @@
       LIBS="%{l_fsl_libs}" \
       ./configure \
           --prefix=%{l_prefix} \
  +        --libexecdir=%{l_prefix}/libexec/kerberos \
           --without-krb4 \
           --disable-shared
       %{l_make} %{l_mflags}
  @@ -83,7 +84,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/var/kerberos
       ( cd src
         %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
       ) || exit 1
  @@ -150,20 +151,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.kerberos} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.kerberos} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.kerberos'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/kermit/kermit.spec
  ============================================================================
  $ cvs diff -u -r1.31 -r1.32 kermit.spec
  --- openpkg-src/kermit/kermit.spec    1 Jul 2003 14:40:32 -0000       1.31
  +++ openpkg-src/kermit/kermit.spec    7 Jul 2003 13:52:30 -0000       1.32
  @@ -37,7 +37,7 @@
   Group:        Communication
   License:      GPL
   Version:      %{V_major}.%{V_minor}
  -Release:      20030701
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -97,7 +97,7 @@
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
           $RPM_BUILD_ROOT%{l_prefix}/share/kermit \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/var/kermit
       %{l_make} %{l_mflags} -f makefile \
           BINDIR=$RPM_BUILD_ROOT%{l_prefix}/bin \
           MANDIR=$RPM_BUILD_ROOT%{l_prefix}/man/man1 MANEXT=1 \
  @@ -114,20 +114,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.kermit} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.kermit} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.kermit'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lynx/lynx.spec
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 lynx.spec
  --- openpkg-src/lynx/lynx.spec        7 Jul 2003 10:34:57 -0000       1.25
  +++ openpkg-src/lynx/lynx.spec        7 Jul 2003 13:52:30 -0000       1.26
  @@ -61,7 +61,7 @@
       Lynx is a text browser for the World Wide Web.
   
   %prep
  -    %setup -q -n %{name}%{V_file}
  +    %setup -q -n lynx%{V_file}
       %patch0 -p1
       %patch1 -p1
       %patch2 -p1
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lzo/lzo.spec
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 lzo.spec
  --- openpkg-src/lzo/lzo.spec  17 Jan 2003 13:18:48 -0000      1.13
  +++ openpkg-src/lzo/lzo.spec  7 Jul 2003 13:52:31 -0000       1.14
  @@ -33,7 +33,7 @@
   Group:        Converter
   License:      GPL
   Version:      1.08
  -Release:      20030117
  +Release:      20030707
   
   #   list of sources
   Source0:      http://www.oberhumer.com/opensource/lzo/download/lzo-%{version}.tar.gz
  @@ -58,7 +58,7 @@
       CFLAGS="%{l_cflags -O}" \
       ./configure \
           --prefix=%{l_prefix} \
  -        --includedir=%{l_prefix}/include/%{name} \
  +        --includedir=%{l_prefix}/include/lzo \
           --disable-shared
       %{l_make} %{l_mflags -O}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mhash/mhash.spec
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 mhash.spec
  --- openpkg-src/mhash/mhash.spec      6 Mar 2003 18:47:37 -0000       1.9
  +++ openpkg-src/mhash/mhash.spec      7 Jul 2003 13:52:31 -0000       1.10
  @@ -33,10 +33,10 @@
   Group:        Cryptography
   License:      LGPL
   Version:      0.8.18
  -Release:      20030306
  +Release:      20030707
   
   #   list of sources
  -Source0:      
http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
  +Source0:      http://dl.sourceforge.net/sourceforge/mhash/mhash-%{version}.tar.gz
   
   #   build information
   Prefix:       %{l_prefix}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mirror/mirror.spec
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 mirror.spec
  --- openpkg-src/mirror/mirror.spec    24 Mar 2003 19:26:08 -0000      1.27
  +++ openpkg-src/mirror/mirror.spec    7 Jul 2003 13:52:32 -0000       1.28
  @@ -33,7 +33,7 @@
   Group:        FTP
   License:      BSD
   Version:      2.9
  -Release:      20030324
  +Release:      20030707
   
   #   list of sources
   Source0:      ftp://sunsite.org.uk/packages/mirror/mirror-%{version}.tar.gz
  @@ -56,7 +56,7 @@
       Mirror is a batch client for mirroring FTP areas.
   
   %prep
  -    %setup -q -c /%{name}-%{version}
  +    %setup -q -c /mirror-%{version}
       %patch -p0
   
   %build
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/monit/monit.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 monit.spec
  --- openpkg-src/monit/monit.spec      7 Jul 2003 10:40:52 -0000       1.10
  +++ openpkg-src/monit/monit.spec      7 Jul 2003 13:52:32 -0000       1.11
  @@ -119,13 +119,13 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.monit} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.monit' \
           '%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit/*' \
           '%dir    %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit' \
           '%dir    %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/monit'
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql/mysql.spec
  ============================================================================
  $ cvs diff -u -r1.61 -r1.62 mysql.spec
  --- openpkg-src/mysql/mysql.spec      6 Jul 2003 10:22:10 -0000       1.61
  +++ openpkg-src/mysql/mysql.spec      7 Jul 2003 13:52:33 -0000       1.62
  @@ -39,7 +39,7 @@
   Group:        Database
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20030706
  +Release:      20030707
   
   #   package options
   %option       with_berkeleydb  yes
  @@ -49,8 +49,8 @@
   Source0:      
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
   Source1:      my.cnf
   Source2:      my.pwd
  -Source3:      rc.%{name}
  -Patch0:       %{name}.patch
  +Source3:      rc.mysql
  +Patch0:       mysql.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -92,10 +92,10 @@
       CXXFLAGS="%{l_cxxflags -O}" \
       ./configure \
           --prefix=%{l_prefix} \
  -        --sysconfdir=%{l_prefix}/etc/%{name} \
  -        --localstatedir=%{l_prefix}/var/%{name} \
  -        --libexecdir=%{l_prefix}/libexec/%{name} \
  -        --with-unix-socket-path=%{l_prefix}/var/%{name}/mysql.sock \
  +        --sysconfdir=%{l_prefix}/etc/mysql \
  +        --localstatedir=%{l_prefix}/var/mysql \
  +        --libexecdir=%{l_prefix}/libexec/mysql \
  +        --with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
           --with-mysqld-user=%{l_musr} \
           --enable-thread-safe-client \
   %if "%{with_berkeleydb}" == "yes"
  @@ -126,16 +126,16 @@
   
       #   move utility 'replace', msql2mysql is patched for new path
       mv $RPM_BUILD_ROOT%{l_prefix}/bin/replace \
  -       $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/
  +       $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/
   
       #   strip installation area
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/mysql-test
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/sql-bench
       rm -f  $RPM_BUILD_ROOT%{l_prefix}/info/dir
  -    rm -f  $RPM_BUILD_ROOT%{l_prefix}/share/%{name}/mysql-%{V_mysql}.spec
  -    rm -f  $RPM_BUILD_ROOT%{l_prefix}/share/%{name}/binary-configure
  +    rm -f  $RPM_BUILD_ROOT%{l_prefix}/share/mysql/mysql-%{V_mysql}.spec
  +    rm -f  $RPM_BUILD_ROOT%{l_prefix}/share/mysql/binary-configure
       strip  $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
  -    strip  $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/* 2>/dev/null || true
  +    strip  $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/* 2>/dev/null || true
   
       #   determine default parameters
   %if "%{with_berkeleydb}" == "yes"
  @@ -154,7 +154,7 @@
   %endif
   
       #   install global configuration
  -    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}
  +    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
  @@ -162,10 +162,10 @@
           -e "s;@l_mysql_bdb_log_buffer_size@;${l_mysql_bdb_log_buffer_size};g" \
           -e "s;@l_mysql_bdb_max_lock@;${l_mysql_bdb_max_lock};g" \
           %{SOURCE my.cnf} \
  -        $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
       %{l_shtool} install -c -m 600 \
           %{SOURCE my.pwd} \
  -        $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
   
       #   install run-command script
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
  @@ -174,16 +174,16 @@
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
           -e "s;@l_mysqld@;${l_mysqld};g" \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.mysql} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   make sure the database directory exists
  -    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
  +    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/mysql
   
       #   determine the package files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
  -        '%config %{l_prefix}/etc/%{name}/my.cnf' \
  -        '%config %{l_prefix}/etc/%{name}/my.pwd'
  +        '%config %{l_prefix}/etc/mysql/my.cnf' \
  +        '%config %{l_prefix}/etc/mysql/my.pwd'
   
   %files -f files
   
  @@ -193,14 +193,14 @@
   %post
       #   create initial database
       $RPM_INSTALL_PREFIX/bin/mysql_install_db \
  -        --defaults-file=$RPM_INSTALL_PREFIX/etc/%{name}/my.cnf
  +        --defaults-file=$RPM_INSTALL_PREFIX/etc/mysql/my.cnf
       chown %{l_rusr}:%{l_rgrp} \
  -        $RPM_INSTALL_PREFIX/etc/%{name}/my.cnf \
  -        $RPM_INSTALL_PREFIX/etc/%{name}/my.pwd
  -    chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/%{name}/
  +        $RPM_INSTALL_PREFIX/etc/mysql/my.cnf \
  +        $RPM_INSTALL_PREFIX/etc/mysql/my.pwd
  +    chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/mysql/
       ( echo "The MySQL package includes automated maintenance procedures"
         echo "that require administrator access to the database. For this"
         echo "to work you must keep a copy (plain text) of the administrator"
  -      echo "account in '$RPM_INSTALL_PREFIX/etc/%{name}/my.pwd'."
  +      echo "account in '$RPM_INSTALL_PREFIX/etc/mysql/my.pwd'."
       ) | %{l_rpmtool} msg -b -t notice
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/nagios/nagios.spec
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 nagios.spec
  --- openpkg-src/nagios/nagios.spec    7 Jul 2003 10:42:51 -0000       1.8
  +++ openpkg-src/nagios/nagios.spec    7 Jul 2003 13:52:33 -0000       1.9
  @@ -183,14 +183,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.nagios} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.nagios'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/netcat/netcat.spec
  ============================================================================
  $ cvs diff -u -r1.24 -r1.25 netcat.spec
  --- openpkg-src/netcat/netcat.spec    3 Jan 2003 10:53:33 -0000       1.24
  +++ openpkg-src/netcat/netcat.spec    7 Jul 2003 13:52:34 -0000       1.25
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      no restrictions
   Version:      1.10
  -Release:      20020823
  +Release:      20030707
   
   #   list of sources
   Source0:      http://www.atstake.com/research/tools/nc110.tgz
  @@ -57,7 +57,7 @@
       capabilities.
   
   %prep
  -    %setup -q -c /%{name}-%{version}
  +    %setup -q -c /netcat-%{version}
       %{l_shtool} subst -e 's;#define HAVE_BIND;#undef HAVE_BIND;g' netcat.c
   
   %build
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/nntpcache/nntpcache.spec
  ============================================================================
  $ cvs diff -u -r1.28 -r1.29 nntpcache.spec
  --- openpkg-src/nntpcache/nntpcache.spec      4 Jul 2003 18:36:16 -0000       1.28
  +++ openpkg-src/nntpcache/nntpcache.spec      7 Jul 2003 13:52:34 -0000       1.29
  @@ -33,7 +33,7 @@
   Group:        News
   License:      BSD
   Version:      3.0.1
  -Release:      20030704
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -133,21 +133,21 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.nntpcache} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   install OSSP fsl configuration
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.nntpcache} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.nntpcache'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/nsd/nsd.spec
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 nsd.spec
  --- openpkg-src/nsd/nsd.spec  28 Jun 2003 21:11:43 -0000      1.8
  +++ openpkg-src/nsd/nsd.spec  7 Jul 2003 13:52:35 -0000       1.9
  @@ -37,7 +37,7 @@
   Group:        DNS
   License:      GPL
   Version:      1.1.0
  -Release:      20030628
  +Release:      20030707
   
   #   package option
   %option       with_fsl  yes
  @@ -145,7 +145,7 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.nsd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   strip installation
  @@ -155,7 +155,7 @@
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.nsd' \
           '%config %{l_prefix}/etc/nsd/*' \
           '%not %dir %{l_prefix}/etc/rc.d' \
           '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/nsd'
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ntp/ntp.spec
  ============================================================================
  $ cvs diff -u -r1.36 -r1.37 ntp.spec
  --- openpkg-src/ntp/ntp.spec  4 Jul 2003 08:45:10 -0000       1.36
  +++ openpkg-src/ntp/ntp.spec  7 Jul 2003 13:52:35 -0000       1.37
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      BSD-style
   Version:      4.1.1c
  -Release:      20030704
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -113,20 +113,20 @@
           -e 's;@l_mgrp@;%{l_mgrp};g' \
           -e 's;@l_musr@;%{l_musr};g' \
           -e 's;@l_susr@;%{l_susr};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.ntp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.ntp} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.ntp' \
           '%config %{l_prefix}/etc/ntp/ntp.conf'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  ============================================================================
  $ cvs diff -u -r1.73 -r1.74 openldap.spec
  --- openpkg-src/openldap/openldap.spec        7 Jul 2003 12:42:20 -0000       1.73
  +++ openpkg-src/openldap/openldap.spec        7 Jul 2003 13:52:36 -0000       1.74
  @@ -113,7 +113,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/var/openldap
       %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
       rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
       rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
  @@ -126,20 +126,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.openldap} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.openldap} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.openldap' \
           '%config %{l_prefix}/etc/openldap/*.conf'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================================
  $ cvs diff -u -r1.165 -r1.166 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  6 Jun 2003 12:13:26 -0000       1.165
  +++ openpkg-src/openpkg/openpkg.spec  7 Jul 2003 13:52:36 -0000       1.166
  @@ -39,7 +39,7 @@
   #   o any cc(1)
   
   #   the package version/release
  -%define       V_openpkg 20030606
  +%define       V_openpkg 20030707
   
   #   the used software versions
   %define       V_rpm     4.0.2
  @@ -146,9 +146,9 @@
       [ ".$OPENPKG_BOOT" = .1 ] && exit 0
   
       #   switch into a temporary build area
  -    rm -rf %{name}-%{version}
  -    mkdir %{name}-%{version}
  -    cd %{name}-%{version}
  +    rm -rf openpkg-%{version}
  +    mkdir openpkg-%{version}
  +    cd openpkg-%{version}
       rm -f .buildenv
       touch .buildenv
   
  @@ -373,7 +373,7 @@
       [ ".$OPENPKG_BOOT" = .1 ] && exit 0
   
       #   switch into a temporary build area
  -    cd %{name}-%{version}
  +    cd openpkg-%{version}
       . ./.buildenv
   
       #   build GNU bash tool
  @@ -514,7 +514,7 @@
       [ ".$OPENPKG_BOOT" = .1 ] && exit 0
   
       #   switch into a temporary build area
  -    cd %{name}-%{version}
  +    cd openpkg-%{version}
       . ./.buildenv
   
       #   create installation hierarchy
  @@ -873,7 +873,7 @@
   
       #   cleanup after building
       rm -rf $RPM_BUILD_ROOT
  -    rm -rf %{name}-%{version}
  +    rm -rf openpkg-%{version}
   
   %pre
       #   always performed for upgrades and because it doesn't harm!
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openssh/openssh.spec
  ============================================================================
  $ cvs diff -u -r1.89 -r1.90 openssh.spec
  --- openpkg-src/openssh/openssh.spec  7 Jul 2003 12:48:07 -0000       1.89
  +++ openpkg-src/openssh/openssh.spec  7 Jul 2003 13:52:37 -0000       1.90
  @@ -219,14 +219,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.openssh} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.openssh' \
           '%config %{l_prefix}/etc/openssh/*' \
           '%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/openssh/ssh-keysign' \
           '%dir %attr(700,%{l_susr},%{l_sgrp}) %{l_prefix}/var/openssh/empty'
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/petidomo/petidomo.spec
  ============================================================================
  $ cvs diff -u -r1.38 -r1.39 petidomo.spec
  --- openpkg-src/petidomo/petidomo.spec        28 Jun 2003 15:13:25 -0000      1.38
  +++ openpkg-src/petidomo/petidomo.spec        7 Jul 2003 13:52:37 -0000       1.39
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      4.0b1
  -Release:      20030628
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -115,13 +115,13 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.petidomo} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.petidomo' \
           '%config %{l_prefix}/etc/petidomo/*' \
           '%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/petidomo/*' \
           '%attr(6755,%{l_musr},%{l_mgrp}) %{l_prefix}/bin/petidomo'
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/php/php.spec
  ============================================================================
  $ cvs diff -u -r1.52 -r1.53 php.spec
  --- openpkg-src/php/php.spec  7 Jul 2003 11:31:15 -0000       1.52
  +++ openpkg-src/php/php.spec  7 Jul 2003 13:52:38 -0000       1.53
  @@ -353,7 +353,7 @@
       %{l_shtool} install -c -m 644 \
           regex/*.h $RPM_BUILD_ROOT%{l_prefix}/include/php/regex/
   %if "%{with_pear}" == "yes"
  -    ( cd $RPM_BUILD_DIR/%{name}-%{version}/pear
  +    ( cd $RPM_BUILD_DIR/php-%{version}/pear
         export INSTALL_ROOT=$RPM_BUILD_ROOT
         $RPM_BUILD_ROOT%{l_prefix}/bin/php -n -dsafe_mode=0 \
           install-pear.php package-*.xml
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pinfo/pinfo.spec
  ============================================================================
  $ cvs diff -u -r1.30 -r1.31 pinfo.spec
  --- openpkg-src/pinfo/pinfo.spec      13 Feb 2003 10:01:15 -0000      1.30
  +++ openpkg-src/pinfo/pinfo.spec      7 Jul 2003 13:52:38 -0000       1.31
  @@ -33,7 +33,7 @@
   Group:        Text
   License:      GPL
   Version:      0.6.7
  -Release:      20030213
  +Release:      20030707
   
   #   list of sources
   Source0:      
http://zeus.polsl.gliwice.pl/~pborys/stable-version/pinfo-%{version}.tar.gz
  @@ -60,7 +60,7 @@
       CFLAGS="%{l_cflags -O}" \
       ./configure \
           --prefix=%{l_prefix} \
  -        --sysconfdir=%{l_prefix}/etc/%{name} \
  +        --sysconfdir=%{l_prefix}/etc/pinfo \
           --disable-nls
       %{l_make} %{l_mflags -O}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pks/pks.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 pks.spec
  --- openpkg-src/pks/pks.spec  4 Jul 2003 09:40:49 -0000       1.10
  +++ openpkg-src/pks/pks.spec  7 Jul 2003 13:52:39 -0000       1.11
  @@ -33,7 +33,7 @@
   Group:        Cryptography
   License:      GPL
   Version:      0.9.6
  -Release:      20030704
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -76,9 +76,9 @@
       ./configure \
           --cache-file=./config.cache \
           --prefix=%{l_prefix} \
  -        --sysconfdir=%{l_prefix}/etc/%{name} \
  -        --localstatedir=%{l_prefix}/var/%{name} \
  -        --datadir=%{l_prefix}/share/%{name}
  +        --sysconfdir=%{l_prefix}/etc/pks \
  +        --localstatedir=%{l_prefix}/var/pks \
  +        --datadir=%{l_prefix}/share/pks
       %{l_make} %{l_mflags} \
           LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}"
   
  @@ -96,24 +96,24 @@
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/db2
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/db2
       rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/db_*
  -    rm -f $RPM_BUILD_ROOT%{l_prefix}/var/%{name}/index.html
  +    rm -f $RPM_BUILD_ROOT%{l_prefix}/var/pks/index.html
       mv  $RPM_BUILD_ROOT%{l_prefix}/bin/pks-queue-run.sh \
           $RPM_BUILD_ROOT%{l_prefix}/bin/pks-queue-run
  -    mv  $RPM_BUILD_ROOT%{l_prefix}/var/%{name}/incoming \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}/queue
  +    mv  $RPM_BUILD_ROOT%{l_prefix}/var/pks/incoming \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/pks/queue
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
   
       #   install HTML top-level page
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/pub/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/pub/pks
       %{l_shtool} install -c -m 644 \
  -        %{SOURCE pks.html} $RPM_BUILD_ROOT%{l_prefix}/pub/%{name}/index.html
  +        %{SOURCE pks.html} $RPM_BUILD_ROOT%{l_prefix}/pub/pks/index.html
   
       #   install suid wrapper for pks-mail
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/pks
       mv  $RPM_BUILD_ROOT%{l_prefix}/bin/pks-mail.sh \
  -        $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/pks-mail
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/pks/pks-mail
       %{l_shtool} install -c -s -m 755 \
           pks-mail $RPM_BUILD_ROOT%{l_prefix}/bin/
   
  @@ -129,28 +129,28 @@
       #   override default configuration
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE pksd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
  +        %{SOURCE pksd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/pks/
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE pks-apache.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
  +        %{SOURCE pks-apache.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/pks/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.pks} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  -        '%config %{l_prefix}/etc/%{name}/pksd.conf' \
  +        '%config %{l_prefix}/etc/fsl/fsl.pks' \
  +        '%config %{l_prefix}/etc/pks/pksd.conf' \
           '%attr(4755,%{l_rusr},%{l_mgrp}) %{l_prefix}/bin/pks-mail' \
  -        '%dir %attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/%{name}' \
  -        '%dir %attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/%{name}/db' \
  -        '%dir %attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/%{name}/queue'
  +        '%dir %attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/pks' \
  +        '%dir %attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/pks/db' \
  +        '%dir %attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/pks/queue'
   
   %files -f files
   
  @@ -161,21 +161,21 @@
       if [ $1 -eq 1 ]; then
           #   create initial database
           su - %{l_rusr} -c "%{l_prefix}/bin/pksclient \
  -            %{l_prefix}/var/%{name}/db create" >/dev/null 2>&1
  +            %{l_prefix}/var/pks/db create" >/dev/null 2>&1
           su - %{l_rusr} -c "%{l_prefix}/bin/pksclient \
  -            %{l_prefix}/var/%{name}/db add %{l_prefix}/etc/openpkg/openpkg.pgp" 
>/dev/null 2>&1
  +            %{l_prefix}/var/pks/db add %{l_prefix}/etc/openpkg/openpkg.pgp" 
>/dev/null 2>&1
   
           #   activate in MTA configuration
           mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
           mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
           if [ ".$mta_aliases_file" != . ]; then
               ( echo "pks:             pks-request"
  -              echo "pks-request:     \"|%{l_prefix}/bin/pks-mail 
%{l_prefix}/etc/%{name}/pksd.conf\""
  +              echo "pks-request:     \"|%{l_prefix}/bin/pks-mail 
%{l_prefix}/etc/pks/pksd.conf\""
                 echo "pks-daemon:      MAILER-DAEMON"
                 echo "pks-admin:       postmaster"
                 echo "pgp-public-keys: pks-request"
                 echo "pgp:             pks-request"
  -            ) | %{l_rpmtool} config -a -i "%{l_prefix}:%{name}" $mta_aliases_file
  +            ) | %{l_rpmtool} config -a -i "%{l_prefix}:pks" $mta_aliases_file
           fi
           if [ ".$mta_aliases_update" != . ]; then
               eval $mta_aliases_update
  @@ -185,23 +185,23 @@
   %preun
       if [ $1 -eq 0 ]; then
           #   stop perhaps still running server
  -        %{l_prefix}/etc/rc %{name} stop >/dev/null 2>&1 || true
  +        %{l_prefix}/etc/rc pks stop >/dev/null 2>&1 || true
   
           #   deactivate in MTA configuration
           mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
           mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
           if [ ".$mta_aliases_file" != . ]; then
  -            %{l_rpmtool} config -r -i "%{l_prefix}:%{name}" $mta_aliases_file
  +            %{l_rpmtool} config -r -i "%{l_prefix}:pks" $mta_aliases_file
           fi
           if [ ".$mta_aliases_update" != . ]; then
               eval $mta_aliases_update
           fi
   
           #   remove generated files
  -        rm -f %{l_prefix}/var/%{name}/pksd.ctl >/dev/null 2>&1 || true
  -        rm -f %{l_prefix}/var/%{name}/pksd.log >/dev/null 2>&1 || true
  -        rm -f %{l_prefix}/var/%{name}/pks-queue-run.pid >/dev/null 2>&1 || true
  -        rm -f %{l_prefix}/var/%{name}/queue/* >/dev/null 2>&1 || true
  -        rm -f %{l_prefix}/var/%{name}/db/* >/dev/null 2>&1 || true
  +        rm -f %{l_prefix}/var/pks/pksd.ctl >/dev/null 2>&1 || true
  +        rm -f %{l_prefix}/var/pks/pksd.log >/dev/null 2>&1 || true
  +        rm -f %{l_prefix}/var/pks/pks-queue-run.pid >/dev/null 2>&1 || true
  +        rm -f %{l_prefix}/var/pks/queue/* >/dev/null 2>&1 || true
  +        rm -f %{l_prefix}/var/pks/db/* >/dev/null 2>&1 || true
       fi
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/portfwd/portfwd.spec
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 portfwd.spec
  --- openpkg-src/portfwd/portfwd.spec  28 Jun 2003 14:09:17 -0000      1.17
  +++ openpkg-src/portfwd/portfwd.spec  7 Jul 2003 13:52:39 -0000       1.18
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      0.26rc6
  -Release:      20030628
  +Release:      20030707
   
   #   package options
   %option       with_fsl yes
  @@ -112,13 +112,13 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.portfwd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.portfwd' \
           '%config %{l_prefix}/etc/portfwd/portfwd.cfg'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/portsentry/portsentry.spec
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 portsentry.spec
  --- openpkg-src/portsentry/portsentry.spec    1 Jul 2003 15:38:42 -0000       1.27
  +++ openpkg-src/portsentry/portsentry.spec    7 Jul 2003 13:52:40 -0000       1.28
  @@ -33,7 +33,7 @@
   Group:        Security
   License:      Open Source
   Version:      1.1
  -Release:      20030701
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -89,7 +89,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/portsentry \
           $RPM_BUILD_ROOT%{l_prefix}/sbin \
           $RPM_BUILD_ROOT%{l_prefix}/etc/portsentry \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
  @@ -112,20 +112,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.portsentry} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.portsentry} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.portsentry' \
           '%config %{l_prefix}/etc/portsentry/portsentry.conf' \
           '%config %{l_prefix}/etc/portsentry/portsentry.ignore'
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/postfix/postfix.spec
  ============================================================================
  $ cvs diff -u -r1.143 -r1.144 postfix.spec
  --- openpkg-src/postfix/postfix.spec  7 Jul 2003 12:55:19 -0000       1.143
  +++ openpkg-src/postfix/postfix.spec  7 Jul 2003 13:52:40 -0000       1.144
  @@ -290,14 +290,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.postfix} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   generate file list
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.postfix' \
           '%attr(-,root,%{l_mgrp}) %{l_prefix}/etc/postfix' \
           '%config %attr(-,root,%{l_mgrp}) %{l_prefix}/etc/postfix/*' \
           '%attr(-,root,%{l_mgrp}) %{l_prefix}/libexec/postfix/*' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pound/pound.spec
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 pound.spec
  --- openpkg-src/pound/pound.spec      7 Jul 2003 13:04:42 -0000       1.6
  +++ openpkg-src/pound/pound.spec      7 Jul 2003 13:52:41 -0000       1.7
  @@ -142,14 +142,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.pound} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.pound' \
           '%config %{l_prefix}/etc/pound/*'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/powerdns/powerdns.spec
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 powerdns.spec
  --- openpkg-src/powerdns/powerdns.spec        4 Jul 2003 14:01:28 -0000       1.17
  +++ openpkg-src/powerdns/powerdns.spec        7 Jul 2003 13:52:42 -0000       1.18
  @@ -35,7 +35,7 @@
   Group:        DNS
   License:      GPL
   Version:      2.9.10
  -Release:      20030704
  +Release:      20030707
   
   #   package options
   %option       with_fsl   yes
  @@ -164,7 +164,7 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.powerdns} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/var/powerdns
  @@ -177,7 +177,7 @@
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
           '%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/powerdns' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.powerdns' \
           '%config %attr(0600,root,%{l_mgrp}) %{l_prefix}/etc/powerdns/*'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/prngd/prngd.spec
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 prngd.spec
  --- openpkg-src/prngd/prngd.spec      2 Jul 2003 12:38:34 -0000       1.27
  +++ openpkg-src/prngd/prngd.spec      7 Jul 2003 13:52:42 -0000       1.28
  @@ -33,7 +33,7 @@
   Group:        Security
   License:      PD
   Version:      0.9.27
  -Release:      20030702
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -94,7 +94,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/prngd \
           $RPM_BUILD_ROOT%{l_prefix}/etc/prngd \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
           $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
  @@ -117,20 +117,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.prngd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.prngd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.prngd' \
           '%config %{l_prefix}/etc/prngd/prngd.conf'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/procmail/procmail.spec
  ============================================================================
  $ cvs diff -u -r1.26 -r1.27 procmail.spec
  --- openpkg-src/procmail/procmail.spec        7 Jul 2003 11:38:01 -0000       1.26
  +++ openpkg-src/procmail/procmail.spec        7 Jul 2003 13:52:43 -0000       1.27
  @@ -107,7 +107,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/procmail \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/etc/procmail \
           $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
  @@ -134,20 +134,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.procmail} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.procmail} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.procmail' \
           '%attr(6755,%{l_susr},mail) %{l_prefix}/bin/procmail' \
           '%attr(2755,%{l_mgrp},mail) %{l_prefix}/bin/lockfile'
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/proftpd/proftpd.spec
  ============================================================================
  $ cvs diff -u -r1.57 -r1.58 proftpd.spec
  --- openpkg-src/proftpd/proftpd.spec  7 Jul 2003 13:06:12 -0000       1.57
  +++ openpkg-src/proftpd/proftpd.spec  7 Jul 2003 13:52:43 -0000       1.58
  @@ -132,7 +132,7 @@
   
       #   write shutdown message file to OpenPKG instance, not outside
       %{l_shtool} subst \
  -        -e 's;\(#define 
SHUTMSG_PATH.*"\)\(/etc/\)\(shutmsg\)";\1%{l_prefix}\2%{name}/\3";' \
  +        -e 's;\(#define 
SHUTMSG_PATH.*"\)\(/etc/\)\(shutmsg\)";\1%{l_prefix}\2proftpd/\3";' \
           include/default_paths.h
   
       #   configure the ProFTPd source tree
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pureftpd/pureftpd.spec
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 pureftpd.spec
  --- openpkg-src/pureftpd/pureftpd.spec        3 Jul 2003 08:59:48 -0000       1.43
  +++ openpkg-src/pureftpd/pureftpd.spec        7 Jul 2003 13:52:44 -0000       1.44
  @@ -33,7 +33,7 @@
   Group:        FTP
   License:      GPL
   Version:      1.1.0
  -Release:      20030703
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -101,7 +101,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/pureftpd \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
       %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
  @@ -115,20 +115,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.pureftpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.pureftpd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.pureftpd'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/qpopper/qpopper.spec
  ============================================================================
  $ cvs diff -u -r1.47 -r1.48 qpopper.spec
  --- openpkg-src/qpopper/qpopper.spec  28 Jun 2003 14:59:28 -0000      1.47
  +++ openpkg-src/qpopper/qpopper.spec  7 Jul 2003 13:52:44 -0000       1.48
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      4.0.5
  -Release:      20030628
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -136,14 +136,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.qpopper} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.qpopper' \
           '%config %{l_prefix}/etc/qpopper/qpopper.config'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rdist/rdist.spec
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 rdist.spec
  --- openpkg-src/rdist/rdist.spec      14 Jun 2003 14:48:14 -0000      1.3
  +++ openpkg-src/rdist/rdist.spec      7 Jul 2003 13:52:45 -0000       1.4
  @@ -40,7 +40,7 @@
   Group:        Filesystem
   License:      BSD
   Version:      %{V_opkg}
  -Release:      20030614
  +Release:      20030707
   
   #   list of sources
   Source0:      http://www.magnicomp.com/download/rdist/rdist-%{V_base}-%{V_pl}.tar.gz
  @@ -60,7 +60,7 @@
       executing.
   
   %prep
  -    %setup -q -n %{name}-%{V_base}-%{V_pl}
  +    %setup -q -n rdist-%{V_base}-%{V_pl}
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rt/rt.spec
  ============================================================================
  $ cvs diff -u -r1.70 -r1.71 rt.spec
  --- openpkg-src/rt/rt.spec    4 Jul 2003 14:01:53 -0000       1.70
  +++ openpkg-src/rt/rt.spec    7 Jul 2003 13:52:45 -0000       1.71
  @@ -49,7 +49,7 @@
   Group:        Database
   License:      GPL
   Version:      %{V_here}
  -Release:      20030704
  +Release:      20030707
   
   #   package options
   %option       with_color_primary   336699
  @@ -377,7 +377,7 @@
           if [ ".$mta_aliases_file" != . ]; then
               ( echo "rt:         \"|%{l_prefix}/bin/rt-mailgate --action correspond 
--queue general --url http://127.0.0.1:8380/\"";
                 echo "rt-comment: \"|%{l_prefix}/bin/rt-mailgate --action comment    
--queue general --url http://127.0.0.1:8380/\"";
  -            ) | %{l_rpmtool} config -a -i "%{l_prefix}:%{name}" $mta_aliases_file
  +            ) | %{l_rpmtool} config -a -i "%{l_prefix}:rt" $mta_aliases_file
           fi
           if [ ".$mta_aliases_update" != . ]; then
               eval $mta_aliases_update
  @@ -408,7 +408,7 @@
           mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
           mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
           if [ ".$mta_aliases_file" != . ]; then
  -            %{l_rpmtool} config -r -i "%{l_prefix}:%{name}" $mta_aliases_file
  +            %{l_rpmtool} config -r -i "%{l_prefix}:rt" $mta_aliases_file
           fi
           if [ ".$mta_aliases_update" != . ]; then
               eval $mta_aliases_update
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/samhain/samhain.spec
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 samhain.spec
  --- openpkg-src/samhain/samhain.spec  3 Jul 2003 13:17:08 -0000       1.43
  +++ openpkg-src/samhain/samhain.spec  7 Jul 2003 13:52:46 -0000       1.44
  @@ -33,7 +33,7 @@
   Group:        System
   License:      GPL
   Version:      1.7.9
  -Release:      20030703
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -96,7 +96,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/var/samhain
       ( cd samhain-%{version}
         %{l_make} %{l_mflags} \
             install-program install-man install-data \
  @@ -113,7 +113,7 @@
           samhain-%{version}/$rc \
           $RPM_BUILD_ROOT%{l_prefix}/etc/samhain/samhainrc
   
  -    #   Creating run-command script
  +    #   creating run-command script
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
       %{l_shtool} install -c -m 755 \
  @@ -121,20 +121,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.samhain} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.samhain} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.samhain' \
           '%config %{l_prefix}/etc/samhain/samhainrc'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sasl/sasl.spec
  ============================================================================
  $ cvs diff -u -r1.86 -r1.87 sasl.spec
  --- openpkg-src/sasl/sasl.spec        7 Jul 2003 11:17:24 -0000       1.86
  +++ openpkg-src/sasl/sasl.spec        7 Jul 2003 13:52:46 -0000       1.87
  @@ -265,14 +265,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.sasl} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.sasl' \
           '%config %{l_prefix}/etc/sasl/saslauthd.conf' \
           '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl' \
           '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl/saslauthd' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/scponly/scponly.spec
  ============================================================================
  $ cvs diff -u -r1.24 -r1.25 scponly.spec
  --- openpkg-src/scponly/scponly.spec  3 Jul 2003 13:54:29 -0000       1.24
  +++ openpkg-src/scponly/scponly.spec  7 Jul 2003 13:52:47 -0000       1.25
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      MIT-style
   Version:      3.8
  -Release:      20030703
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -84,7 +84,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/scponly \
           $RPM_BUILD_ROOT%{l_prefix}/etc/scponly \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/man/man8
  @@ -103,20 +103,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.scponly} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.scponly} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.scponly'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sendmail/sendmail.spec
  ============================================================================
  $ cvs diff -u -r1.77 -r1.78 sendmail.spec
  --- openpkg-src/sendmail/sendmail.spec        7 Jul 2003 10:37:24 -0000       1.77
  +++ openpkg-src/sendmail/sendmail.spec        7 Jul 2003 13:52:47 -0000       1.78
  @@ -309,7 +309,7 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.sendmail} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   adjust installation tree
  @@ -323,7 +323,7 @@
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.sendmail' \
           '%attr(2755,%{l_susr},%{l_rgrp})        %{l_prefix}/sbin/sendmail' \
           '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/bin/hoststat' \
           '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/bin/mailq' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/smtpfeed/smtpfeed.spec
  ============================================================================
  $ cvs diff -u -r1.44 -r1.45 smtpfeed.spec
  --- openpkg-src/smtpfeed/smtpfeed.spec        28 Jun 2003 15:05:19 -0000      1.44
  +++ openpkg-src/smtpfeed/smtpfeed.spec        7 Jul 2003 13:52:48 -0000       1.45
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      1.18
  -Release:      20030628
  +Release:      20030707
   
   #   package options
   %option       with_fsl yes
  @@ -118,14 +118,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.smtpfeed} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.smtpfeed'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/snmp/snmp.spec
  ============================================================================
  $ cvs diff -u -r1.40 -r1.41 snmp.spec
  --- openpkg-src/snmp/snmp.spec        7 Jul 2003 13:13:53 -0000       1.40
  +++ openpkg-src/snmp/snmp.spec        7 Jul 2003 13:52:48 -0000       1.41
  @@ -112,7 +112,7 @@
   
       #   create additional directories
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/snmp \
           $RPM_BUILD_ROOT%{l_prefix}/var/snmp \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
           $RPM_BUILD_ROOT%{l_prefix}/etc/snmp
  @@ -138,20 +138,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.snmp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.snmp} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.snmp' \
           '%config %{l_prefix}/etc/snmp/*.conf'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ssmtp/ssmtp.spec
  ============================================================================
  $ cvs diff -u -r1.34 -r1.35 ssmtp.spec
  --- openpkg-src/ssmtp/ssmtp.spec      3 Jul 2003 09:24:22 -0000       1.34
  +++ openpkg-src/ssmtp/ssmtp.spec      7 Jul 2003 13:52:49 -0000       1.35
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      2.48
  -Release:      20030703
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -88,7 +88,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/ssmtp \
           $RPM_BUILD_ROOT%{l_prefix}/sbin \
           $RPM_BUILD_ROOT%{l_prefix}/etc/ssmtp \
           $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
  @@ -117,20 +117,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.ssmtp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.ssmtp} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.ssmtp' \
           '%config %{l_prefix}/etc/ssmtp/ssmtp.conf'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/stunnel/stunnel.spec
  ============================================================================
  $ cvs diff -u -r1.36 -r1.37 stunnel.spec
  --- openpkg-src/stunnel/stunnel.spec  7 Jul 2003 11:23:47 -0000       1.36
  +++ openpkg-src/stunnel/stunnel.spec  7 Jul 2003 13:52:50 -0000       1.37
  @@ -87,7 +87,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/var/stunnel
       %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
       mv $RPM_BUILD_ROOT%{l_prefix}/etc/stunnel/stunnel.conf-sample \
  @@ -102,20 +102,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.stunnel} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.stunnel} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.stunnel'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sudo/sudo.spec
  ============================================================================
  $ cvs diff -u -r1.42 -r1.43 sudo.spec
  --- openpkg-src/sudo/sudo.spec        3 Jul 2003 10:14:23 -0000       1.42
  +++ openpkg-src/sudo/sudo.spec        7 Jul 2003 13:52:50 -0000       1.43
  @@ -33,7 +33,7 @@
   Group:        System
   License:      BSD
   Version:      1.6.7p5
  -Release:      20030703
  +Release:      20030707
   
   #   package options
   %option       with_fsl    yes
  @@ -104,7 +104,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/var/sudo
       %{l_shtool} subst \
           -e "s;-m 4111;-m 4511;" \
           -e "s;-m 0111;-m 0511;" \
  @@ -126,20 +126,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.sudo} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.sudo} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.sudo' \
           '%attr(4111,root,%{l_mgrp}) %{l_prefix}/bin/sudo' \
           '%attr(0111,root,%{l_mgrp}) %{l_prefix}/sbin/visudo' \
           '%config %attr(0400,root,%{l_mgrp}) %{l_prefix}/etc/sudo/sudoers'
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sysmon/sysmon.spec
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 sysmon.spec
  --- openpkg-src/sysmon/sysmon.spec    7 Jul 2003 13:16:58 -0000       1.25
  +++ openpkg-src/sysmon/sysmon.spec    7 Jul 2003 13:52:51 -0000       1.26
  @@ -84,7 +84,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/sysmon \
           $RPM_BUILD_ROOT%{l_prefix}/sbin \
           $RPM_BUILD_ROOT%{l_prefix}/etc/sysmon \
           $RPM_BUILD_ROOT%{l_prefix}/man/man5 \
  @@ -107,20 +107,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.sysmon} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.sysmon} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
  +        '%config %{l_prefix}/etc/fsl/fsl.sysmon'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/teapop/teapop.spec
  ============================================================================
  $ cvs diff -u -r1.24 -r1.25 teapop.spec
  --- openpkg-src/teapop/teapop.spec    28 Jun 2003 15:06:52 -0000      1.24
  +++ openpkg-src/teapop/teapop.spec    7 Jul 2003 13:52:51 -0000       1.25
  @@ -35,7 +35,7 @@
   Group:        Mail
   License:      BSD
   Version:      0.3.5
  -Release:      20030628
  +Release:      20030707
   
   #   package options
   %option       with_fsl yes
  @@ -112,7 +112,7 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.teapop} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   Stripping installation
  @@ -123,7 +123,7 @@
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.teapop' \
           '%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/teapop/*'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tex4ht/tex4ht.spec
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 tex4ht.spec
  --- openpkg-src/tex4ht/tex4ht.spec    2 Feb 2003 09:41:08 -0000       1.4
  +++ openpkg-src/tex4ht/tex4ht.spec    7 Jul 2003 13:52:52 -0000       1.5
  @@ -33,7 +33,7 @@
   Group:        Text
   License:      LPPL
   Version:      20030119
  -Release:      20030202
  +Release:      20030707
   
   #   list of sources
   Source0:      http://www.cis.ohio-state.edu/~gurari/TeX4ht/ufiles.zip
  @@ -57,11 +57,11 @@
       systems in general, and of the LaTeX and AMS style files in particular.
   
   %prep
  -    rm -rf $RPM_BUILD_DIR/%{name}-%{version}
  -    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_DIR/%{name}-%{version}
  +    rm -rf $RPM_BUILD_DIR/tex4ht-%{version}
  +    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_DIR/tex4ht-%{version}
   
   %build
  -    cd $RPM_BUILD_DIR/%{name}-%{version}
  +    cd $RPM_BUILD_DIR/tex4ht-%{version}
       %{l_prefix}/bin/unzip \
           %{SOURCE newt4ht.zip} \
           tex4ht.c t4ht.c
  @@ -81,8 +81,8 @@
   
       #   install binaries
       %{l_shtool} install -c -s -m 755 \
  -        %{name}-%{version}/tex4ht \
  -        %{name}-%{version}/t4ht \
  +        tex4ht-%{version}/tex4ht \
  +        tex4ht-%{version}/t4ht \
           $RPM_BUILD_ROOT%{l_prefix}/bin/
       for i in $HT_BIN_FILES; do
           ln -s ../share/texmf/tex/generic/tex4ht/$i \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tftp/tftp.spec
  ============================================================================
  $ cvs diff -u -r1.16 -r1.17 tftp.spec
  --- openpkg-src/tftp/tftp.spec        3 Jul 2003 15:01:06 -0000       1.16
  +++ openpkg-src/tftp/tftp.spec        7 Jul 2003 13:52:52 -0000       1.17
  @@ -33,7 +33,7 @@
   Group:        Networtk
   License:      GPL
   Version:      0.34
  -Release:      20030703
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -80,7 +80,7 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/tftp \
           $RPM_BUILD_ROOT%{l_prefix}/etc/tftp \
           $RPM_BUILD_ROOT%{l_prefix}/var/tftp
       %{l_make} %{l_mflags} install \
  @@ -104,20 +104,20 @@
           -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  -        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +        %{SOURCE rc.tftp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   OSSP fake syslog library
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.tftp} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.tftp' \
           '%config   %{l_prefix}/etc/tftp/*'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tinyca/tinyca.spec
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 tinyca.spec
  --- openpkg-src/tinyca/tinyca.spec    5 Jul 2003 14:57:18 -0000       1.18
  +++ openpkg-src/tinyca/tinyca.spec    7 Jul 2003 13:52:53 -0000       1.19
  @@ -33,7 +33,7 @@
   Group:        Misc
   License:      GPL
   Version:      0.4.9
  -Release:      20030705
  +Release:      20030707
   
   #   list of sources
   Source0:      http://tinyca.sm-zone.net/tinyca-%{version}.tar.gz
  @@ -59,18 +59,18 @@
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/etc/%{name} \
  -        $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/tinyca \
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/tinyca
       %{l_shtool} install -c -m 755 \
           -e 's;#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \
  -        -e "s;'\./lib';'%{l_prefix}/libexec/%{name}';g" \
  -        -e 's;"\./templates";"%{l_prefix}/etc/%{name}";g' \
  +        -e "s;'\./lib';'%{l_prefix}/libexec/tinyca';g" \
  +        -e 's;"\./templates";"%{l_prefix}/etc/tinyca";g' \
           -e 's;/usr/bin/openssl;%{l_prefix}/bin/openssl;g' \
           tinyca $RPM_BUILD_ROOT%{l_prefix}/bin/
       %{l_shtool} install -c -m 644 \
  -        templates/* $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
  +        templates/* $RPM_BUILD_ROOT%{l_prefix}/etc/tinyca/
       %{l_shtool} install -c -m 644 \
  -        lib/*.pm $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/
  +        lib/*.pm $RPM_BUILD_ROOT%{l_prefix}/libexec/tinyca/
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/vrrpd/vrrpd.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 vrrpd.spec
  --- openpkg-src/vrrpd/vrrpd.spec      28 Jun 2003 15:07:36 -0000      1.11
  +++ openpkg-src/vrrpd/vrrpd.spec      7 Jul 2003 13:52:53 -0000       1.12
  @@ -35,7 +35,7 @@
   Group:        Networking
   License:      BSD
   Version:      0.8.7
  -Release:      20030628
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -109,14 +109,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.vrrpd} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.vrrpd' \
           '%config %{l_prefix}/etc/vrrpd/vrrpd.conf'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/whoson/whoson.spec
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 whoson.spec
  --- openpkg-src/whoson/whoson.spec    28 Jun 2003 15:10:10 -0000      1.6
  +++ openpkg-src/whoson/whoson.spec    7 Jul 2003 13:52:54 -0000       1.7
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      2.02a
  -Release:      20030628
  +Release:      20030707
   
   #   package options
   %option       with_fsl  yes
  @@ -127,14 +127,14 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE fsl.%{name}} \
  +        %{SOURCE fsl.whoson} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
  +        '%config %{l_prefix}/etc/fsl/fsl.whoson' \
           '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson' \
           '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson/run' \
           '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson/log' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xboard/xboard.spec
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 xboard.spec
  --- openpkg-src/xboard/xboard.spec    7 Jul 2003 11:20:52 -0000       1.13
  +++ openpkg-src/xboard/xboard.spec    7 Jul 2003 13:52:54 -0000       1.14
  @@ -75,8 +75,8 @@
       ./configure \
           --prefix=%{l_prefix} \
           --infodir=%{l_prefix}/info/ \
  -        --sysconfdir=%{l_prefix}/etc/%{name} \
  -        --localstatedir=%{l_prefix}/var/%{name} \
  +        --sysconfdir=%{l_prefix}/etc/xboard \
  +        --localstatedir=%{l_prefix}/var/xboard \
           --oldincludedir=%{l_prefix}/include/ \
           --with-x \
           --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
  @@ -92,7 +92,7 @@
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/info \
           $RPM_BUILD_ROOT%{l_prefix}/man/man6 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
  +        $RPM_BUILD_ROOT%{l_prefix}/var/xboard
       %{l_shtool} install -c -s -m 755 \
           xboard zic2xpm $RPM_BUILD_ROOT%{l_prefix}/bin/
       %{l_shtool} install -c -m 644 \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xv/xv.spec
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 xv.spec
  --- openpkg-src/xv/xv.spec    9 Apr 2003 14:08:57 -0000       1.14
  +++ openpkg-src/xv/xv.spec    7 Jul 2003 13:52:54 -0000       1.15
  @@ -33,7 +33,7 @@
   Group:        XWindow
   License:      XV
   Version:      3.10a
  -Release:      20030409
  +Release:      20030707
   
   #   list of sources
   Source0:      ftp://ftp.cis.upenn.edu/pub/xv/xv-%{version}.tar.gz
  @@ -108,13 +108,13 @@
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/share \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/%{name} \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/xv \
           $RPM_BUILD_ROOT%{l_prefix}/man/man1
   
       #   install package
       %{l_make} %{l_mflags} install \
           BINDIR=$RPM_BUILD_ROOT%{l_prefix}/bin \
  -        LIBDIR=$RPM_BUILD_ROOT%{l_prefix}/share/%{name} \
  +        LIBDIR=$RPM_BUILD_ROOT%{l_prefix}/share/xv \
           MANSUF=1 MANDIR=$RPM_BUILD_ROOT%{l_prefix}/man/man1
   
       #   strip binaries
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5422 -r1.5423 news.txt
  --- openpkg-web/news.txt      7 Jul 2003 13:49:00 -0000       1.5422
  +++ openpkg-web/news.txt      7 Jul 2003 13:52:21 -0000       1.5423
  @@ -1,5 +1,51 @@
  +07-Jul-2003: Upgraded package: P<xv-3.10a-20030707>
  +07-Jul-2003: Upgraded package: P<whoson-2.02a-20030707>
  +07-Jul-2003: Upgraded package: P<vrrpd-0.8.7-20030707>
  +07-Jul-2003: Upgraded package: P<tinyca-0.4.9-20030707>
  +07-Jul-2003: Upgraded package: P<tftp-0.34-20030707>
  +07-Jul-2003: Upgraded package: P<tex4ht-20030119-20030707>
  +07-Jul-2003: Upgraded package: P<teapop-0.3.5-20030707>
  +07-Jul-2003: Upgraded package: P<sudo-1.6.7p5-20030707>
  +07-Jul-2003: Upgraded package: P<ssmtp-2.48-20030707>
  +07-Jul-2003: Upgraded package: P<smtpfeed-1.18-20030707>
  +07-Jul-2003: Upgraded package: P<scponly-3.8-20030707>
  +07-Jul-2003: Upgraded package: P<samhain-1.7.9-20030707>
  +07-Jul-2003: Upgraded package: P<rt-3.0.3-20030707>
  +07-Jul-2003: Upgraded package: P<rdist-7.0.0a10-20030707>
  +07-Jul-2003: Upgraded package: P<qpopper-4.0.5-20030707>
  +07-Jul-2003: Upgraded package: P<pureftpd-1.1.0-20030707>
  +07-Jul-2003: Upgraded package: P<prngd-0.9.27-20030707>
  +07-Jul-2003: Upgraded package: P<powerdns-2.9.10-20030707>
  +<<<<<<< news.txt
  +07-Jul-2003: Upgraded package: P<portsentry-1.1-20030707>
  +07-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030707>
  +07-Jul-2003: Upgraded package: P<pks-0.9.6-20030707>
  +07-Jul-2003: Upgraded package: P<pinfo-0.6.7-20030707>
  +<<<<<<< news.txt
  +07-Jul-2003: Upgraded package: P<petidomo-4.0b1-20030707>
  +07-Jul-2003: Upgraded package: P<openpkg-20030707-20030707>
  +07-Jul-2003: Upgraded package: P<ntp-4.1.1c-20030707>
  +07-Jul-2003: Upgraded package: P<nsd-1.1.0-20030707>
  +07-Jul-2003: Upgraded package: P<nntpcache-3.0.1-20030707>
  +07-Jul-2003: Upgraded package: P<netcat-1.10-20030707>
  +07-Jul-2003: Upgraded package: P<mysql-4.0.13-20030707>
  +07-Jul-2003: Upgraded package: P<mirror-2.9-20030707>
  +07-Jul-2003: Upgraded package: P<mhash-0.8.18-20030707>
  +07-Jul-2003: Upgraded package: P<lzo-1.08-20030707>
  +07-Jul-2003: Upgraded package: P<kermit-8.0.209-20030707>
  +07-Jul-2003: Upgraded package: P<kerberos-1.2.8-20030707>
  +07-Jul-2003: Upgraded package: P<j2se-1.3.1-20030707>
  +07-Jul-2003: Upgraded package: P<j2ee-1.3.1-20030707>
  +07-Jul-2003: Upgraded package: P<fsl-1.2.0-20030707>
  +07-Jul-2003: Upgraded package: P<ethereal-0.9.13-20030707>
  +07-Jul-2003: Upgraded package: P<cvsd-0.9.19-20030707>
  +07-Jul-2003: Upgraded package: P<cvs-1.12.1-20030707>
  +=======
  +=======
   07-Jul-2003: Upgraded package: P<apache-1.3.26-1.1.5>
  +>>>>>>> 1.5422
   07-Jul-2003: Upgraded package: P<php-4.2.2-1.1.2>
  +>>>>>>> 1.5421
   07-Jul-2003: Upgraded package: P<txt2man-1.4.8-20030707>
   07-Jul-2003: Upgraded package: P<bc-1.06-20030707>
   07-Jul-2003: Upgraded package: P<audiofile-0.2.3-20030707>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to