diff --git a/graphite2-1.2.0-cmakepath.patch b/graphite2-1.2.0-cmakepath.patch new file mode 100644 index 0000000..ee71cd6 --- /dev/null +++ b/graphite2-1.2.0-cmakepath.patch @@ -0,0 +1,9 @@ +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_) diff --git a/graphite2.spec b/graphite2.spec index 35c1dc0..253653c 100644 --- a/graphite2.spec +++ b/graphite2.spec @@ -1,6 +1,6 @@ Name: graphite2 Version: 1.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Font rendering capabilities for complex non-Roman writing systems Group: Development/Tools @@ -8,6 +8,7 @@ License: LGPLv2+ and (Netscape or GPLv2 or LGPLv2) URL: http://sourceforge.net/projects/silgraphite/ Source0: http://downloads.sourceforge.net/silgraphite/graphite2-%{version}.tgz Patch0: graphite-arm-nodefaultlibs.patch +Patch1: graphite2-1.2.0-cmakepath.patch BuildRequires: cmake BuildRequires: freetype-devel @@ -15,7 +16,6 @@ BuildRequires: doxygen asciidoc BuildRequires: texlive-collection-latexextra BuildRequires: texlive-helvetic - Obsoletes: silgraphite < 2.3.1-5 %description @@ -39,6 +39,7 @@ Includes and definitions for developing with graphite2. %prep %setup -q %patch0 -p1 -b .arm +%patch1 -p1 -b .cmake %build %cmake -DGRAPHITE2_COMPARE_RENDERER=OFF . @@ -46,6 +47,10 @@ make %{?_smp_mflags} make docs sed -i -e 's!!!g' doc/manual.html +%install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la + %check ctest @@ -53,27 +58,26 @@ ctest %postun -p /sbin/ldconfig -%install -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la - %files %doc LICENSE COPYING ChangeLog %{_bindir}/gr2fonttest %{_libdir}/libgraphite2.so.3.0.1 %files devel -%doc doc/doxygen/latex/refman.pdf %doc doc/manual.html -%dir %{_datadir}/%{name}/ -%{_datadir}/%{name}/graphite2-release.cmake -%{_datadir}/%{name}/graphite2.cmake +%dir %{_libdir}/%{name}/ +%{_libdir}/%{name}/graphite2-release.cmake +%{_libdir}/%{name}/graphite2.cmake %{_includedir}/%{name} %{_libdir}/libgraphite2.so %{_libdir}/libgraphite2.so.3 %{_libdir}/pkgconfig/graphite2.pc %changelog +* Tue Jan 29 2013 Parag Nemade - 1.2.0-4 +- Drop refman.pdf as its same as manual.html +- patch install path for cmake files as they are arch dependent + * Tue Jan 29 2013 Kalev Lember - 1.2.0-3 - Move manual.html to -devel subpackage @@ -91,7 +95,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild * 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 +* Mon Feb 27 2012 Nicholas van Oudtshoorn - 1.1.1-1 - New upstream release * Wed Feb 8 2012 Nicholas van Oudtshoorn - 1.1.0-1 - New upstream release