rpms/xfsprogs/devel xfsprogs-wrapper.h, 1.3, 1.4 xfsprogs.spec, 1.37, 1.38
Eric Sandeen (sandeen)
fedora-extras-commits at redhat.com
Wed Jun 4 17:38:57 UTC 2008
Author: sandeen
Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17526
Modified Files:
xfsprogs-wrapper.h xfsprogs.spec
Log Message:
* Wed Apr 23 2008 Eric Sandeen <sandeen at redhat.com> 2.9.8-2
- Tidy up multilib hack for non-multilib arches & add sparc (#448452)
Index: xfsprogs-wrapper.h
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs-wrapper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfsprogs-wrapper.h 24 Oct 2007 02:12:28 -0000 1.3
+++ xfsprogs-wrapper.h 4 Jun 2008 17:38:01 -0000 1.4
@@ -5,8 +5,8 @@
#if defined(__i386__)
#include "platform_defs-i386.h"
-#elif defined(__ia64__)
-#include "platform_defs-ia64.h"
+#elif defined(__x86_64__)
+#include "platform_defs-x86_64.h"
#elif defined(__powerpc64__)
#include "platform_defs-ppc64.h"
#elif defined(__powerpc__)
@@ -15,12 +15,10 @@
#include "platform_defs-s390x.h"
#elif defined(__s390__)
#include "platform_defs-s390.h"
-#elif defined(__x86_64__)
-#include "platform_defs-x86_64.h"
-#elif defined(__alpha__)
-#include "platform_defs-alpha.h"
-#elif defined(__arm__)
-#include "platform_defs-arm.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "platform_defs-sparc64.h"
+#elif defined(__sparc64__)
+#include "platform_defs-sparc.h"
#else
#error "This xfsprogs-devel package does not work your architecture?"
#endif
Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xfsprogs.spec 23 Apr 2008 16:38:21 -0000 1.37
+++ xfsprogs.spec 4 Jun 2008 17:38:01 -0000 1.38
@@ -1,7 +1,7 @@
Summary: Utilities for managing the XFS filesystem
Name: xfsprogs
Version: 2.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
# Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
# in source, with no mention of version.
# doc/COPYING file specifies what is GPL and what is LGPL
@@ -73,9 +73,13 @@
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
# ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
+%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparc sparc64
+
+%ifarch %{multilib_arches}
mv -f $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs.h \
$RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs-%{_arch}.h
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs.h
+%endif
%find_lang %{name}
@@ -106,6 +110,9 @@
%{_libdir}/*.so
%changelog
+* Wed Apr 23 2008 Eric Sandeen <sandeen at redhat.com> 2.9.8-2
+- Tidy up multilib hack for non-multilib arches & add sparc (#448452)
+
* Wed Apr 23 2008 Eric Sandeen <sandeen at redhat.com> 2.9.8-1
- Update to xfsprogs 2.9.8
- Add support for sb_features2 in wrong location
More information about the scm-commits
mailing list