[wildmidi] - New upstream release 0.2.3.4-1
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Sep 12 12:57:12 UTC 2010
commit f22e70159beb20c8d851054b698606cffecbf6ef
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sun Sep 12 14:56:57 2010 +0200
- New upstream release 0.2.3.4-1
.gitignore | 1 +
sources | 2 +-
wildmidi-0.2.2-bigendian.patch | 11 ---
wildmidi-0.2.2-cfg-abs-path.patch | 42 +++--------
wildmidi-0.2.2-opt.patch | 24 ------
wildmidi-0.2.2-pulseaudio.patch | 147 -------------------------------------
wildmidi.spec | 45 ++++++-----
7 files changed, 39 insertions(+), 233 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 928d276..7fa238e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
wildmidi-0.2.2.tar.gz
+/wildmidi-0.2.3.4.tar.gz
diff --git a/sources b/sources
index 0ceaf72..64a1b3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4e30f2d68ccc8e4571511832695f191 wildmidi-0.2.2.tar.gz
+437e3dddf15ef9fb1b76625d0727a2e6 wildmidi-0.2.3.4.tar.gz
diff --git a/wildmidi-0.2.2-cfg-abs-path.patch b/wildmidi-0.2.2-cfg-abs-path.patch
index 46c3373..5c30927 100644
--- a/wildmidi-0.2.2-cfg-abs-path.patch
+++ b/wildmidi-0.2.2-cfg-abs-path.patch
@@ -1,30 +1,12 @@
-diff -up wildmidi-0.2.2/src/wildmidi_lib.c.abs wildmidi-0.2.2/src/wildmidi_lib.c
---- wildmidi-0.2.2/src/wildmidi_lib.c.abs 2004-01-28 19:13:46.000000000 +0100
-+++ wildmidi-0.2.2/src/wildmidi_lib.c 2007-07-14 16:54:28.000000000 +0200
-@@ -845,7 +845,7 @@ WM_LoadConfig (const char *config_file)
- }
- continue;
- } else if (strncasecmp(line_buffer, "source ", 7) == 0) {
-- if (config_dir != NULL) {
-+ if (config_dir != NULL && line_buffer[7] != '/') {
- new_config = malloc(strlen(config_dir) + strlen(&line_buffer[7]) + 1);
- if (new_config == NULL) {
- WM_ERROR(__FUNCTION__, __LINE__, WM_ERR_MEM, "to parse config", errno);
-@@ -1013,7 +1013,7 @@ WM_LoadConfig (const char *config_file)
- *chr_ptr = '\0';
- }
- if (strncasecmp(&line_buffer[(line_ptr + strlen(&line_buffer[line_ptr]) - 5)], ".pat", 4) != 0) {
-- if (config_dir != NULL) {
-+ if (config_dir != NULL && line_buffer[line_ptr] != '/') {
- tmp_patch->filename = malloc(strlen(config_dir) + strlen(&line_buffer[line_ptr]) + 5);
- if (tmp_patch->filename == NULL) {
- WM_ERROR(__FUNCTION__, __LINE__, WM_ERR_MEM, NULL, 0);
-@@ -1041,7 +1041,7 @@ WM_LoadConfig (const char *config_file)
- }
- strcat(tmp_patch->filename, ".pat");
- } else {
-- if (config_dir != NULL) {
-+ if (config_dir != NULL && line_buffer[line_ptr] != '/') {
- tmp_patch->filename = malloc(strlen(config_dir) + strlen(&line_buffer[line_ptr]) + 1);
- if (tmp_patch->filename == NULL) {
- WM_ERROR(__FUNCTION__, __LINE__, WM_ERR_MEM, NULL, 0);
+diff -up wildmidi-0.2.3.4/src/wildmidi_lib.c~ wildmidi-0.2.3.4/src/wildmidi_lib.c
+--- wildmidi-0.2.3.4/src/wildmidi_lib.c~ 2010-07-30 02:33:46.000000000 +0200
++++ wildmidi-0.2.3.4/src/wildmidi_lib.c 2010-09-12 13:35:58.693850011 +0200
+@@ -733,7 +733,7 @@ WM_LoadConfig (const char *config_file)
+ }
+ }
+ }
+- if (config_dir != NULL)
++ if (config_dir != NULL && line_tokens[1][0] != '/')
+ {
+ tmp_patch->filename = malloc(strlen(config_dir) + strlen(line_tokens[1]) + 1);
+ if (tmp_patch->filename == NULL)
diff --git a/wildmidi.spec b/wildmidi.spec
index 5ad0a5d..cec3f4a 100644
--- a/wildmidi.spec
+++ b/wildmidi.spec
@@ -1,30 +1,25 @@
Name: wildmidi
-Version: 0.2.2
-Release: 8%{?dist}
+Version: 0.2.3.4
+Release: 1%{?dist}
Summary: Softsynth midi player
Group: Applications/Multimedia
-License: GPLv2+
-URL: http://wildmidi.sourceforge.net/index.html
+License: GPLv3+
+URL: http://wildmidi.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0: wildmidi-0.2.2-opt.patch
-Patch1: wildmidi-0.2.2-cfg-abs-path.patch
-Patch2: wildmidi-0.2.2-pulseaudio.patch
-Patch3: wildmidi-0.2.2-bigendian.patch
+Patch0: wildmidi-0.2.2-cfg-abs-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel libtool
Requires: %{name}-libs = %{version}-%{release}
%description
WildMidi is a software midi player which has a core softsynth library that can
-be used with other applications. Originally conceived in December 2001 as a
-stand alone player, it wasn't until September 2003, and several revisions
-later, that the library came into existance.
+be used with other applications.
%package libs
Summary: WildMidi Midi Wavetable Synth Lib
Group: System Environment/Libraries
-License: LGPLv2+
+License: LGPLv3+
Requires: timidity++-patches
%description libs
@@ -36,6 +31,7 @@ through a buffer which an external program can then process further.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
+License: LGPLv3+
Requires: %{name}-libs = %{version}-%{release}
%description devel
@@ -45,17 +41,15 @@ developing applications that use %{name}.
%prep
%setup -q
-%patch0 -p1 -z .opt
-%patch1 -p1 -z .abs
-%patch2 -p1 -z .pa
-%patch3 -p1
+%patch0 -p1
sed -i 's/\r//g' COPYING
-# we need to update libtool to fix compilation on systems which have lib64
-autoreconf -i -f
+chmod -x src/file_io.c
%build
%configure --disable-static --disable-werror --without-arch
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
@@ -64,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+mkdir $RPM_BUILD_ROOT%{_sysconfdir}
+ln -s timidity.cfg $RPM_BUILD_ROOT%{_sysconfdir}/wildmidi.cfg
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -76,20 +73,28 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
+%doc COPYING docs/GPLv3.txt
+%{_sysconfdir}/wildmidi.cfg
%{_bindir}/wildmidi
+%{_mandir}/man1/*
%files libs
%defattr(-,root,root,-)
-%doc COPYING README TODO
-%{_libdir}/libWildMidi.so.0*
+%doc COPYING docs/LGPLv3.txt
+%{_libdir}/libWildMidi.so.1*
+%{_mandir}/man5/*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libWildMidi.so
+%{_mandir}/man3/*
%changelog
+* Sun Sep 12 2010 Hans de Goede <hdegoede at redhat.com> 0.2.3.4-1
+- New upstream release 0.2.3.4-1
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list