Hello community, here is the log from the commit of package libxflaim for openSUSE:Factory checked in at 2012-01-31 10:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxflaim (Old) and /work/SRC/openSUSE:Factory/.libxflaim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxflaim", Maintainer is "csarangt...@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libxflaim/libxflaim.changes 2011-09-23 02:11:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libxflaim.new/libxflaim.changes 2012-01-31 10:21:21.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Jan 30 08:15:51 UTC 2012 - mhruse...@suse.cz + +- adding ARM definitions + +------------------------------------------------------------------- +Sun Jan 29 22:00:27 UTC 2012 - jeng...@medozas.de + +- Remove redundant tags/sections per specfile guideline suggestions +- Parallel building using %_smp_mflags + +------------------------------------------------------------------- New: ---- libxflaim-arm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxflaim.spec ++++++ --- /var/tmp/diff_new_pack.8qnTlt/_old 2012-01-31 10:21:22.000000000 +0100 +++ /var/tmp/diff_new_pack.8qnTlt/_new 2012-01-31 10:21:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libxflaim # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,17 +18,22 @@ Name: libxflaim -BuildRequires: gcc-c++ java2-devel-packages mono-devel ncurses-devel +BuildRequires: gcc-c++ +BuildRequires: java2-devel-packages +BuildRequires: mono-devel +BuildRequires: ncurses-devel Summary: Embeddable XML Database Engine -Url: http://forge.novell.com/modules/xfmod/project/?flaim -Version: 5.1.1046 -Release: 177 License: LGPL-2.1+ Group: Development/Libraries/C and C++ +Url: http://forge.novell.com/modules/xfmod/project/?flaim +Version: 5.1.1046 +Release: 0 Source: %{name}-%{version}.tar.bz2 -Patch: libxflaim-warning.patch +Patch0: libxflaim-warning.patch Patch1: gcc46-Makefile.patch +Patch2: libxflaim-arm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig %description XFLAIM is an embeddable cross-platform XML database engine that @@ -42,7 +47,6 @@ Andrew Hodgkinson %package devel -License: LGPL-2.1+ Summary: Embeddable XML Database Engine Group: Development/Libraries/C and C++ Requires: %{name} = %{version} glibc-devel @@ -62,20 +66,20 @@ %prep %setup -q -%patch +%patch0 %if 0%{?suse_version} > 1140 %patch1 %endif +%ifarch %arm +%patch2 +%endif %build -make lib_dir_name=%{_lib} libs csharp +make lib_dir_name=%{_lib} libs csharp %{?_smp_mflags} %install make rpm_build_root=$RPM_BUILD_ROOT install_prefix=%{_prefix} lib_dir_name=%{_lib} install -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig ++++++ libxflaim-arm.patch ++++++ Index: Makefile =================================================================== --- Makefile.orig +++ Makefile @@ -467,6 +467,14 @@ ifndef host_native_word_size endif ifndef host_native_word_size + ifneq (,$(findstring arm,$(HOSTTYPE))) + host_processor_family = arm + host_native_word_size = 32 + host_supported_word_sizes = 32 + endif +endif + +ifndef host_native_word_size $(error Unable to determine host word size. $(HOSTTYPE)) endif @@ -1060,7 +1068,9 @@ ifdef unix_target ifeq ($(compiler),g++) ccflags += -Wall -Werror -fPIC ifneq ($(target_processor_family),ia64) - ccflags += -m$(target_word_size) + ifneq ($(HOSTTYPE),arm) + ccflags += -m$(target_word_size) + endif endif endif Index: src/xflaimtk.h =================================================================== --- src/xflaimtk.h.orig +++ src/xflaimtk.h @@ -54,6 +54,7 @@ #undef FLM_GNUC #undef FLM_HAS_ASYNC_IO #undef FLM_HAS_DIRECT_IO + #undef FLM_ARM #if defined( __GNUC__) #define FLM_GNUC @@ -149,6 +150,8 @@ #endif #elif defined( __x86__) || defined( __i386__) || defined( __x86_64__) #define FLM_X86 + #elif defined( __arm__) || defined( __thumb__) + #define FLM_ARM #else #error Platform architecture not supported #endif Index: ftk/src/ftk.h =================================================================== --- ftk/src/ftk.h.orig +++ ftk/src/ftk.h @@ -54,6 +54,7 @@ #undef FLM_GNUC #undef FLM_HAS_ASYNC_IO #undef FLM_HAS_DIRECT_IO + #undef FLM_ARM #if defined( __GNUC__) #define FLM_GNUC @@ -149,6 +150,8 @@ #endif #elif defined( __x86__) || defined( __i386__) || defined( __x86_64__) #define FLM_X86 + #elif defined( __arm__) || defined( __thumb__) + #define FLM_ARM #else #error Platform architecture not supported #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
