Browse Source

update to 14.12.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10795 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 7 years ago
parent
commit
6f4cd5a4c4
1 changed files with 34 additions and 18 deletions
  1. 34 18
      w/wxMaxima/wxMaxima-vl.spec

+ 34 - 18
w/wxMaxima/wxMaxima-vl.spec

@@ -1,15 +1,25 @@
 Name: wxMaxima
-Version: 12.04.0
-Release: 2%{?_dist_release}
+Version: 14.12.1
+Release: 1%{?_dist_release}
+
 License: GPL
-Group: Applications/Engineering
-URL: http://wxmaxima.sourceforge.net/
-Source0: %{name}-%{version}.tar.gz
-Patch0: fix_desktop.patch
+Group:   Applications/Engineering
+URL:     http://wxmaxima.sourceforge.net/
+
+Source0: wxmaxima-%{version}.tar.gz
+Patch0:  fix_desktop.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: maxima >= 5.11
 BuildRequires: libxml2-devel, wxGTK-devel, desktop-file-utils
+%if %{?_dist_release} == "vl6"
+BuildRequires: wx-gtk2-devel >= 2.8.4
+%endif
+%if %{?_dist_release} >= "vl7"
+BuildRequires: wxGTK-devel >= 2.8.4
+%endif
+
+Requires: maxima >= 5.11
+
 
 Summary: Graphical user interface for Maxima
 Summary(ja): Maxima のグラフィカルユーザインタフェース
@@ -34,28 +44,28 @@ wxMaxima features include:
    features. Documents can be saved and edited again later.
 
 %prep
-%setup -q
+%setup -q -n wxmaxima-%{version}
 %patch0 -p1
 
 %build
-%configure --enable-dnd --enable-printing
-make
+%{configure} --enable-printing
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%{__rm} -rf %{buildroot}
+%{makeinstall}
 
 desktop-file-install --vendor="" \
-	--dir %{buildroot}%{_datadir}/applications \
-	--add-category="Development" \
-	--add-category="Math" \
-	--remove-category="Utility" \
-	wxmaxima.desktop
+                     --dir %{buildroot}%{_datadir}/applications \
+                     --add-category="Development" \
+                     --add-category="Math" \
+                     --remove-category="Utility" \
+                     wxmaxima.desktop
 
 %find_lang %{name}
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %post
 update-desktop-database -q &> /dev/null
@@ -63,6 +73,7 @@ update-desktop-database -q &> /dev/null
 %postun
 update-desktop-database -q &> /dev/null
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
@@ -71,6 +82,11 @@ update-desktop-database -q &> /dev/null
 %{_datadir}/applications/wxmaxima.desktop
 
 %changelog
+* Sat Nov 05 2016 Toshiaki Ara <ara_t@384.jp> - 14.12.1-1
+- update to 14.12.1
+- delete configure option "--enable-dnd"
+- merge VineSeed and Vine6
+
 * Thu Sep 01 2016 Toshiaki Ara <ara_t@384.jp> - 5.0.1-2
 - rebuild with gcc-5.4.0