[TeXmacs] update to 1.0.7.16 (#895930)

Jindrich Novy jnovy at fedoraproject.org
Sun Jan 20 10:34:44 UTC 2013


commit 77c10dba01a83562d2f92ea993a5a1b9872cbcd6
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Sun Jan 20 11:34:30 2013 +0100

    update to 1.0.7.16 (#895930)

 .gitignore                  |    2 +-
 TeXmacs-CVE-2010-3394.patch |   30 ------------------------------
 TeXmacs.spec                |   19 ++++++++++++++-----
 sources                     |    2 +-
 4 files changed, 16 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 061c8e4..83712bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/TeXmacs-1.0.7.11-src.tar.gz
+/TeXmacs-1.0.7.16-src.tar.gz
diff --git a/TeXmacs.spec b/TeXmacs.spec
index 82cfc64..b9e9547 100644
--- a/TeXmacs.spec
+++ b/TeXmacs.spec
@@ -1,6 +1,6 @@
 Name:		TeXmacs
-Version:	1.0.7.11
-Release:	3%{?dist}
+Version:	1.0.7.16
+Release:	1%{?dist}
 Summary:	Structured WYSIWYG scientific text editor
 
 Group:		Applications/Editors
@@ -10,7 +10,6 @@ Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-%{version}-src.tar.gz
 Patch1:		TeXmacs-1.6.0.7-rdelim.patch
 Patch2:		TeXmacs-psfix.patch
 Patch3:		TeXmacs-util_h.patch
-Patch4:		TeXmacs-CVE-2010-3394.patch
 Requires:	tex(tex)
 Requires:	ghostscript
 Requires:	texmacs-fedora-fonts = %{version}-%{release}
@@ -28,6 +27,7 @@ BuildRequires:	libXmu-devel
 BuildRequires:	libXrender-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libtool-ltdl-devel
+BuildRequires:	qt-devel
 Provides:	texmacs = %{version}-%{release}
 Requires:	fig2ps
 Requires(post):	shared-mime-info, desktop-file-utils
@@ -74,12 +74,14 @@ TeXmacs font.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 sed -i "s|5\.14\.\*|5.15.*|" plugins/maxima/bin/tm_maxima
 
 
 %build
+export QMAKE=/usr/lib64/qt4/bin/qmake-qt4
+export MOC=/usr/lib64/qt4/bin/moc-qt4
+export UIC=/usr/lib64/qt4/bin/uic-qt4
 %configure --enable-optimize="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
@@ -164,6 +166,8 @@ for i in `ls *.pfb`; do
 	ln -s %{_fontdir}/$i %{buildroot}%{_datadir}/TeXmacs/fonts/type1/math/$i
 done
 popd
+rm -f $RPM_BUILD_ROOT/usr/libexec/TeXmacs/bin/maxima_filter
+rm -f $RPM_BUILD_ROOT%{_datadir}/icons/gnome/icon-theme.cache
 %_font_pkg -n fedora *
 
 
@@ -189,9 +193,11 @@ popd
 %{_datadir}/application-registry/*
 %{_datadir}/mime-info/*
 %{_datadir}/mime/packages/*
+%{_datadir}/mime/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-text-texmacs.xpm
-
+%{_datadir}/icons/gnome/scalable/apps/TeXmacs.svg
+%{_datadir}/icons/gnome/scalable/mimetypes/text-texmacs.svg
 
 %files devel
 %defattr(-,root,root,-)
@@ -208,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jan 20 2013 Jindrich Novy <jnovy at redhat.com> - 1.0.7.16-1
+- update to 1.0.7.16 (#895930)
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 21fab27..8ab61cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2694269a47190fa681781203428ce94  TeXmacs-1.0.7.11-src.tar.gz
+f31c39b8991cb1c147113435615bc68a  TeXmacs-1.0.7.16-src.tar.gz


More information about the scm-commits mailing list