rpms/timidity++/devel TiMidity++-2.13.2-cfgfile-name.patch, NONE, 1.1 timidity++.spec, 1.26, 1.27

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Tue Mar 4 19:51:32 UTC 2008 

Author: jwrdegoede

Update of /cvs/extras/rpms/timidity++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31109

Modified Files:
	timidity++.spec 
Added Files:
	TiMidity++-2.13.2-cfgfile-name.patch 
Log Message:
* Mon Mar  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-13
- Merge review fixes (bz 226492)
  - merge patch0 into patch16, drop patch0
  - Make License tag just GPLv2
  - Unify macros usage


TiMidity++-2.13.2-cfgfile-name.patch:

--- NEW FILE TiMidity++-2.13.2-cfgfile-name.patch ---
diff -up TiMidity++-2.13.2/timidity/timidity.c~ TiMidity++-2.13.2/timidity/timidity.c
--- TiMidity++-2.13.2/timidity/timidity.c~	2008-02-28 13:25:00.000000000 +0100
+++ TiMidity++-2.13.2/timidity/timidity.c	2008-02-28 13:25:00.000000000 +0100
@@ -5170,7 +5170,9 @@ MAIN_INTERFACE int timidity_pre_load_con
 
 #else
     /* UNIX */
-    if(!read_config_file(CONFIG_FILE, 0))
+    if(!read_config_file(CONFIG_FILE1, 0))
+		got_a_configuration = 1;
+    else if(!read_config_file(CONFIG_FILE2, 0))
 		got_a_configuration = 1;
 #endif
 
@@ -5240,7 +5240,9 @@ MAIN_INTERFACE int timidity_post_load_co
 
     if(!got_a_configuration)
     {
-	if(try_config_again && !read_config_file(CONFIG_FILE, 0))
+	if(try_config_again && !read_config_file(CONFIG_FILE1, 0))
+	    got_a_configuration = 1;
+	else if(try_config_again && !read_config_file(CONFIG_FILE2, 0))
 	    got_a_configuration = 1;
     }
 
@@ -5695,7 +5697,7 @@ int main(int argc, char **argv)
 #else
 	    ctl->cmsg(CMSG_FATAL, VERB_NORMAL,
 		      "%s: Error reading configuration file.\nPlease check "
-		      CONFIG_FILE, program_name);
+		      CONFIG_FILE1 " or " CONFIG_FILE2, program_name);
 #endif /* __W32__ */
 	}
 	else
diff -up TiMidity++-2.13.2/timidity/timidity.h~ TiMidity++-2.13.2/timidity/timidity.h
--- TiMidity++-2.13.2/timidity/timidity.h~	2008-02-28 13:19:29.000000000 +0100
+++ TiMidity++-2.13.2/timidity/timidity.h	2008-02-28 13:19:29.000000000 +0100
@@ -41,14 +41,8 @@
 
 /* You could specify a complete path, e.g. "/etc/timidity.cfg", and
    then specify the library directory in the configuration file. */
