diff --git a/fix-arm.patch b/fix-arm.patch deleted file mode 100644 index 68eb411..0000000 --- a/fix-arm.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: libEMF-1.0.6/include/libEMF/wine/winnt.h -=================================================================== ---- libEMF-1.0.6.orig/include/libEMF/wine/winnt.h -+++ libEMF-1.0.6/include/libEMF/wine/winnt.h -@@ -45,6 +45,10 @@ - # define WORDS_BIGENDIAN - # define BITFIELDS_BIGENDIAN - # undef ALLOW_UNALIGNED_ACCESS -+#elif defined(__arm__) -+# undef WORDS_BIGENDIAN -+# undef BITFIELDS_BIGENDIAN -+# undef ALLOW_UNALIGNED_ACCESS - #elif !defined(RC_INVOKED) - # error Unknown CPU architecture! - #endif -@@ -1213,7 +1217,7 @@ typedef struct _STACK_FRAME_HEADER - - #endif /* __PPC__ */ - --#ifdef __sparc__ -+#if defined(__sparc__) || defined(__arm__) - - /* - * FIXME: diff --git a/libEMF-1.0.6.tar.gz b/libEMF-1.0.6.tar.gz deleted file mode 100644 index 13453f9..0000000 --- a/libEMF-1.0.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a6b64628f174d17102c3a0714bf9834c72a412b36d750b701f23db5cf174b74 -size 911093 diff --git a/libEMF-1.0.7.tar.gz b/libEMF-1.0.7.tar.gz new file mode 100644 index 0000000..b43427d --- /dev/null +++ b/libEMF-1.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f2fd8bb84e345978c7fc45a39e06fc6a44fee867a91ebe83433d3a34348fd21 +size 908973 diff --git a/libEMF.changes b/libEMF.changes index 1d63512..e9ad23a 100644 --- a/libEMF.changes +++ b/libEMF.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 7 16:25:41 CET 2012 - sbrabec@suse.cz + +- Upgrade to version 1.0.7: + * Fixes and additions for various non-x86 architectures. + ------------------------------------------------------------------- Mon Aug 20 23:04:17 UTC 2012 - agraf@suse.com diff --git a/libEMF.spec b/libEMF.spec index 5a18741..35fb25a 100644 --- a/libEMF.spec +++ b/libEMF.spec @@ -18,17 +18,16 @@ Name: libEMF BuildRequires: gcc-c++ -Version: 1.0.6 +Version: 1.0.7 Release: 0 Source: %{name}-%{version}.tar.gz -Patch0: fix-arm.patch Url: http://libemf.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Library for Manipulation with Enhanced MetaFile (EMF, ECMA-234) License: LGPL-2.1+ ; GPL-2.0+ Group: System/Libraries # taken from includes/wine/winnt.h -ExclusiveArch: %ix86 x86_64 ppc64 sparc %arm +ExclusiveArch: alpha %arm %ix86 mips ppc ppc64 sparc s390 s390x x86_64 %description LibEMF is a C/C++ library that provides a drawing toolkit based on @@ -91,7 +90,6 @@ SO/OO graphics object. %prep %setup -q -%patch0 -p1 %build %configure\