OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Oct-2005 14:55:30
Branch: HEAD Handle: 2005102913553000
Modified files:
openpkg-src/sleuthkit sleuthkit.patch sleuthkit.spec
Log:
prevent included file command from building, make it depend on file
package itself
Summary:
Revision Changes Path
1.12 +24 -27 openpkg-src/sleuthkit/sleuthkit.patch
1.26 +2 -8 openpkg-src/sleuthkit/sleuthkit.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sleuthkit/sleuthkit.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 sleuthkit.patch
--- openpkg-src/sleuthkit/sleuthkit.patch 27 Oct 2005 13:20:23 -0000
1.11
+++ openpkg-src/sleuthkit/sleuthkit.patch 29 Oct 2005 12:55:30 -0000
1.12
@@ -1,7 +1,13 @@
Index: Makefile
---- Makefile.orig 2005-04-08 22:10:03 +0200
-+++ Makefile 2005-07-07 13:43:43 +0200
-@@ -14,13 +14,13 @@
+--- Makefile.orig 2005-10-13 19:26:28 +0200
++++ Makefile 2005-10-29 14:44:05 +0200
+@@ -9,18 +9,18 @@
+ $(DIRS):
+ mkdir -p $@
+
+-compile: no-perl mactime sorter file test
++compile: no-perl mactime sorter test
+
compile-static: no-perl-static mactime sorter file test
no-perl:
@@ -22,28 +28,19 @@
no-perl-static:
cd src/auxtools; make "CC=$(CC)" OPT=-static MAKELEVEL=
-Index: TSK.install
---- src/file/TSK.install.orig 2005-10-13 19:26:28 +0200
-+++ src/file/TSK.install 2005-10-27 10:51:26 +0200
-@@ -8,17 +8,11 @@
- if (test -f './Makefile') then
- true
- else
-- if [ "x${CC}" = "x" ]; then
-- ./configure \
-- --prefix=`cd ../..; pwd` \
-- --exec-prefix=`cd ../..; pwd` \
-+ ./configure \
-+ --prefix=`cd ../..; pwd` \
-+ --exec-prefix=`cd ../..; pwd` \
-+ --disable-shared \
- || exit $?
-- else
-- CC="${CC}" ./configure \
-- --prefix=`cd ../..; pwd` \
-- --exec-prefix=`cd ../..; pwd` \
-- || exit $?
-- fi
+Index: check-install
+--- check-install.orig 2005-10-13 19:26:28 +0200
++++ check-install 2005-10-29 14:51:36 +0200
+@@ -45,12 +45,6 @@
+ echo "ERROR: Missing diskstat tool";
fi
- make
- make install
+
+-if (test -x "bin/file") then
+- blah=1;
+-else
+- echo "ERROR: Missing 'file' command";
+-fi
+-
+ if (test -x "bin/mactime") then
+ blah=1;
+ else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sleuthkit/sleuthkit.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 sleuthkit.spec
--- openpkg-src/sleuthkit/sleuthkit.spec 27 Oct 2005 13:41:27 -0000
1.25
+++ openpkg-src/sleuthkit/sleuthkit.spec 29 Oct 2005 12:55:30 -0000
1.26
@@ -33,7 +33,7 @@
Group: System
License: GPL
Version: 2.03
-Release: 20051027
+Release: 20051029
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sleuthkit/sleuthkit-%{version}.tar.gz
@@ -43,7 +43,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, perl, perl-time
-PreReq: OpenPKG, openpkg >= 20040130, perl, perl-time
+PreReq: OpenPKG, openpkg >= 20040130, perl, perl-time, file
AutoReq: no
AutoReqProv: no
@@ -77,9 +77,6 @@
-e 's;/usr/local/bin/;%{l_prefix}/bin/;' \
-e 's;read perlexe;exit 1;' \
src/sorter/install src/timeline/config-perl
- %{l_shtool} subst \
- -e 's;\(MAGIC =
\)\$(pkgdatadir)/magic;\1%{l_prefix}/share/sleuthkit/file/magic;' \
- src/file/src/Makefile.in
%build
# build programs
@@ -102,7 +99,6 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
- $RPM_BUILD_ROOT%{l_prefix}/share/sleuthkit/file \
$RPM_BUILD_ROOT%{l_prefix}/share/sleuthkit/sorter
%{l_shtool} install -c -m 755 \
bin/* $RPM_BUILD_ROOT%{l_prefix}/bin/
@@ -110,8 +106,6 @@
man/man1/*.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{l_shtool} install -c -m 644 \
share/sorter/* $RPM_BUILD_ROOT%{l_prefix}/share/sleuthkit/sorter/
- %{l_shtool} install -c -m 644 \
- share/file/* $RPM_BUILD_ROOT%{l_prefix}/share/sleuthkit/file/
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
