- update to version 1.38 (#1083995)

- rebuild configure for ppc64le (#1079542)

.gitignore

@@ -7,3 +7,4 @@ rescan-scsi-bus.sh-1.35
 /sg3_utils-1.35.tgz
 /sg3_utils-1.36.tgz
 /sg3_utils-1.37.tgz
+/sg3_utils-1.38.tgz

sg3_utils-1.38-ppc64le.patch

@@ -0,0 +1,92 @@
+diff -rup sg3_utils-1.38.orig/aclocal.m4 sg3_utils-1.38/aclocal.m4
+--- sg3_utils-1.38.orig/aclocal.m4	2013-10-31 16:01:34.000000000 +0100
++++ sg3_utils-1.38/aclocal.m4	2014-04-18 15:13:20.000000000 +0200
+@@ -1326,7 +1326,7 @@ ia64-*-hpux*)
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+@@ -1338,16 +1338,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	    LD="${LD-ld} -m elf_i386_fbsd"
+ 	    ;;
+ 	  x86_64-*linux*)
+-	    case `/usr/bin/file conftest.o` in
+-	      *x86-64*)
+-		LD="${LD-ld} -m elf32_x86_64"
+-		;;
+-	      *)
+-		LD="${LD-ld} -m elf_i386"
+-		;;
+-	    esac
++	    LD="${LD-ld} -m elf_i386"
++	    ;;
++	  powerpc64le-*linux*)
++	    LD="${LD-ld} -m elf32lppclinux"
+ 	    ;;
+-	  ppc64-*linux*|powerpc64-*linux*)
++	  powerpc64-*linux*)
+ 	    LD="${LD-ld} -m elf32ppclinux"
+ 	    ;;
+ 	  s390x-*linux*)
+@@ -1366,7 +1362,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	  x86_64-*linux*)
+ 	    LD="${LD-ld} -m elf_x86_64"
+ 	    ;;
+-	  ppc*-*linux*|powerpc*-*linux*)
++	  powerpcle-*linux*)
++	    LD="${LD-ld} -m elf64lppc"
++	    ;;
++	  powerpc-*linux*)
+ 	    LD="${LD-ld} -m elf64ppc"
+ 	    ;;
+ 	  s390*-*linux*|s390*-*tpf*)
+diff -rup sg3_utils-1.38.orig/configure sg3_utils-1.38/configure
+--- sg3_utils-1.38.orig/configure	2013-10-31 16:01:34.000000000 +0100
++++ sg3_utils-1.38/configure	2014-04-18 15:13:21.000000000 +0200
+@@ -6122,7 +6125,7 @@ ia64-*-hpux*)
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+@@ -6138,16 +6141,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	    LD="${LD-ld} -m elf_i386_fbsd"
+ 	    ;;
+ 	  x86_64-*linux*)
+-	    case `/usr/bin/file conftest.o` in
+-	      *x86-64*)
+-		LD="${LD-ld} -m elf32_x86_64"
+-		;;
+-	      *)
+-		LD="${LD-ld} -m elf_i386"
+-		;;
+-	    esac
++	    LD="${LD-ld} -m elf_i386"
+ 	    ;;
+-	  ppc64-*linux*|powerpc64-*linux*)
++	  powerpc64le-*linux*)
++	    LD="${LD-ld} -m elf32lppclinux"
++	    ;;
++	  powerpc64-*linux*)
+ 	    LD="${LD-ld} -m elf32ppclinux"
+ 	    ;;
+ 	  s390x-*linux*)
+@@ -6166,7 +6165,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	  x86_64-*linux*)
+ 	    LD="${LD-ld} -m elf_x86_64"
+ 	    ;;
+-	  ppc*-*linux*|powerpc*-*linux*)
++	  powerpcle-*linux*)
++	    LD="${LD-ld} -m elf64lppc"
++	    ;;
++	  powerpc-*linux*)
+ 	    LD="${LD-ld} -m elf64ppc"
+ 	    ;;
+ 	  s390*-*linux*|s390*-*tpf*)

sg3_utils.spec

@@ -2,19 +2,18 @@
 
 Summary: Utilities for devices that use SCSI command sets
 Name: sg3_utils
-Version: 1.37
+Version: 1.38
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and BSD
 Group: Applications/System
 Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tgz
-Source1: rescan-scsi-bus.sh.8
 Source2: scsi-rescan.8
 # https://bugzilla.redhat.com/show_bug.cgi?id=920687
 Patch0: sg3_utils-1.37-dont-open-dev-snapshot.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=948463
+# update configure for ppc64le (#1079542)
-Patch1: sg3_utils-1.37-man-pages-fix.patch
+Patch1: sg3_utils-1.38-ppc64le.patch
 URL: http://sg.danny.cz/sg/sg3_utils.html
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 
 %description
@@ -41,7 +40,7 @@ This package contains the shared library for %{name}.
 %package devel
 Summary: Development library and header files for the sg3_utils library
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: glibc-headers
 
 %description devel
@@ -51,7 +50,7 @@ developing applications.
 %prep
 %setup -q
 %patch0 -p1 -b .dev-snapshot
-%patch1 -p1 -b .man-fixes
+%patch1 -p1 -b .ppc64le
 
 
 %build
@@ -71,7 +70,6 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 install -p -m 755 scripts/%{rescan_script} $RPM_BUILD_ROOT%{_bindir}
 ( cd $RPM_BUILD_ROOT%{_bindir}; ln -sf %{rescan_script} scsi-rescan )
 
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man8
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8
 
 
@@ -95,6 +93,10 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8
 
 
 %changelog
+* Fri Apr 18 2014 Dan Horák <dan@danny.cz> - 1.38-1
+- update to version 1.38 (#1083995)
+- rebuild configure for ppc64le (#1079542)
+
 * Wed Jan 29 2014 Dan Horák <dan@danny.cz> - 1.37-3
 - fix various man pages (#948463)
 - add man page for the rescan-scsi-bus.sh script

sources

@@ -1 +1 @@
-9d557e8db4d1ff306a1f9415b7a57c22  sg3_utils-1.37.tgz
+e532a3d6648c422347f6d84cac469263  sg3_utils-1.38.tgz