diff --git a/graphite-arm-nodefaultlibs.patch b/graphite-arm-nodefaultlibs.patch new file mode 100644 index 0000000..1635909 --- /dev/null +++ b/graphite-arm-nodefaultlibs.patch @@ -0,0 +1,11 @@ +--- graphite2-1.1.1/src/CMakeLists.txt.orig 2012-04-03 17:21:01.000000000 -0400 ++++ graphite2-1.1.1/src/CMakeLists.txt 2012-04-03 17:22:13.000000000 -0400 +@@ -103,7 +103,7 @@ + if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") + target_link_libraries(graphite2 "-lkernel32 -lmsvcr90 -lmingw32 -lgcc -luser32") + else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") +- target_link_libraries(graphite2 "-lc -lgcc") ++ target_link_libraries(graphite2 "-lc -lgcc_s") + include(Graphite) + nolib_test(stdc++ $) + endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") diff --git a/graphite2.spec b/graphite2.spec index 84ff79a..a968667 100644 --- a/graphite2.spec +++ b/graphite2.spec @@ -1,12 +1,13 @@ Name: graphite2 Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Font rendering capabilities for complex non-Roman writing systems Group: Development/Tools License: LGPLv2+ URL: http://sourceforge.net/projects/silgraphite/ Source0: http://downloads.sourceforge.net/silgraphite/graphite2-%{version}.tgz +Patch0: graphite-arm-nodefaultlibs.patch BuildRequires: cmake BuildRequires: freetype-devel @@ -34,6 +35,7 @@ Includes and definitions for developing with graphite2. %prep %setup -q +%patch0 -p1 -b .arm %build %cmake -DGRAPHITE2_COMPARE_RENDERER=OFF . @@ -69,6 +71,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la %{_libdir}/pkgconfig/graphite2.pc %changelog +* Tue Apr 3 2012 Peter Robinson - 1.1.1-2 +- Fix FTBFS on ARM * Wed Feb 27 2012 Nicholas van Oudtshoorn - 1.1.1-1 - New upstream release * Wed Feb 8 2012 Nicholas van Oudtshoorn - 1.1.0-1