[Lsb-messages] /var/www/bzr/lsb/4.1/misc-test r2268: pkgchk.c and archk.c should include <unistd.h>

[Mats Wichmann]

------------------------------------------------------------
revno: 2268
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Sat 2013-02-02 12:05:08 -0700
message:
  pkgchk.c and archk.c should include <unistd.h>
modified:
  archk/archk.c
  package/Makefile
  package/lsb-check.spec.sed
  pkgchk/pkgchk.c
-------------- next part --------------
=== modified file 'archk/archk.c'
--- a/archk/archk.c	2008-12-02 21:27:32 +0000
+++ b/archk/archk.c	2013-02-02 19:05:08 +0000
@@ -2,6 +2,7 @@
 #include <getopt.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <libgen.h>
 #include <limits.h>
 #include "../tetj/tetj.h"

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-10-17 12:28:37 +0000
+++ b/package/Makefile	2013-02-02 19:05:08 +0000
@@ -13,7 +13,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=3
+RPM_PACKAGE_RELEASE=5
 
 # Derive date string for daily snapshots
 ISO_DATE:=$(shell date +"%Y%m%d")

=== modified file 'package/lsb-check.spec.sed'
--- a/package/lsb-check.spec.sed	2012-10-17 12:28:37 +0000
+++ b/package/lsb-check.spec.sed	2013-02-02 19:05:08 +0000
@@ -89,6 +89,7 @@
 #which are to be linked as part of the final link-edit.
 
 #%package -n lsb-dynchk
+#AutoReqProv: no
 #Summary: LSB Dynamic Application Checking tool
 #Group: Development/Tools
 
@@ -103,11 +104,11 @@
 
 %build
 # for 4.1, remove LSB_MODULES=Multimedia
-LSBCC_BESTEFFORT=1 CC=/opt/lsb/bin/lsbcc CXX=/opt/lsb/bin/lsbc++ make LSBVERSION=${RPM_PACKAGE_VERSION} LSBLIBCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBAPPCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBARCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBCMDCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBPKGCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} all test
+LSBCC_BESTEFFORT=1 CC=/opt/lsb/bin/lsbcc CXX=/opt/lsb/bin/lsbc++ make LSBVERSION=${RPM_PACKAGE_VERSION} LSBLIBCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBAPPCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBARCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBCMDCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBPKGCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBDYNCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} all test
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install INSTALL_ROOT=$RPM_BUILD_ROOT/opt/lsb
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_ROOT=/opt/lsb
 
 # libchk
 mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-lib
@@ -181,15 +182,22 @@
 #/opt/lsb/doc/lsb-check-ar/README
 #/opt/lsb/man/man1/lsbarchk.1
 
-# this rule is outdated, we don't do this; but it's not run anyway, so...
 #%files -n lsb-dynchk
 #%defattr(-,root,root)
-#/opt/lsb
+#/opt/lsb/bin/lsbdynchk
+#/opt/lsb/%xlib/liblsbdynchk.so.1
+#%dir /opt/lsb/doc/lsb-check-dyn
+#/opt/lsb/doc/lsb-check-dyn/Licence
+#/opt/lsb/doc/lsb-check-dyn/README
+#/opt/lsb/man/man1/lsbdynchk.1
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Oct 19 2012 Mats Wichmann <mats at linuxfoundation.org>
+- working dynchk copied over from devel (subpkg still commented out)
 * Fri Apr 01 2011 Mats Wichmann <mats at linuxfoundation.org>
 - seems to work now; set version to highest of the pkgs +1 so 4.1.2
 * Sun Mar 27 2011 Mats Wichmann <mats at linuxfoundation.org>

=== modified file 'pkgchk/pkgchk.c'
--- a/pkgchk/pkgchk.c	2010-05-14 09:37:47 +0000
+++ b/pkgchk/pkgchk.c	2013-02-02 19:05:08 +0000
@@ -8,6 +8,7 @@
 #include <getopt.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <libgen.h>
 #include <limits.h>
 #include "../tetj/tetj.h"