New upstream release

This commit is contained in:
Nicholas van Oudtshoorn 2014-04-03 17:12:07 +08:00
parent c453b0aaba
commit ad619a3564
4 changed files with 14 additions and 6 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/graphite2-1.1.1.tgz
/graphite2-1.2.0.tgz
/graphite2-1.2.2.tgz
/graphite2-1.2.4.tgz

View File

@ -1,10 +1,14 @@
--- 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 @@
@@ -118,11 +118,7 @@
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
- target_link_libraries(graphite2 c gcc)
- if (GRAPHITE2_ASAN)
- target_link_libraries(graphite2 c gcc_s)
- else (GRAPHITE2_ASAN)
- target_link_libraries(graphite2 c gcc)
- endif (GRAPHITE2_ASAN)
+ target_link_libraries(graphite2 c gcc_s)
include(Graphite)
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)

View File

@ -1,6 +1,6 @@
Name: graphite2
Version: 1.2.2
Release: 5%{?dist}
Version: 1.2.4
Release: 1%{?dist}
Summary: Font rendering capabilities for complex non-Roman writing systems
Group: Development/Tools
@ -41,7 +41,7 @@ Includes and definitions for developing with graphite2.
%patch1 -p1 -b .cmake
%build
%cmake -DGRAPHITE2_COMPARE_RENDERER=OFF .
%cmake -DGRAPHITE2_COMPARE_RENDERER=OFF .
make %{?_smp_mflags}
make docs
sed -i -e 's!<a id="id[a-z]*[0-9]*"></a>!!g' doc/manual.html
@ -73,6 +73,9 @@ ctest
%{_libdir}/pkgconfig/graphite2.pc
%changelog
* Thu Apr 03 2014 Nicholas van Oudtshoorn <vanoudt@gmail.com> - 1.2.4-1
- New upstream release
* Sat Dec 21 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.2.2-5
- Move *.so.major symlink to main package.

View File

@ -1 +1 @@
4bfd5db6c91a4097cd76a699beaca70e graphite2-1.2.2.tgz
2ef839348fe28e3b923bf8cced440227 graphite2-1.2.4.tgz