Merge pull request #1995 from larsewi/janitorial-check

ENT-12604: Quick and dirty janitorial check of build scripts

Author: larsewi

deps-packaging/apache/debian/control

@@ -1,7 +1,7 @@
 Source: cfbuild-apache
 Section: libs
 Priority: optional
-Maintainer: CFEngine Packager <patuch@cfengine.com>
+Maintainer: CFEngine Packager <packager@cfengine.com>
 Build-Depends: debhelper
 Standards-Version: 3.8.4
 
@@ -16,4 +16,3 @@ Section: libdevel
 Architecture: any
 Description: CFEngine Build Automation -- cfbuild-apache-devel
  CFEngine Build Automation -- cfbuild-apache-devel
-

deps-packaging/cache-sftp

@@ -106,11 +106,6 @@ main()
             fatal  "$MYNAME $cmd:  requires exactly one word as argument: dirname"  2
         fi
 
-        # case "$dirname" in
-        #     *)   basedirname=.                ;  leafdirname="$dirname"       ;;
-        #     */*) basedirname="${filename%/*}" ;  leafdirname="${dirname##*/}" ;;
-        # esac
-
         # Canonicalised dirname
         canondirname=`echo $dirname | sed 's|/|_|g'`
 

deps-packaging/libexpat/cfbuild-libexpat.spec

@@ -22,8 +22,8 @@ CFLAGS="-fPIC -DPIC" ./configure --prefix=%{prefix} --without-examples --without
 
 %build
 
-make   
- 
+make
+
 %install
 
 rm -rf ${RPM_BUILD_ROOT}
@@ -64,4 +64,3 @@ CFEngine Build Automation -- libexpat -- development files
 %prefix/lib/pkgconfig
 
 %changelog
-

deps-packaging/libgcc/cfbuild-libgcc.spec

@@ -32,7 +32,6 @@ if [ "$(uname -v)" -eq 7 ]; then
 else
   echo > libatomic-files
 fi
-#cp  /opt/freeware/lib/gcc/powerpc-ibm-aix*.0.0/4.*/libstdc++.a $RPM_BUILD_ROOT%{prefix}/lib/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,7 +50,5 @@ rm -rf $RPM_BUILD_ROOT
 %dir %prefix/lib
 
 %prefix/lib/libgcc_s.a
-#%prefix/lib/libstdc++.a
-
 
 %changelog

deps-packaging/libxml2/cfbuild-libxml2.spec

@@ -23,7 +23,7 @@ export PATH=/opt/freeware/bin:$PATH # to use newer version of tar on aix platfor
 
 SYS=`uname -s`
 
-if expr \( "z$SYS" = 'zAIX' \) \| \( "`cat /etc/redhat-release`" : '.* [45]\.' \)
+if expr \( "z$SYS" = 'zAIX' \)
 then
     mv configure configure.bak
     sed 's/ *-Wno-array-bounds//' configure.bak >configure

deps-packaging/libxml2/mingw/debian/cfbuild-libxml2-mingw64-devel.install

@@ -2,4 +2,3 @@
 /var/cfengine/include
 /var/cfengine/lib/*.dll.a
 /var/cfengine/lib/pkgconfig
-

deps-packaging/openldap/configure.patch

@@ -9,8 +9,6 @@ OLD=${BUILD_ROOT}/cfbuild-openldap-devel${PREFIX}
 
 # Patch
 
-#patch -p0 -i configure.patch configure
-
 # Configure
 
 ./configure --prefix=$PREFIX --enable-shared --disable-slapd --disable-backends \