[mikmod] New upstream and new upstream release 3.2.3
Hans de Goede
jwrdegoede at fedoraproject.org
Mon Oct 14 13:57:07 UTC 2013
commit be25a833f8e5ab21727c382139cf45f0e72dafd6
Author: Hans de Goede <hdegoede at redhat.com>
Date: Mon Oct 14 15:57:00 2013 +0200
New upstream and new upstream release 3.2.3
- Drop a bunch of merged patches
.gitignore | 1 +
mikmod-3.2.2-beta1-missing-protos.patch | 11 --------
mikmod-3.2.2-beta1-various-fixes.patch | 26 +++++--------------
mikmod.spec | 42 ++++++++++++------------------
sources | 2 +-
5 files changed, 26 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 89775e8..6a5d2da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/mikmod-3.2.2.tar.gz
+/mikmod-3.2.3.tar.gz
diff --git a/mikmod-3.2.2-beta1-various-fixes.patch b/mikmod-3.2.2-beta1-various-fixes.patch
index 8af5e52..815623d 100644
--- a/mikmod-3.2.2-beta1-various-fixes.patch
+++ b/mikmod-3.2.2-beta1-various-fixes.patch
@@ -1,6 +1,6 @@
-diff -up mikmod-3.2.2-beta1/src/display.c.fixes mikmod-3.2.2-beta1/src/display.c
---- mikmod-3.2.2-beta1/src/display.c.fixes 2004-02-02 02:35:52.000000000 +0100
-+++ mikmod-3.2.2-beta1/src/display.c 2010-12-01 13:21:15.577961463 +0100
+diff -up mikmod-3.2.3/src/display.c~ mikmod-3.2.3/src/display.c
+--- mikmod-3.2.3/src/display.c~ 2004-02-02 02:35:52.000000000 +0100
++++ mikmod-3.2.3/src/display.c 2013-10-14 15:35:53.824048342 +0200
@@ -1336,11 +1336,7 @@ static void set_window_title(char *conte
}
else
@@ -14,7 +14,7 @@ diff -up mikmod-3.2.2-beta1/src/display.c.fixes mikmod-3.2.2-beta1/src/display.c
}
if ( strcmp(env_term, "xterm")==0 ||
-@@ -1360,8 +1356,8 @@ static void set_window_title(char *conte
+@@ -1360,8 +1360,8 @@ static void set_window_title(char *conte
}
else if (strcmp(env_term, "hpterm")==0)
{
@@ -25,21 +25,9 @@ diff -up mikmod-3.2.2-beta1/src/display.c.fixes mikmod-3.2.2-beta1/src/display.c
}
#endif
}
-diff -up mikmod-3.2.2-beta1/src/marchive.c.fixes mikmod-3.2.2-beta1/src/marchive.c
---- mikmod-3.2.2-beta1/src/marchive.c.fixes 2004-02-01 17:31:16.000000000 +0100
-+++ mikmod-3.2.2-beta1/src/marchive.c 2010-12-01 13:21:15.577961463 +0100
-@@ -294,7 +294,7 @@ static char* get_command (char *pattern,
- arg[i] = arc;
- break;
- case 'a':
-- filename2short (arc, buf, PATH_MAX);
-+ filename2short (arc, buf, PATH_MAX-1);
- arg[i] = buf;
- break;
- case 'f':
-diff -up mikmod-3.2.2-beta1/src/mikmod.c.fixes mikmod-3.2.2-beta1/src/mikmod.c
---- mikmod-3.2.2-beta1/src/mikmod.c.fixes 2004-01-30 19:01:40.000000000 +0100
-+++ mikmod-3.2.2-beta1/src/mikmod.c 2010-12-01 13:22:20.597190154 +0100
+diff -up mikmod-3.2.3/src/mikmod.c~ mikmod-3.2.3/src/mikmod.c
+--- mikmod-3.2.3/src/mikmod.c~ 2004-01-30 19:01:40.000000000 +0100
++++ mikmod-3.2.3/src/mikmod.c 2013-10-14 15:37:07.021045305 +0200
@@ -775,7 +775,7 @@ static BOOL player_timeout (MWINDOW *win
if (!status.listend) {
diff --git a/mikmod.spec b/mikmod.spec
index ff77b4c..596b66a 100644
--- a/mikmod.spec
+++ b/mikmod.spec
@@ -1,15 +1,13 @@
-Summary: Music module player
-Name: mikmod
-Version: 3.2.2
-Release: 22%{?dist}
-License: GPLv2 and LGPLv2+
-Group: Applications/Multimedia
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel libmikmod-devel
-URL: http://mikmod.raphnet.net/
-Source0: http://mikmod.raphnet.net/files/mikmod-%{version}.tar.gz
-Patch0: mikmod-3.2.2-beta1-missing-protos.patch
-Patch1: mikmod-3.2.2-beta1-various-fixes.patch
+Name: mikmod
+Version: 3.2.3
+Release: 1%{?dist}
+Summary: Console music module player
+Group: Applications/Multimedia
+License: GPLv2 and LGPLv2+
+URL: http://mikmod.sourceforge.net/
+Source0: http://downloads.sourceforge.net/mikmod/%{name}-%{version}.tar.gz
+Patch0: mikmod-3.2.2-beta1-various-fixes.patch
+BuildRequires: ncurses-devel libmikmod-devel
%description
MikMod is one of the best and most well known MOD music file players
@@ -27,29 +25,19 @@ Install the mikmod package if you need a MOD music file player.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1 -b .various-fixes
%build
-%ifarch s390 s390x %{arm}
-export LIBS="-lm"
-%endif
%configure
-make CFLAGS="$RPM_OPT_FLAGS `libmikmod-config --cflags`"
+make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%make_install INSTALL="install -p"
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README
%{_bindir}/mikmod
%{_datadir}/mikmod
@@ -57,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 14 2013 Hans de Goede <hdegoede at redhat.com> - 3.2.3-1
+- New upstream and new upstream release 3.2.3
+- Drop a bunch of merged patches
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -279,7 +271,7 @@ rm -rf $RPM_BUILD_ROOT
* Mon Feb 15 1999 Miodrag Vallat <miodrag at multimania.com>
- Created for 3.1.5
-* Tue Jan 24 1999 Michael Maher <mike at redhat.com>
+* Sun Jan 24 1999 Michael Maher <mike at redhat.com>
- changed group
- fixed bug #145
diff --git a/sources b/sources
index 9211a96..24fcca1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6b35d01b6d72c0a7cb94961efe01218 mikmod-3.2.2.tar.gz
+d5de6970d697dddf558695d0f946511f mikmod-3.2.3.tar.gz
More information about the scm-commits
mailing list