- updated to 1.2.11

- removed obsolete pmake patch
- added gettext patch (gettext 0.20+ support)
- added info patch (unify direntry)
- separate -gui

diff --git a/mdk-gettext.patch b/mdk-gettext.patch
new file mode 100644 (file)
index 0000000..764cc39
--- /dev/null
+++ b/mdk-gettext.patch
@@ -0,0 +1,30 @@
+--- mdk-1.2.11/configure.ac.orig       2020-10-15 21:58:38.000000000 +0200
++++ mdk-1.2.11/configure.ac    2020-10-18 18:32:15.247240156 +0200
+@@ -41,7 +41,7 @@
+ 
+ dnl i18n stuff
+ AM_GNU_GETTEXT_VERSION(0.14)
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ AC_PROG_INTLTOOL([0.37], [no-xml])
+ 
+ GETTEXT_PACKAGE=mdk
+@@ -162,7 +162,6 @@
+ samples/Makefile
+ samples/tests/Makefile
+ po/Makefile.in
+-intl/Makefile
+ ])
+ 
+ AC_OUTPUT
+--- mdk-1.2.11/Makefile.am.orig        2015-11-16 23:32:29.000000000 +0100
++++ mdk-1.2.11/Makefile.am     2020-10-18 18:52:32.147314309 +0200
+@@ -12,7 +12,7 @@
+ 
+ EXTRA_DIST = config.rpath ABOUT-NLS intltool-extract.in intltool-merge.in \
+              autogen.sh intltool-update.in ChangeLog.1 ChangeLog.2
+-SUBDIRS = po intl doc lib mixlib mixguile mixutils mixgtk misc samples
++SUBDIRS = po doc lib mixlib mixguile mixutils mixgtk misc samples
+ 
+ distclean-local:
+       rm -f intltool-extract

diff --git a/mdk-info.patch b/mdk-info.patch
new file mode 100644 (file)
index 0000000..141be84
--- /dev/null
+++ b/mdk-info.patch
@@ -0,0 +1,14 @@
+--- mdk-1.2.11/doc/mdk.texi.orig       2015-12-23 19:36:36.000000000 +0100
++++ mdk-1.2.11/doc/mdk.texi    2020-10-18 19:23:14.597332901 +0200
+@@ -37,9 +37,9 @@
+ @end quotation
+ @end copying
+ 
+-@dircategory GNU programming tools
++@dircategory Programming tools:
+ @direntry
+-* MDK: (mdk).           The GNU MIX Development Kit.
++* MDK: (mdk).                         The GNU MIX Development Kit
+ @end direntry
+ 
+ 

diff --git a/mdk-pmake.patch b/mdk-pmake.patch
deleted file mode 100644 (file)
index 55ee6c2..0000000
--- a/mdk-pmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mdk-1.2.4/mixguile/Makefile.am.orig        2008-03-20 14:44:32.000000000 +0100
-+++ mdk-1.2.4/mixguile/Makefile.am     2008-03-22 19:49:00.082002957 +0100
-@@ -31,7 +31,7 @@
- bin_PROGRAMS = mixguile
- mixguile_LDADD = $(top_builddir)/mixlib/libmix.a \
-                  $(top_builddir)/lib/libreplace.a \
--                 $(top_builddir)/mixguile/libmixguile.a $(INTLLIBS)
-+                 libmixguile.a $(INTLLIBS)
- mixguile_SOURCES = mixguile_main.c
- 
- else

diff --git a/mdk.spec b/mdk.spec
index d9e8f2dfbf9c58ec96a0ff6195f2c9cb76c8f7fb..736678160b19df83127cb159f14d6f853d66f0ef 100644 (file)
--- a/mdk.spec
+++ b/mdk.spec
@@ -1,28 +1,37 @@
-# TODO: separate gmixvm
+#
+# Conditional build:
+%bcond_without gui     # GUI (gmixvm)
+
 Summary:       GNU MIX Development Kit
 Summary(pl.UTF-8):     GNU MIX Development Kit - zestaw programistyczny dla języka MIXAL
 Name:          mdk
-Version:       1.2.4
-Release:       0.1
+Version:       1.2.11
+Release:       1
 License:       GPL v2
 Group:         Applications
-Source0:       http://ftp.gnu.org/gnu/mdk/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a1dd320fa5f8a791db7e66155200ee55
-Patch0:                %{name}-pmake.patch
+Source0:       https://ftp.gnu.org/gnu/mdk/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 5598a4c20a0c5c670e25a7bbda6d8f3e
+Patch0:                %{name}-gettext.patch
+Patch1:                %{name}-info.patch
 URL:           http://www.gnu.org/software/mdk/mdk.html
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: flex >= 2.5
 BuildRequires: gettext-tools >= 0.14
-BuildRequires: glib2-devel >= 2.0
-BuildRequires: guile-devel
-BuildRequires: intltool >= 0.30
-BuildRequires: libglade2-devel >= 2.0.0
+BuildRequires: glib2-devel >= 1:2.4.0
+# 2.0, 2.2 or 3.0
+BuildRequires: guile-devel >= 2.0
+BuildRequires: intltool >= 0.37
+BuildRequires: ncurses-devel
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
-# for GUI
+BuildRequires: texinfo
+%if %{with gui}
 BuildRequires: gtk+2-devel >= 2:2.6.0
-BuildRequires: libglade2-devel >= 1:2.0.0
+BuildRequires: libglade2-devel >= 1:2.4.0
 BuildRequires: pango-devel >= 1:1.4
+%endif
+Requires:      glib2 >= 1:2.4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,18 +62,36 @@ interfejs GTK+ do mixvm o nazwie gmixvm; a dla emacsowców istnieje
 tryb Emacsa pozwalający na uruchomienie mixvm wewnątrz bufora GUD
 Emacsa.
 
+%package gui
+Summary:       gmixvm - GUI for mixvm (MIX virtual machine)
+Summary(pl.UTF-8):     gmixvm - GUI do mixvm (maszyny wirtualnej MIX)
+Group:         X11/Applications
+Requires:      %{name} = %{version}-%{release}
+Requires:      gtk+2 >= 2:2.6.0
+Requires:      libglade2 >= 1:2.4.0
+Requires:      pango >= 1:1.4
+
+%description gui
+gmixvm - GUI for mixvm (MIX virtual machine).
+
+%description gui -l pl.UTF-8
+gmixvm - GUI do mixvm (maszyny wirtualnej MIX).
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__gettextize}
+%{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       %{!?with_gui:--disable-gui}
+
 %{__make}
 
 ln -s doc/img
@@ -77,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
-rm img/Makefile*
+%{__rm} img/Makefile*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,8 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc doc/mdk.html doc/img AUTHORS ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/gmixvm
+%doc AUTHORS ChangeLog NEWS README THANKS doc/{img,mdk.html}
 %attr(755,root,root) %{_bindir}/mixasm
 %attr(755,root,root) %{_bindir}/mixguile
 %attr(755,root,root) %{_bindir}/mixvm
@@ -99,5 +125,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/mixal-mode.el
 %{_datadir}/%{name}/mixvm.el
 %{_datadir}/%{name}/mixguile*.scm
-%{_datadir}/%{name}/mixgtk.glade
 %{_infodir}/mdk.info*
+
+%if %{with gui}
+%files gui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gmixvm
+%{_datadir}/%{name}/mixgtk.glade
+%endif