diff --git a/graphite2.spec b/graphite2.spec
index 75d2984..c730e12 100644
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -1,17 +1,25 @@
Name: graphite2
-Version: 1.2.0
-Release: 1%{?dist}
+Version: 1.1.1
+Release: 4%{?dist}
Summary: Font rendering capabilities for complex non-Roman writing systems
Group: Development/Tools
-License: LGPLv2+ and (Netscape or GPLv2 or LGPLv2)
+License: LGPLv2+
URL: http://sourceforge.net/projects/silgraphite/
Source0: http://downloads.sourceforge.net/silgraphite/graphite2-%{version}.tgz
Patch0: graphite-arm-nodefaultlibs.patch
BuildRequires: cmake
BuildRequires: freetype-devel
-BuildRequires: doxygen,tex(latex),asciidoc
+BuildRequires: doxygen asciidoc
+BuildRequires: texlive-collection-latexextra
+BuildRequires: tex(latex)
+BuildRequires: tex(phvr8t.tfm)
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(xtab.sty)
+BuildRequires: tex(tocloft.sty)
+BuildRequires: tex(sectsty.sty)
+BuildRequires: texlive-helvetic
Obsoletes: silgraphite < 2.3.1-5
@@ -41,6 +49,11 @@ Includes and definitions for developing with graphite2.
%cmake -DGRAPHITE2_COMPARE_RENDERER=OFF .
make %{?_smp_mflags}
make docs
+sed -i -e 's!!!g' doc/manual.html
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
%check
ctest
@@ -49,35 +62,29 @@ 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
+%{_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
%{_includedir}/%{name}
%{_libdir}/libgraphite2.so
-%{_libdir}/libgraphite2.so.3
%{_libdir}/pkgconfig/graphite2.pc
%changelog
-* Fri Nov 9 2012 Nicholas van Oudtshoorn - 1.2.0-1
-- New upstream release
-* Wed Oct 3 2012 Caolán McNamara - 1.1.1-4
-- expand license field to cover tri-licenced GrUtfTextSrc test
+* Tue Jan 29 2013 Parag Nemade - 1.1.1-4
+- spec file cleanup
+- thanks to jnovy for finding me minimum texlive BR
+- partial multilib fix for manual.html
+
* Thu Jul 19 2012 Fedora Release Engineering - 1.1.1-3
- 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