- upgraded to 1.5.6

Changed files:
    foremost-sysconfdir.patch -> 1.2
    foremost.spec -> 1.8

diff --git a/foremost-sysconfdir.patch b/foremost-sysconfdir.patch
index 21863604a8e2c4793cf4b9bb55acef39113ae00c..34e431631effcc8200b7839a8f9ad33b11422945 100644 (file)
--- a/foremost-sysconfdir.patch
+++ b/foremost-sysconfdir.patch
@@ -16,25 +16,25 @@
 --- foremost-1.3/main.h.orig   2006-12-06 17:37:56.114697000 +0100
 +++ foremost-1.3/main.h        2006-08-26 09:02:14.000000000 +0200
 @@ -216,6 +216,13 @@
- \r
- #define DEFAULT_MODE              mode_none\r
- #define DEFAULT_CONFIG_FILE       "foremost.conf"\r
-+#ifndef DEFAULT_SYSTEM_CONFIG_FILE\r
-+#ifdef __WIN32\r
-+#define DEFAULT_SYSTEM_CONFIG_FILE "/Program Files/foremost/foremost.conf"\r
-+#else\r
-+#define DEFAULT_SYSTEM_CONFIG_FILE       "/etc/foremost.conf"\r
-+#endif\r
-+#endif\r
- #define DEFAULT_OUTPUT_DIRECTORY  "output"\r
- #define AUDIT_FILE_NAME           "audit.txt"\r
- #define FOREMOST_DIVIDER          "------------------------------------------------------------------"\r
---- foremost-1.3/Makefile~     2006-08-26 09:02:14.000000000 +0200
-+++ foremost-1.3/Makefile      2006-12-06 17:40:47.064697000 +0100
+ 
+ #define DEFAULT_MODE              mode_none
+ #define DEFAULT_CONFIG_FILE       "foremost.conf"
++#ifndef DEFAULT_SYSTEM_CONFIG_FILE
++#ifdef __WIN32
++#define DEFAULT_SYSTEM_CONFIG_FILE "/Program Files/foremost/foremost.conf"
++#else
++#define DEFAULT_SYSTEM_CONFIG_FILE       "/etc/foremost.conf"
++#endif
++#endif
+ #define DEFAULT_OUTPUT_DIRECTORY  "output"
+ #define AUDIT_FILE_NAME           "audit.txt"
+ #define FOREMOST_DIVIDER          "------------------------------------------------------------------"
+--- foremost-1.5.6/Makefile~   2009-05-06 05:56:16.000000000 +0200
++++ foremost-1.5.6/Makefile    2010-02-01 11:24:20.000000000 +0100
 @@ -26,7 +26,7 @@
  # Where we get installed
  BIN = /usr/local/bin
- MAN = /usr/local/man/man1
+ MAN = /usr/share/man/man8
 -CONF= /usr/local/etc
 +CONF= /etc
  # Setup for compiling and cross-compiling for Windows

diff --git a/foremost.spec b/foremost.spec
index ff2a9b388c4b76b5048d0a8cb7466079b1ec5afa..bcf0cef36ec82f97ee5f74a96ef377e8505f1c71 100644 (file)
--- a/foremost.spec
+++ b/foremost.spec
@@ -1,12 +1,12 @@
 Summary:       Recover files by "carving" them from a raw disk
 Summary(pl.UTF-8):     Odzyskiwanie plików poprzez "wykrawanie" ich z dysku
 Name:          foremost
-Version:       1.5.4
+Version:       1.5.6
 Release:       1
 License:       Public Domain
 Group:         Applications/System
 Source0:       http://foremost.sourceforge.net/pkg/%{name}-%{version}.tar.gz
-# Source0-md5: 55395b1fef1039a88e02d81682347f6d
+# Source0-md5: 1ac068f5681bbee679f99d2f9fa7f39f
 Patch0:                %{name}-sysconfdir.patch
 URL:           http://foremost.sourceforge.net/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -56,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README CHANGES
+%doc CHANGES README
 %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}.conf
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man?/*