simplify packaging

cvs/cvs.spec

@@ -38,7 +38,7 @@ Class:        CORE
 Group:        SCM
 License:      GPL
 Version:      %{V_cvs}
-Release:      20040207
+Release:      20040212
 
 #   package options
 %option       with_fsl         yes
@@ -96,42 +96,38 @@ AutoReqProv:  no
     }
 
 %prep
-    %setup -q -c
+    %setup -q
     %setup -q -T -D -a 1
 
     #   apply patches
-    ( cd cvs-%{V_cvs}
 %if "%{with_rse}" == "yes"
-      cat %{PATCH cvs.patch.rse} |\
-      sed -e 's;\(#define RSE_PATCH_CVSUSER_CALLER "\)cvs\("\);\1%{with_rse_cvsuser}\2;' |\
-      %{l_patch} -p0
+    cat %{PATCH cvs.patch.rse} |\
+    sed -e 's;\(#define RSE_PATCH_CVSUSER_CALLER "\)cvs\("\);\1%{with_rse_cvsuser}\2;' |\
+    %{l_patch} -p0
 %endif
-      %patch -p0
-    ) || exit $?
+    %patch -p0
 
 %build
     #   configure CVS package
-    ( cd cvs-%{V_cvs}
-      CC="%{l_cc}" \
+    CC="%{l_cc}" \
 %if "%{with_rse}" == "yes"
-      CFLAGS="%{l_cflags -O} -DRSE_PATCHES" \
+    CFLAGS="%{l_cflags -O} -DRSE_PATCHES" \
 %else
-      CFLAGS="%{l_cflags -O}" \
+    CFLAGS="%{l_cflags -O}" \
 %endif
-      LDFLAGS="%{l_fsl_ldflags}" \
-      LIBS="%{l_fsl_libs}" \
-      ./configure \
-          --prefix=%{l_prefix} \
-          --with-patch=%{l_prefix}/bin/patch \
-          --with-tmpdir=%{l_prefix}/var/cvs/tmp \
-          --without-krb4 \
-          --without-gssapi \
-          --enable-encryption \
-          --enable-server
-      %{l_make} %{l_mflags -O}
-    ) || exit $?
-
-    #   configure CVSlock package
+    LDFLAGS="%{l_fsl_ldflags}" \
+    LIBS="%{l_fsl_libs}" \
+    ./configure \
+        --prefix=%{l_prefix} \
+        --with-patch=%{l_prefix}/bin/patch \
+        --with-tmpdir=%{l_prefix}/var/cvs/tmp \
+        --without-krb4 \
+        --without-gssapi \
+        --enable-encryption \
+        --enable-server
+    %{l_make} %{l_mflags -O}
+
+    #   configure CVSlock utility
     ( cd cvslock-%{V_cvslock}
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
@@ -144,16 +140,14 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
 
     #   install CVS package
-    ( cd cvs-%{V_cvs}
-      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-      rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/rcs2log
-      rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
-      mv $RPM_BUILD_ROOT%{l_prefix}/share/cvs/contrib/* \
-         $RPM_BUILD_ROOT%{l_prefix}/share/cvs/
-      rmdir $RPM_BUILD_ROOT%{l_prefix}/share/cvs/contrib
-      rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/cvsbug
-      rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/cvsbug.8
-    ) || exit $?
+    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/rcs2log
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+    mv $RPM_BUILD_ROOT%{l_prefix}/share/cvs/contrib/* \
+       $RPM_BUILD_ROOT%{l_prefix}/share/cvs/
+    rmdir $RPM_BUILD_ROOT%{l_prefix}/share/cvs/contrib
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/cvsbug
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/cvsbug.8
 
     #   install CVSlock package
     ( cd cvslock-%{V_cvslock}