[gtkmathview] fix FTBFS, update SPEC
Peter Robinson
pbrobinson at fedoraproject.org
Sun May 19 17:35:48 UTC 2013
commit e533071f5ffa6bbebf128f0af2473783495198dc
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Sun May 19 18:35:38 2013 +0100
fix FTBFS, update SPEC
gtkmathview.spec | 39 ++++++++++++++++-----------------------
1 files changed, 16 insertions(+), 23 deletions(-)
---
diff --git a/gtkmathview.spec b/gtkmathview.spec
index 9f39745..0900435 100644
--- a/gtkmathview.spec
+++ b/gtkmathview.spec
@@ -1,20 +1,11 @@
Summary: A MathML rendering library
Name: gtkmathview
Version: 0.8.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Group: System Environment/Libraries
License: LGPLv3+
-Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
URL: http://helm.cs.unibo.it/mml-widget/
-BuildRequires: glib2-devel >= 2.2
-BuildRequires: gtk2-devel >= 2.2
-BuildRequires: libxml2-devel >= 2.6.7
-BuildRequires: libxslt >= 1.0.32
-BuildRequires: popt >= 1.7
-BuildRequires: popt-devel >= 1.7
-BuildRequires: t1lib-devel
-BuildRequires: libtool
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
Patch0: gtkmathview-0.8.0-gcc43.patch
Patch1: gtkmathview-0.8.0-includes.patch
@@ -27,13 +18,17 @@ Patch12: gtkmathview-lowercasegreek-gitb03152.patch
Patch20: gtkmathview-0.8.0-gcc47.patch
-# these are currently f12+ only, but will propogate back to earlier
-# branches soonish -- Rex
-%if 0%{?fedora} > 11
+BuildRequires: glib2-devel >= 2.2
+BuildRequires: gtk2-devel >= 2.2
+BuildRequires: libtool
+BuildRequires: libxml2-devel >= 2.6.7
+BuildRequires: libxslt >= 1.0.32
+BuildRequires: pangox-compat-devel
+BuildRequires: pkgconfig
+BuildRequires: popt >= 1.7
+BuildRequires: popt-devel >= 1.7
+BuildRequires: t1lib-devel
Requires: lyx-fonts
-%else
-Requires: mathml-fonts
-%endif
%description
GtkMathView is a C++ rendering engine for MathML documents.
@@ -73,7 +68,6 @@ autoreconf -if
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
%install
-rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -82,7 +76,6 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/mathml2ps.1
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/mathmlviewer.1
%files
-%defattr(-,root,root)
%doc COPYING README AUTHORS CONTRIBUTORS BUGS LICENSE
%{_bindir}/*
%{_libdir}/lib*.so.*
@@ -90,7 +83,6 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/mathmlviewer.1
%{_datadir}/gtkmathview/
%files devel
-%defattr(-,root,root)
%{_libdir}/*.so
%{_libdir}/pkgconfig/mathview-core.pc
%{_libdir}/pkgconfig/mathview-frontend-libxml2.pc
@@ -108,10 +100,11 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/mathmlviewer.1
%postun -p /sbin/ldconfig
-%clean
-rm -r $RPM_BUILD_ROOT
-
%changelog
+* Sun May 19 2013 Peter Robinson <pbrobinson at fedoraproject.org> 0.8.0-12
+- fix FTBFS
+- Update SPEC
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list