[graphite2] revert the wrongly committed f18 spec to f19

paragn paragn at fedoraproject.org
Tue Jan 29 06:54:09 UTC 2013


commit d09973cbf55a937ec49e856565db29687eaf9b91
Author: Parag Nemade <pnemade at redhat.com>
Date:   Tue Jan 29 12:25:44 2013 +0530

    revert the wrongly committed f18 spec to f19
    
    - spec file cleanup
    - thanks to jnovy for finding me minimum texlive BR
    - partial multilib fix for manual.html

 graphite2.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/graphite2.spec b/graphite2.spec
index 75d2984..9ce1c27 100644
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -1,6 +1,6 @@
 Name:           graphite2
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Font rendering capabilities for complex non-Roman writing systems
 Group:          Development/Tools
 
@@ -11,7 +11,10 @@ Patch0:         graphite-arm-nodefaultlibs.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
 
@@ -41,6 +44,7 @@ Includes and definitions for developing with graphite2.
 %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,18 +54,15 @@ ctest
 %postun -p /sbin/ldconfig
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE COPYING ChangeLog doc/manual.html
 %{_bindir}/gr2fonttest
 %{_libdir}/libgraphite2.so.3.0.1
 
 %files devel
-%defattr(-,root,root,-)
 %doc doc/doxygen/latex/refman.pdf
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/graphite2-release.cmake
@@ -72,6 +73,12 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{_libdir}/pkgconfig/graphite2.pc
 
 %changelog
+* Tue Jan 29 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.2.0-2
+- revert the wrongly committed f18 spec to f19
+- spec file cleanup
+- thanks to jnovy for finding me minimum texlive BR
+- partial multilib fix for manual.html
+
 * Fri Nov 9 2012 Nicholas van Oudtshoorn <vanoudt at gmail.com> - 1.2.0-1
 - New upstream release
 * Wed Oct 3 2012 Caolán McNamara <caolanm at redhat.com> - 1.1.1-4


More information about the scm-commits mailing list