Merge pull request !6 from shirely/master
This commit is contained in:
openeuler-ci-bot 2020-07-27 21:33:38 +08:00 committed by Gitee
commit 2403dcc7a6
4 changed files with 11 additions and 16 deletions

View File

@ -1,9 +0,0 @@
diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt
--- graphite2-1.2.0.orig/src/CMakeLists.txt 2013-01-29 15:47:32.465841769 +0530
+++ graphite2-1.2.0/src/CMakeLists.txt 2013-01-29 15:48:24.056843352 +0530
@@ -136,4 +136,4 @@
install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
+install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_)

Binary file not shown.

BIN
graphite2-1.3.14.tgz Normal file

Binary file not shown.

View File

@ -1,13 +1,11 @@
Name: graphite2
Version: 1.3.13
Release: 2
Version: 1.3.14
Release: 1
Summary: Graphite provides cross-platform rendering for complex writing systems
License: (LGPLv2+ or GPLv2+ or MPL) and (Netscape or GPLv2+ or LGPLv2+)
URL: https://sourceforge.net/projects/silgraphite/
Source0: https://downloads.sourceforge.net/project/silgraphite/graphite2//%{name}-%{version}.tgz
Patch1: graphite2-1.2.0-cmakepath.patch
Source0: https://downloads.sourceforge.net/project/silgraphite/graphite2/%{name}-%{version}.tgz
BuildRequires: gcc gcc-c++ cmake freetype-devel doxygen asciidoc python-unversioned-command gdb
BuildRequires: texlive-helvetic texlive-sectsty texlive-tocloft texlive-xtab texlive-multirow python3-fonttools
@ -31,7 +29,9 @@ Header files for using the graphite2 libraries.
%build
%cmake -DGRAPHITE2_COMPARE_RENDERER=OFF .
%make_build all docs
%make_build
make docs
%install
%make_install INSTALL="install -p"
@ -64,9 +64,13 @@ ctest
%{_includedir}/graphite2
%{_libdir}/libgraphite2.so
%{_libdir}/pkgconfig/graphite2.pc
%{_libdir}/graphite2/graphite2*.cmake
%{_datadir}/graphite2/graphite2-release.cmake
%{_datadir}/graphite2/graphite2.cmake
%changelog
* Thu Jul 23 2020 hanhui <hanhui15@huawei.com> - 1.3.14-1
- update to 1.3.14
* Fri Mar 20 2020 songnannan <songnannan2@huawei.com> - 1.3.13-2
- add gdb in buildrequires