- perl autodeps

- cleanups

Changed files:
    autopsy.spec -> 1.4

diff --git a/autopsy.spec b/autopsy.spec
index a8c95cfd66e9484246cced8017862a7fe39b1e20..683bf1ff3f1c54fdf8dbe094e3223be7aff6bb6c 100644 (file)
--- a/autopsy.spec
+++ b/autopsy.spec
@@ -1,19 +1,19 @@
-#
-# TODO - %service stuff
+# TODO
+#      - %%service stuff
 #      - add user autopsy with proper homedir rights
 #      - pl desc
-#
+%include       /usr/lib/rpm/macros.perl
 Summary:       The Autopsy Forensic Browser is a graphical interface to The Sleuth Kit utilities
 Summary(pl):   Autopsy Forensic Browser jest graficznym interfejsem do narzêdzi z The Sleuth Kit
 Name:          autopsy
 Version:       2.08
-Release:       0.1
-#Epoch:                -
+Release:       0.2
 License:       GPL
 Group:         Applications
 Source0:       http://dl.sourceforge.net/autopsy/%{name}-%{version}.tar.gz
 # Source0-md5: 0ac9db9acf66742f8f01f3d8b0cf2f90
 URL:           http://www.sleuthkit.org/autopsy
+BuildRequires: rpm-perlprov >= 4.1-13
 Requires:      coreutils
 Requires:      libmagic
 Requires:      openssl
@@ -34,35 +34,36 @@ values, and file types.
 %prep
 %setup -q
 
-echo "#!%{_bindir}/perl -wT" > autopsy
-echo "use lib qw(%{perl_vendorlib}/Autopsy);" >> autopsy
-echo "use lib qw(%{perl_vendorlib}/Autopsy/lib);" >> autopsy
+echo '#!%{__perl} -wT' > autopsy
+echo 'use lib qw(%{perl_vendorlib}/Autopsy);' >> autopsy
+echo 'use lib qw(%{perl_vendorlib}/Autopsy/lib);' >> autopsy
 cat base/autopsy.base >> autopsy
 
-cat > conf.pl <<-EOF
+cat > conf.pl <<-'EOF'
        # Autopsy configuration settings
 
        # when set to 1, the server will stop after it receives no
        # connections for STIMEOUT seconds.
-       \$USE_STIMEOUT = 0;
-       \$STIMEOUT = 3600;
+       $USE_STIMEOUT = 0;
+       $STIMEOUT = 3600;
 
        # number of seconds that child waits for input from client
-       \$CTIMEOUT = 15;
+       $CTIMEOUT = 15;
 
        # set to 1 to save the cookie value in a file (for scripting)
-       \$SAVE_COOKIE = 1;
+       $SAVE_COOKIE = 1;
 
-       \$INSTALLDIR = '%{perl_vendorlib}/Autopsy/';
+       $INSTALLDIR = '%{perl_vendorlib}/Autopsy/';
 
        # System Utilities
-       \$GREP_EXE = '/bin/grep';
+       $GREP_EXE = '/bin/grep';
 
        # Directories
-       \$TSKDIR = '%{_bindir}';
-       \$FILE_EXE = '%{_bindir}/file';
-       \$NSRLDB = '';
-       \$LOCKDIR = '/home/services/autopsy';
+       $TSKDIR = '%{_bindir}';
+       $FILE_EXE = '%{_bindir}/file';
+       $NSRLDB = '';
+# FIXME: FHS: /var/{lib,run}/autopsy?
+       $LOCKDIR = '/home/services/autopsy';
 EOF
 
 %install
@@ -84,14 +85,6 @@ install man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-
-%post
-
-%preun
-
-%postun
-
 %files
 %defattr(644,root,root,755)
 %doc README.txt docs/sleuthkit-informer-13.txt