Browse Source

many cleanups, originally triggered by rpmlint issues

Ralf S. Engelschall 23 years ago
parent
commit
ae8309fb7d
1 changed files with 26 additions and 10 deletions
  1. 26 10
      nntpcache/nntpcache.spec

+ 26 - 10
nntpcache/nntpcache.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        News
 License:      BSD
 Version:      3.0.1
-Release:      20030701
+Release:      20030704
 
 #   package options
 %option       with_fsl  yes
@@ -68,9 +68,15 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %{l_shtool} subst -e 's;test -e;test -f;g' Makefile* */Makefile*
 
 %build
+    #   configure package
+    %{l_shtool} subst \
+        -e 's;test -e;test -f;g' \
+        Makefile* */Makefile*
+    %{l_shtool} subst \
+        -e 's;/etc/nntpcache/\(newshound\.conf\);%{l_prefix}/etc/nntpcache/\1;' \
+        contrib/newshound/getconf.c
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     LDFLAGS="%{l_fsl_ldflags}" \
@@ -78,11 +84,16 @@ AutoReqProv:  no
     ./configure \
         --prefix=%{l_prefix} \
         --sysconfdir=%{l_prefix}/etc/nntpcache \
+        --libexecdir=%{l_prefix}/libexec/nntpcache \
         --localstatedir=%{l_prefix}/var/nntpcache
+
+    #   build package
     %{l_make} %{l_mflags}
 
 %install
     rm -rf $RPM_BUILD_ROOT
+
+    #   install package
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/var
     %{l_shtool} subst \
@@ -92,25 +103,29 @@ AutoReqProv:  no
         prefix=$RPM_BUILD_ROOT%{l_prefix} \
         exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
         sysconfdir=$RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache \
+        libexecdir=$RPM_BUILD_ROOT%{l_prefix}/libexecdir/nntpcache \
         configDir=$RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache \
         localstatedir=$RPM_BUILD_ROOT%{l_prefix}/var/nntpcache \
         cacheDir=$RPM_BUILD_ROOT%{l_prefix}/var/nntpcache
+
+    #   strip down and post-adjust installation hierarchy
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/include
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache/http
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/sbin/innreport.sh
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/innreport.sh
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/newshound.pl
     rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache/pubring*
     rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache/innreport*
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
+    find $RPM_BUILD_ROOT%{l_prefix} -type d -print | xargs chmod 755
+    find $RPM_BUILD_ROOT%{l_prefix} -type f -print | grep -v /sbin | xargs chmod 644
+    find $RPM_BUILD_ROOT%{l_prefix} -type f -name VERSION -print | xargs rm -f
     ( cd $RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache
       for file in *-dist; do
           mv $file `echo $file | sed -e 's;-dist$;;'`
-      done
-    )
-    find $RPM_BUILD_ROOT%{l_prefix} -type d -print | xargs chmod 755
-    find $RPM_BUILD_ROOT%{l_prefix} -type f -print | grep -v /sbin | xargs chmod 644
+      done )
 
-    #   Creating run-command script
+    #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 \
@@ -120,8 +135,9 @@ AutoReqProv:  no
         -e 's;@l_rgrp@;%{l_rgrp};g' \
         %{SOURCE rc.%{name}} $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
+    #   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}} \