[graphite2/f18] multilib fix

[paragn]

commit 25bd63241261fb66c28d1ce47ff89f9337c2dd5c
Author: Parag Nemade <pnemade at redhat.com>
Date:   Tue Jan 29 18:41:13 2013 +0530

    multilib fix
    
    - spec file cleanup

 graphite2-1.1.1-cmakepath.patch |    9 +++++++++
 graphite2.spec                  |   28 +++++++++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)
---
diff --git a/graphite2-1.1.1-cmakepath.patch b/graphite2-1.1.1-cmakepath.patch
new file mode 100644
index 0000000..6c797f3
--- /dev/null
+++ b/graphite2-1.1.1-cmakepath.patch
@@ -0,0 +1,9 @@
+diff -urN graphite2-1.1.1.orig/src/CMakeLists.txt graphite2-1.1.1/src/CMakeLists.txt
+--- graphite2-1.1.1.orig/src/CMakeLists.txt	2013-01-29 17:22:52.709927086 +0530
++++ graphite2-1.1.1/src/CMakeLists.txt	2013-01-29 17:23:35.232926006 +0530
+@@ -117,4 +117,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 8ada606..3849c0f 100644
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -1,6 +1,6 @@
 Name:           graphite2
 Version:        1.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Font rendering capabilities for complex non-Roman writing systems
 Group:          Development/Tools
 
@@ -8,10 +8,13 @@ License:        LGPLv2+
 URL:            http://sourceforge.net/projects/silgraphite/
 Source0:        http://downloads.sourceforge.net/silgraphite/graphite2-%{version}.tgz
 Patch0:         graphite-arm-nodefaultlibs.patch
+Patch1:         graphite2-1.1.1-cmakepath.patch
 
 BuildRequires:  cmake
 BuildRequires:  freetype-devel
-BuildRequires:  doxygen,tex(latex),asciidoc
+BuildRequires:  doxygen asciidoc
+BuildRequires:  texlive-collection-latexextra
+BuildRequires:  texlive-helvetic
 
 Obsoletes:      silgraphite < 2.3.1-5
 
@@ -36,11 +39,13 @@ Includes and definitions for developing with graphite2.
 %prep
 %setup -q
 %patch0 -p1 -b .arm
+%patch1 -p1 -b .cmake
 
 %build
 %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
 
 %check
 ctest
@@ -50,27 +55,28 @@ ctest
 %postun -p /sbin/ldconfig
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %files
-%defattr(-,root,root,-)
-%doc LICENSE COPYING ChangeLog doc/manual.html
+%doc LICENSE COPYING ChangeLog 
 %{_bindir}/gr2fonttest
 %{_libdir}/libgraphite2.so.2.0.0
 
 %files devel
-%defattr(-,root,root,-)
-%doc doc/doxygen/latex/refman.pdf
-%dir %{_datadir}/%{name}/
-%{_datadir}/%{name}/graphite2-release.cmake
-%{_datadir}/%{name}/graphite2.cmake
+%doc doc/manual.html
+%dir %{_libdir}/%{name}/
+%{_libdir}/%{name}/graphite2-release.cmake
+%{_libdir}/%{name}/graphite2.cmake
 %{_includedir}/%{name}
 %{_libdir}/libgraphite2.so
 %{_libdir}/pkgconfig/graphite2.pc
 
 %changelog
+* Tue Jan 29 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.1.1-4
+- multilib fix
+- spec file cleanup
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild