[TeXmacs] update to 1.0.7.9

[Jindrich Novy]

commit 690848826e7aa225ed5cce9d693e44a7e304eccc
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Thu Feb 10 09:51:19 2011 +0100

    update to 1.0.7.9

 .gitignore           |    2 +-
 TeXmacs-util_h.patch |   13 +++++++++++++
 TeXmacs.spec         |   34 ++++++++++++++++++++++------------
 sources              |    2 +-
 4 files changed, 37 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cefeab4..0aa5c91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-TeXmacs-1.0.7.2-src.tar.gz
+/TeXmacs-1.0.7.9-src.tar.gz
diff --git a/TeXmacs-util_h.patch b/TeXmacs-util_h.patch
new file mode 100644
index 0000000..b326258
--- /dev/null
+++ b/TeXmacs-util_h.patch
@@ -0,0 +1,13 @@
+diff -up TeXmacs-1.0.7.9-src/plugins/r/src/tm_r.c.util_h TeXmacs-1.0.7.9-src/plugins/r/src/tm_r.c
+--- TeXmacs-1.0.7.9-src/plugins/r/src/tm_r.c.util_h	2010-12-17 20:13:17.000000000 +0100
++++ TeXmacs-1.0.7.9-src/plugins/r/src/tm_r.c	2011-02-10 09:44:06.575895914 +0100
+@@ -21,7 +21,9 @@
+ #include <stdlib.h>
+ #include <signal.h>
+ #include <string.h>
++#ifdef HAVE_UTIL_H
+ #include <util.h>
++#endif
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/TeXmacs.spec b/TeXmacs.spec
index 3494a65..527f272 100644
--- a/TeXmacs.spec
+++ b/TeXmacs.spec
@@ -1,21 +1,20 @@
 Name:		TeXmacs
-Version:	1.0.7.2
-Release:	3%{?dist}
-Summary:	Structured wysiwyg scientific text editor
+Version:	1.0.7.9
+Release:	1%{?dist}
+Summary:	Structured WYSIWYG scientific text editor
 
 Group:		Applications/Editors
 License:	GPLv2+
 URL:		http://www.texmacs.org
 Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-%{version}-src.tar.gz
-Patch5:         TeXmacs-1.6.0.7-rdelim.patch
-Patch7:         TeXmacs-psfix.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	tetex
-Requires:	tetex-fonts
+Patch1:         TeXmacs-1.6.0.7-rdelim.patch
+Patch2:         TeXmacs-psfix.patch
+Patch3:         TeXmacs-util_h.patch
+Requires:	tex(tex)
 Requires:	ghostscript
 BuildRequires:	guile-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	tetex
+BuildRequires:	tex(tex)
 BuildRequires:  freetype-devel
 BuildRequires:  libICE-devel
 BuildRequires:  libSM-devel
@@ -35,7 +34,7 @@ Requires(postun): shared-mime-info, desktop-file-utils
 %description
 GNU TeXmacs is a free scientific text editor, which was both inspired
 by TeX and GNU Emacs. The editor allows you to write structured
-documents via a wysiwyg (what-you-see-is-what-you-get) and user
+documents via a WYSIWYG (what-you-see-is-what-you-get) and user
 friendly interface.  New styles may be created by the user. The
 program implements high-quality typesetting algorithms and TeX fonts,
 which help you to produce professionally looking documents.
@@ -62,8 +61,9 @@ Development files required to create TeXmacs plugins.
 
 %prep
 %setup -q -n TeXmacs-%{version}-src
-%patch5 -p1
-%patch7 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 sed -i "s|5\.14\.\*|5.15.*|" plugins/maxima/bin/tm_maxima
 
@@ -123,6 +123,9 @@ desktop-file-install --vendor fedora \
     --add-category WordProcessor \
     --add-category Math \
     --add-category TextEditor \
+    --add-category Utility \
+    --add-category Education \
+    --add-category Science \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     texmacs.desktop
 
@@ -170,6 +173,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 10 2011 Jindrich Novy <jnovy at redhat.com> - 1.0.7.9-1
+- update to 1.0.7.9 (#593625)
+- fix Requires
+- fix build -> broken util.h usage
+- fix desktop categories
+- remove BuildRoot
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 6892d84..4fcd472 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f40bededefc44e8927455efe0358780  TeXmacs-1.0.7.2-src.tar.gz
+255d64ebdd900218c091667643f06e44  TeXmacs-1.0.7.9-src.tar.gz