rpms/srm/devel srm-1.2.9-sort_headers.patch, NONE, 1.1 srm.spec, 1.2, 1.3

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/srm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1265

Modified Files:
	srm.spec 
Added Files:
	srm-1.2.9-sort_headers.patch 
Log Message:
Changed include order of ext3_fs.h and fs.h for gcc 4.4 builds


srm-1.2.9-sort_headers.patch:

--- NEW FILE srm-1.2.9-sort_headers.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for srm >= 1.2.9, which re-orders
the included header files to successfully build with GCC 4.4 and above. Definement
of FS_TOPDIR_FL etc. is required by <linux/ext2_fs.h>, but defined in <linux/fs.h>.

--- srm-1.2.9/src/sunlink.c			2008-07-10 23:50:08.000000000 +0200
+++ srm-1.2.9/src/sunlink.c.sort_headers	2009-04-14 04:52:01.000000000 +0200
@@ -26,8 +26,8 @@
 #endif
 
 #if HAVE_LINUX_EXT3_FS_H
-#include <linux/ext3_fs.h>
 #include <linux/fs.h>
+#include <linux/ext3_fs.h>
 
 #define EXT2_IOC_GETFLAGS EXT3_IOC_GETFLAGS
 #define EXT2_UNRM_FL EXT3_UNRM_FL
@@ -36,8 +36,8 @@
 #define EXT2_IOC_SETFLAGS EXT3_IOC_SETFLAGS
 
 #elif HAVE_LINUX_EXT2_FS_H
-#include <linux/ext2_fs.h>
 #include <linux/fs.h>
+#include <linux/ext2_fs.h>
 #endif
 
 #include "srm.h"


Index: srm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/srm/devel/srm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- srm.spec	26 Feb 2009 02:46:30 -0000	1.2
+++ srm.spec	14 Apr 2009 02:59:29 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           srm
 Version:        1.2.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Secure file deletion
 
 Group:          Applications/System
 License:        MIT
 URL:            http://srm.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         srm-1.2.9-sort_headers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,6 +22,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .sort_headers
+
 # Convert to utf-8
 for file in COPYING; do
     mv $file timestamp
@@ -50,6 +53,9 @@
 
 
 %changelog
+* Tue Apr 24 2009 Robert Scheck <robert at fedoraproject.org> - 1.2.9-4
+- Changed include order of ext3_fs.h and fs.h for gcc 4.4 builds
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild