rpms/e2tools/devel e2tools-printf-lld-64bit.patch, NONE, 1.1 e2tools.spec, 1.2, 1.3

[Hans Ulrich Niedermann (ndim)]

Author: ndim

Update of /cvs/pkgs/rpms/e2tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19667

Modified Files:
	e2tools.spec 
Added Files:
	e2tools-printf-lld-64bit.patch 
Log Message:
* Sat Dec  8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-8
- Special __u64 formatstring on 64bit platforms (#349851).
- Reintroduce -Werror for all platforms.
- Install man pages without x bit.


e2tools-printf-lld-64bit.patch:

--- NEW FILE e2tools-printf-lld-64bit.patch ---
diff -ru e2tools-0.0.16/ls.c e2tools-0.0.16-lld/ls.c
--- e2tools-0.0.16/ls.c	2007-12-08 22:14:50.000000000 +0100
+++ e2tools-0.0.16-lld/ls.c	2007-12-08 22:15:25.000000000 +0100
@@ -657,8 +657,13 @@
   if (LINUX_S_ISDIR(info->inode.i_mode))
     printf("%7d", info->inode.i_size);
   else
+#if __WORDSIZE == 64
+    printf("%7ld", info->inode.i_size |
+           ((__u64)info->inode.i_size_high << 32));
+#else
     printf("%7lld", info->inode.i_size |
            ((__u64)info->inode.i_size_high << 32));
+#endif
   printf(" %s %s\n", datestr, info->name);
 
 } /* end of long_disp */ 


Index: e2tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2tools/devel/e2tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2tools.spec	8 Dec 2007 20:43:56 -0000	1.2
+++ e2tools.spec	8 Dec 2007 22:28:21 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           e2tools
 Version:        0.0.16
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Manipulate files in unmounted ext2/ext3 filesystems
 
 Group:          Applications/System
@@ -18,6 +18,7 @@
 Source8:        e2tail.1
 Source9:        e2tools.7
 Patch1:         e2tools-fedora-fixes.patch
+Patch2:         e2tools-printf-lld-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  e2fsprogs-devel >= 1.27
@@ -40,15 +41,13 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p1 -b .fedora-fixes
+%patch2 -p1 -b .printf-lld-64bit
 
 
 %build
 %configure
-%ifnarch alpha
-error=" -Werror"
-%endif
-%{__make} %{?_smp_mflags} CPPFLAGS="-Wall${error}"
+%{__make} %{?_smp_mflags} CPPFLAGS="-Wall -Werror"
 
 
 %check
@@ -62,8 +61,8 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1/
-%{__install} -p \
+%{__install} -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man1/
+%{__install} -p -m 0644 \
     %{SOURCE2} \
     %{SOURCE3} \
     %{SOURCE4} \
@@ -72,7 +71,8 @@
     %{SOURCE7} \
     %{SOURCE8} \
     $RPM_BUILD_ROOT%{_mandir}/man1/
-%{__install} -p -D %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/e2tools.7
+%{__install} -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man7/
+%{__install} -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/
 
 
 %clean
@@ -100,6 +100,11 @@
 
 
 %changelog
+* Sat Dec  8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-8
+- Special __u64 formatstring on 64bit platforms (#349851).
+- Reintroduce -Werror for all platforms.
+- Install man pages without x bit.
+
 * Sat Dec  8 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.16-6
 - Cowardly avoid compiling with -Werror on alpha.
 - Install files preserving timestamps where possible.