- hd_big_geometry finally has been removed

Changed files:
    e2salvage-no-geob.patch -> 1.1
    e2salvage.spec -> 1.8

diff --git a/e2salvage-no-geob.patch b/e2salvage-no-geob.patch
new file mode 100644 (file)
index 0000000..cd87001
--- /dev/null
+++ b/e2salvage-no-geob.patch
@@ -0,0 +1,26 @@
+diff -upr e2salvage-0.0.8a./src/main.c e2salvage-0.0.8a/src/main.c
+--- e2salvage-0.0.8a./src/main.c       2003-10-07 22:49:37.000000000 +0200
++++ e2salvage-0.0.8a/src/main.c        2008-03-14 13:03:54.283036506 +0100
+@@ -42,7 +42,6 @@ int main(int argc, char * argv[])
+       long sb_auto_find = -1;
+       
+       struct hd_geometry geo;
+-      struct hd_big_geometry geob;
+       struct stat st;
+       unsigned long tmp;
+ 
+@@ -96,13 +95,6 @@ int main(int argc, char * argv[])
+               fs_size = (unsigned long long)tmp * 512ull;
+       }
+       else
+-      if (ioctl(i, HDIO_GETGEO_BIG, &geob) == 0) {
+-              fs_size = (unsigned long long) geob.heads
+-                      * (unsigned long long) geob.sectors
+-                      * (unsigned long long) geob.cylinders
+-                      * 512ull;
+-      }
+-      else
+       if (ioctl(i, HDIO_GETGEO, &geo) == 0) {
+               fs_size = (unsigned long long) geo.heads
+                       * (unsigned long long) geo.sectors
+Only in e2salvage-0.0.8a/src: main.c~

diff --git a/e2salvage.spec b/e2salvage.spec
index 6a9697044821f54d67cd481cbdf2f672c480e19c..e2e6f3f6bc1b79dc4dc70c61d52ca38bd996540d 100644 (file)
--- a/e2salvage.spec
+++ b/e2salvage.spec
@@ -10,6 +10,7 @@ Source0:      http://dl.sourceforge.net/e2salvage/%{name}-%{version}.tbz2
 Patch0:                %{name}-linux_types.patch
 Patch1:                %{name}-gcc4.patch
 Patch2:                %{name}-am.patch
+Patch3:                %{name}-no-geob.patch
 URL:           http://e2salvage.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -41,6 +42,7 @@ inne zawiedzie, katalogi są podłączane do głównego katalogu.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}