-/* #define CONFIG_FILE "/etc/timidity.cfg" */
-#ifndef CONFIG_FILE
-#  ifdef DEFAULT_PATH
-#    define CONFIG_FILE DEFAULT_PATH "/timidity.cfg"
-#  else
-#    define CONFIG_FILE PKGDATADIR "/timidity.cfg"
-#  endif /* DEFAULT_PATH */
-#endif /* CONFIG_FILE */
+#define CONFIG_FILE1 "/etc/timidity++.cfg"
+#define CONFIG_FILE2 "/etc/timidity.cfg"
 
 
 /* Filename extension, followed by command to run decompressor so that


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- timidity++.spec	21 Feb 2008 12:03:17 -0000	1.26
+++ timidity++.spec	4 Mar 2008 19:50:58 -0000	1.27
@@ -1,16 +1,11 @@
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 11%{?dist}
+Release: 13%{?dist}
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
-Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2
-Source2: timidity.cfg
-Source3: http://www.stardate.bc.ca/eawpatches/eawpats/britepno.pat.bz2
-Source4: http://www.stardate.bc.ca/eawpatches/eawpats/pistol.pat.bz2
-Source5: fedora-timidity.desktop
+Source1: fedora-timidity.desktop
 URL: http://timidity.sourceforge.net
-Patch: TiMidity++-2.13.0-redhat.patch
 Patch3: TiMidity++-2.13.0-detect.patch
 Patch5: TiMidity++-2.13.0-64bit.patch
 Patch6: TiMidity++-2.13.0-warnings.patch
@@ -25,8 +20,9 @@
 # end Debian patches
 Patch14: TiMidity++-2.13.2-ipv6.patch
 Patch15: TiMidity++-2.13.2-dynlibroot.patch
+Patch16: TiMidity++-2.13.2-cfgfile-name.patch
 
-License: GPLv2 and MIT and BSD
+License: GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: arts-devel esound-devel alsa-lib-devel ncurses-devel gtk2-devel
 BuildRequires: libao-devel libvorbis-devel flac-devel speex-devel
@@ -34,7 +30,7 @@
 BuildRequires: jack-audio-connection-kit-devel
 %endif
 BuildRequires: desktop-file-utils
-Requires: %{name}-patches = %{version}-%{release}, hicolor-icon-theme
+Requires: PersonalCopy-Lite-soundfont hicolor-icon-theme
 
 %description
 TiMidity++ is a MIDI format to wave table format converter and
@@ -42,21 +38,8 @@
 sound card does not natively support wave table format.
 
 
-%package        patches
-Summary:        Instrument (patch) files for %{name}
-Group:          Applications/Multimedia
-
-%description    patches
-This package contains samples of instruments (called patches) for use in
-wavetable midi synthesizers like %{name}. These patches are in the Gravis
-Ultasound .pat format and can be used by any wavetable midi synthesizer which
-understands this format.
-
-
 %prep
 %setup -q -n TiMidity++-%{version}
-# Put config files etc. to sane locations
-%patch -p1 -b .redhat
 # Autodetect whether we should use aRts, esd, or neither
 %patch3 -p1 -b .detect
 # fix for x86_64 and s390x
@@ -71,10 +54,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-
-# Ensure that we are actually using %%_sysconfdir
-sed -i -e 's|/etc/timidity\.cfg|%{_sysconfdir}/timidity.cfg|' \
-timidity/timidity.h
+%patch16 -p1
 
 
 %build
@@ -91,22 +71,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/timidity $RPM_BUILD_ROOT/etc
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/timidity.cfg
-ln -s /etc/timidity.cfg $RPM_BUILD_ROOT%{_datadir}/timidity/timidity.cfg
-pushd $RPM_BUILD_ROOT%{_datadir}/timidity
-tar xjf %{SOURCE1}
-bzip2 -dck %{SOURCE3} >instruments/britepno.pat
-bzip2 -dck %{SOURCE4} >instruments/pistol.pat
-popd
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
+echo "soundfont %{_datadir}/soundfonts/PCLite.sf2" > \
+  $RPM_BUILD_ROOT/%{_sysconfdir}/timidity++.cfg
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora              \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  %{SOURCE5}
+  %{SOURCE1}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 interface/pixmaps/timidity.xpm \
@@ -135,18 +109,35 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS ChangeLog
+%config(noreplace) %{_sysconfdir}/timidity++.cfg
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/applications/fedora-timidity.desktop
 %{_datadir}/icons/hicolor/48x48/apps/timidity.xpm
 
-%files patches
-%defattr(-,root,root,-)
-%config(noreplace) /etc/timidity.cfg
-%{_datadir}/timidity
-
 
 %changelog
+* Mon Mar  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-13
+- Merge review fixes (bz 226492)
+  - merge patch0 into patch16, drop patch0
+  - Make License tag just GPLv2
+  - Unify macros usage
+
+* Thu Feb 28 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-12
+- Stop shipping a timidity++-patches package, investigation into the license
+  of the included patches has turned up doubts about the rights of the author
+  of the midas SGI midi player to release these into the Public Domain
+- Instead require PersonalCopy-Lite-soundfont, and point to PCLite.sf2 in
+  timidity++.cfg
+- Note PersonalCopy-Lite-soundfont also has a PersonalCopy-Lite-patches
+  sub-package with the .sf2 file converted to GUS patch format for other
+  applications who require timidity++-patches to get GUS format patches, this
+  package contains an /etc/timidity.cfg file pointing to the gus patches,
+  therefor the timidity++ package now ships a timidty++.cfg instead of a
+  timidity.cfg
+- Check for /etc/timidity++.cfg before trying /etc/timidity.cfg, see above for
+  rationale
+
 * Thu Feb 21 2008 Jindrich Novy <jnovy at redhat.com> 2.13.2-11
 - rebuild

More information about the fedora-extras-commits mailing list