[ocp] update to today's git snapshot, no longer need timidity-parse-config.patch

Charles R. Anderson cra at fedoraproject.org
Tue Feb 24 14:51:25 UTC 2015


commit 433636270867acdd845294c851aac8df2c4f0f23
Author: Charles R. Anderson <cra at wpi.edu>
Date:   Tue Feb 24 09:51:00 2015 -0500

    update to today's git snapshot, no longer need timidity-parse-config.patch

 .gitignore |  1 +
 ocp.spec   | 14 ++++++++------
 sources    |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff7fcb9..e3d6f47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ocp-0.1.21.tar.bz2
 opencp25ani1.zip
 opencp25image1.zip
 /ocp-0.1.22-20150223gitbceb98e.tar.bz2
+/ocp-0.1.22-20150224gita07bf5d.tar.bz2
diff --git a/ocp.spec b/ocp.spec
index 94f2d2a..de20b0e 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -2,8 +2,8 @@
 
 Name: ocp
 Version: 0.1.22
-%define checkout 20150223gitbceb98e
-Release: 0.3.%{checkout}%{?dist}
+%define checkout 20150224gita07bf5d
+Release: 0.4.%{checkout}%{?dist}
 Summary: Open Cubic Player for MOD/S3M/XM/IT/SID/MIDI music files
 
 Group: Applications/Multimedia
@@ -20,8 +20,7 @@ Source0: ocp-%{version}-%{checkout}.tar.bz2
 Source1: ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2: ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Patch0: ocp-0.1.20-no-i386-asm.patch
-Patch1: ocp-0.1.22-timidity-parse-config.patch
-Patch2: ocp-0.1.21-pat-use-first-sample.patch
+Patch1: ocp-0.1.21-pat-use-first-sample.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: adplug-devel
@@ -65,8 +64,7 @@ visualizations.
 %if %{?_with_i386asm:0}%{!?_with_i386asm:1}
 %patch0 -p1 -b .noi386asm
 %endif
-%patch1 -p1 -b .timidity
-%patch2 -p1 -b .pat
+%patch1 -p1 -b .pat
 unzip %{SOURCE1}
 mv license.txt license-images.txt
 unzip %{SOURCE2}
@@ -204,6 +202,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Feb 24 2015 Charles R. Anderson <cra at wpi.edu> - 0.1.22-0.4.20150224gita07bf5d
+- update to current git snapshot
+- remove timidity-parse-config.patch, no longer needed
+
 * Mon Feb 23 2015 Charles R. Anderson <cra at wpi.edu> - 0.1.22-0.3.20150223gitbceb98e
 - re-add pat-use-first-sample.patch, still needed
 - remove docdir.patch, no longer needed
diff --git a/sources b/sources
index 009a0de..3f10275 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c7561b65b7a2d2906224fd9158765a67  ocp-0.1.22-20150223gitbceb98e.tar.bz2
+6935b36724e5d018ce7251cb80f7d7e1  ocp-0.1.22-20150224gita07bf5d.tar.bz2
 4df5f894e070b20d8cd65a1a620258cb  opencp25ani1.zip
 72bd5f59382e927ff5b5ba1b840777df  opencp25image1.zip


More information about the scm-commits mailing list