diff --git a/.gitignore b/.gitignore index 3891d7d..032a4a3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /graphite2-1.0.3.tgz /graphite2-1.1.0.tgz /graphite2-1.1.1.tgz +/graphite2-1.2.0.tgz diff --git a/graphite-arm-nodefaultlibs.patch b/graphite-arm-nodefaultlibs.patch index 1635909..e698137 100644 --- a/graphite-arm-nodefaultlibs.patch +++ b/graphite-arm-nodefaultlibs.patch @@ -1,11 +1,12 @@ ---- 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 @@ +--- graphite2-1.2.0/src/CMakeLists.txt.orig 2012-11-09 17:48:04.908391335 +0800 ++++ graphite2-1.2.0/src/CMakeLists.txt 2012-11-09 17:48:48.647102280 +0800 +@@ -109,7 +109,7 @@ if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") - target_link_libraries(graphite2 "-lkernel32 -lmsvcr90 -lmingw32 -lgcc -luser32") + target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32) else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") -- target_link_libraries(graphite2 "-lc -lgcc") -+ target_link_libraries(graphite2 "-lc -lgcc_s") +- target_link_libraries(graphite2 c gcc) ++ target_link_libraries(graphite2 c gcc_s) include(Graphite) nolib_test(stdc++ $) endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") + diff --git a/graphite2.spec b/graphite2.spec index d2452d2..75d2984 100644 --- a/graphite2.spec +++ b/graphite2.spec @@ -1,6 +1,6 @@ Name: graphite2 -Version: 1.1.1 -Release: 4%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Font rendering capabilities for complex non-Roman writing systems Group: Development/Tools @@ -58,7 +58,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la %defattr(-,root,root,-) %doc LICENSE COPYING ChangeLog doc/manual.html %{_bindir}/gr2fonttest -%{_libdir}/libgraphite2.so.2.0.0 +%{_libdir}/libgraphite2.so.3.0.1 %files devel %defattr(-,root,root,-) @@ -68,9 +68,12 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la %{_datadir}/%{name}/graphite2.cmake %{_includedir}/%{name} %{_libdir}/libgraphite2.so +%{_libdir}/libgraphite2.so.3 %{_libdir}/pkgconfig/graphite2.pc %changelog +* Fri Nov 9 2012 Nicholas van Oudtshoorn - 1.2.0-1 +- New upstream release * Wed Oct 3 2012 Caolán McNamara - 1.1.1-4 - expand license field to cover tri-licenced GrUtfTextSrc test * Thu Jul 19 2012 Fedora Release Engineering - 1.1.1-3 diff --git a/sources b/sources index 01f2a31..1c65143 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ d2470967db5cdc6c04468950e423e9df graphite2-1.1.1.tgz +f5ef3f7f10fa8c3542c6a085a233080b graphite2-1.2.0.tgz