rpms/mathmap/devel .cvsignore, 1.2, 1.3 mathmap.spec, 1.3, 1.4 sources, 1.2, 1.3

[Robin Norwood]

Author: rnorwood

Update of /cvs/pkgs/rpms/mathmap/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9010

Modified Files:
	.cvsignore mathmap.spec sources 
Log Message:
New version of MathMap.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mathmap/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 May 2008 21:35:08 -0000	1.2
+++ .cvsignore	8 Jun 2010 16:00:13 -0000	1.3
@@ -1 +1,3 @@
-mathmap-1.2.4.tar.gz
+mathmap-1.3.5.tar.gz
+mathmap-system-libnoise.patch
+mathmap-vanilla-libnoise.patch


Index: mathmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mathmap/devel/mathmap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mathmap.spec	25 Jul 2009 11:49:27 -0000	1.3
+++ mathmap.spec	8 Jun 2010 16:00:13 -0000	1.4
@@ -1,16 +1,20 @@
 %define _plugindir %(gimptool --gimpplugindir)/plug-ins
 %define _mathmapdir %(gimptool --gimpdatadir)/mathmap
-%define _langdir %{_datadir}/gtksourceview-1.0/language-specs
+%define _langdir %{_datadir}/gtksourceview-2.0/language-specs
 
 Name:           mathmap
-Version:        1.2.4
-Release:        6%{?dist}
-Summary:        MathMap GIMP Plug-In and Command-Line Tool
+Version:        1.3.5
+Release:        1%{?dist}
+Summary:        GIMP Plug-In and Command-Line Tool
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.complang.tuwien.ac.at/schani/mathmap/
 Source:         http://www.complang.tuwien.ac.at/schani/mathmap/files/%{name}-%{version}.tar.gz
+# The upstream mathmap uses a patched, statically linked version of
+# libnoise.  Use the system version of libnoise.
+Patch0:         mathmap-system-libnoise.patch
+Patch1:         mathmap-vanilla-libnoise.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpng-devel
@@ -19,10 +23,14 @@ BuildRequires:  giflib-devel
 BuildRequires:  gsl-devel
 BuildRequires:  gimp
 BuildRequires:  gimp-devel
-BuildRequires:  gtksourceview-devel
-BuildRequires:  lynx
+BuildRequires:  gimp-devel-tools
+BuildRequires:  gtksourceview2-devel
+BuildRequires:  doxygen
+BuildRequires:  fftw3-devel
+BuildRequires:  gettext
+BuildRequires:  libnoise-devel
 
-Requires:	gimp
+Requires:       gimp
 
 
 %description
@@ -35,10 +43,8 @@ generate pixels completely independent o
 
 %prep
 %setup -q
-
-%{__perl} -pi -e 's|^LOCALEDIR = .*$|LOCALEDIR = %{_datadir}/locale|' Makefile
-%{__perl} -pi -e 's|^OPT_CFLAGS :=.*$|OPT_CFLAGS := %{optflags}|' Makefile
-
+%patch0 -p0
+%patch1 -p1
 
 %build
 make %{?_smp_mflags}
@@ -46,42 +52,29 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-## FIXME: make install from upstream package doesn't support DESTDIR
-#make install DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT/%{_bindir}
-install -d $RPM_BUILD_ROOT/%{_plugindir}
-install -d $RPM_BUILD_ROOT/%{_mathmapdir}
-install -d $RPM_BUILD_ROOT/%{_langdir}
-install -p -m 755 mathmap $RPM_BUILD_ROOT/%{_bindir}/mathmap
-ln -s ../../../../bin/mathmap $RPM_BUILD_ROOT/%{_plugindir}/mathmap
-
-# These next two lines generate rpmlint warnings because they install
-# 'devel' files, but apparently are required at runtime because of the
-# way gimp/blender plugins work.
-install -p -m 644 new_template.c opmacros.h lispreader/pools.h $RPM_BUILD_ROOT/%{_mathmapdir}/
-install -p -m 644 generators/blender/blender_template.c generators/blender/blender_opmacros.h $RPM_BUILD_ROOT/%{_mathmapdir}/
-
-install -p -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_mathmapdir}/
-install -p -m 644 mathmap.lang $RPM_BUILD_ROOT/%{_langdir}/
-cp -p -r examples $RPM_BUILD_ROOT/%{_mathmapdir}/expressions
-%{_fixperms} $RPM_BUILD_ROOT/*
+make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc ANNOUNCEMENT COPYING README
+%doc ANNOUNCEMENT COPYING README README.filters README.git
 %{_bindir}/mathmap
 %{_plugindir}/mathmap
 %{_langdir}/mathmap.lang
 %{_mathmapdir}
+%{_datadir}/locale/*/LC_MESSAGES/mathmap.mo
 
 
 %changelog
+* Fri Jun  7 2010 Robin Norwood <robin.norwood at gmail.com> - 1.3.5-1
+- Update for new release.
+- Use system libnoise instead of statically linked version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -98,6 +91,6 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Feb  7 2008 Robin Norwood <rnorwood at redhat.com> - 1.2.4-2
 - Update with fixes from package review
- 
+
 * Thu Jan 31 2008 Robin Norwood <rnorwood at redhat.com> - 1.2.4-1
 - Initial build based upon spec by Mark Probst <schani at complang.tuwien.ac.at>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mathmap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 May 2008 21:35:08 -0000	1.2
+++ sources	8 Jun 2010 16:00:13 -0000	1.3
@@ -1 +1,3 @@
-e2e6e14349f7a8ca0b02217364f744af  mathmap-1.2.4.tar.gz
+6ff66d070ea410dee1a27283d05b8beb  mathmap-1.3.5.tar.gz
+29c3abf144de5b528f56d223f16690c0  mathmap-system-libnoise.patch
+ecc3a17ac82092d7479d79d2ad7f9c7a  mathmap-vanilla-libnoise.patch