diff --git a/.gitignore b/.gitignore index ea85d39..6ead136 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ qsynth-0.3.5.tar.gz /qsynth-0.3.6.tar.gz +/qsynth-0.3.7.tar.gz diff --git a/qsynth-fedora-defaults.patch b/qsynth-fedora-defaults.patch index cc2e625..21062d8 100644 --- a/qsynth-fedora-defaults.patch +++ b/qsynth-fedora-defaults.patch @@ -1,6 +1,6 @@ -diff -rupN qsynth-0.3.6.old/src/qsynthOptions.cpp qsynth-0.3.6/src/qsynthOptions.cpp ---- qsynth-0.3.6.old/src/qsynthOptions.cpp 2011-03-30 07:53:04.000000000 -0400 -+++ qsynth-0.3.6/src/qsynthOptions.cpp 2011-04-09 09:39:11.000000000 -0400 +diff -rupN qsynth-0.3.7.old/src/qsynthOptions.cpp qsynth-0.3.7/src/qsynthOptions.cpp +--- qsynth-0.3.7.old/src/qsynthOptions.cpp 2012-12-22 14:52:21.875018000 -0500 ++++ qsynth-0.3.7/src/qsynthOptions.cpp 2013-06-22 22:57:54.538255534 -0400 @@ -79,7 +79,7 @@ void qsynthOptions::loadOptions (void) // Load defaults... @@ -19,7 +19,7 @@ diff -rupN qsynth-0.3.6.old/src/qsynthOptions.cpp qsynth-0.3.6/src/qsynthOptions pSetup->iAudioBufCount = m_settings.value("/AudioBufCount", 2).toInt(); #endif pSetup->sMidiName = m_settings.value("/AlsaName", "pid").toString(); -@@ -516,7 +516,9 @@ void qsynthOptions::loadSetup ( qsynthSe +@@ -517,7 +517,9 @@ void qsynthOptions::loadSetup ( qsynthSe m_settings.beginGroup("/SoundFonts"); const QString sSoundFontPrefix = "/SoundFont%1"; const QString sBankOffsetPrefix = "/BankOffset%1"; @@ -29,7 +29,7 @@ diff -rupN qsynth-0.3.6.old/src/qsynthOptions.cpp qsynth-0.3.6/src/qsynthOptions for (;;) { ++i; QString sSoundFont = m_settings.value(sSoundFontPrefix.arg(i)).toString(); -@@ -525,6 +527,11 @@ void qsynthOptions::loadSetup ( qsynthSe +@@ -526,6 +528,11 @@ void qsynthOptions::loadSetup ( qsynthSe break; pSetup->soundfonts.append(sSoundFont); pSetup->bankoffsets.append(sBankOffset); diff --git a/qsynth-fix-locale-path.patch b/qsynth-fix-locale-path.patch index d2f8b91..49b467c 100644 --- a/qsynth-fix-locale-path.patch +++ b/qsynth-fix-locale-path.patch @@ -1,6 +1,6 @@ -diff -rupN qsynth-0.3.6.old/src/CMakeLists.txt qsynth-0.3.6/src/CMakeLists.txt ---- qsynth-0.3.6.old/src/CMakeLists.txt 2010-10-31 14:44:59.000000000 -0400 -+++ qsynth-0.3.6/src/CMakeLists.txt 2011-04-09 09:31:32.000000000 -0400 +diff -rupN qsynth-0.3.7.old/src/CMakeLists.txt qsynth-0.3.7/src/CMakeLists.txt +--- qsynth-0.3.7.old/src/CMakeLists.txt 2010-10-31 14:44:59.159077000 -0400 ++++ qsynth-0.3.7/src/CMakeLists.txt 2013-06-22 22:35:30.212103382 -0400 @@ -126,7 +126,7 @@ if (UNIX AND NOT APPLE) install ( TARGETS qsynth RUNTIME DESTINATION bin ) @@ -10,15 +10,15 @@ diff -rupN qsynth-0.3.6.old/src/CMakeLists.txt qsynth-0.3.6/src/CMakeLists.txt install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/qsynth.desktop DESTINATION share/applications ) install ( FILES images/qsynth.png -diff -rupN qsynth-0.3.6.old/src/qsynth.cpp qsynth-0.3.6/src/qsynth.cpp ---- qsynth-0.3.6.old/src/qsynth.cpp 2011-03-16 07:05:33.000000000 -0400 -+++ qsynth-0.3.6/src/qsynth.cpp 2011-04-09 09:32:35.000000000 -0400 -@@ -91,7 +91,7 @@ public: - if (m_pMyTranslator->load(sLocName, sLocPath)) { - QApplication::installTranslator(m_pMyTranslator); - } else { -- sLocPath = CONFIG_PREFIX "/share/locale"; -+ sLocPath = CONFIG_PREFIX "/share/qsynth/locale"; - if (m_pMyTranslator->load(sLocName, sLocPath)) { - QApplication::installTranslator(m_pMyTranslator); - } else { +diff -rupN qsynth-0.3.7.old/src/qsynth.cpp qsynth-0.3.7/src/qsynth.cpp +--- qsynth-0.3.7.old/src/qsynth.cpp 2013-02-14 09:52:31.409468000 -0500 ++++ qsynth-0.3.7/src/qsynth.cpp 2013-06-22 22:53:58.636303520 -0400 +@@ -55,7 +55,7 @@ const WindowFlags CustomizeWindowHint + #if defined(LOCALEDIR) + #define CONFIG_LOCALEDIR CONFIG_QUOTED(LOCALEDIR) + #else +-#define CONFIG_LOCALEDIR CONFIG_DATADIR "/locale" ++#define CONFIG_LOCALEDIR CONFIG_DATADIR "/qsynth/locale" + #endif + + diff --git a/qsynth.spec b/qsynth.spec index e6c0da2..da1cb75 100644 --- a/qsynth.spec +++ b/qsynth.spec @@ -1,7 +1,7 @@ Summary: Qt based Fluidsynth GUI front end Name: qsynth -Version: 0.3.6 -Release: 4%{?dist} +Version: 0.3.7 +Release: 1%{?dist} URL: http://qsynth.sourceforge.net Source0: http://downloads.sourceforge.net/qsynth/qsynth-%{version}.tar.gz # We don't want .qm files in the default locale dir @@ -68,6 +68,9 @@ desktop-file-install \ %changelog +* Sat Jun 22 2013 Orcan Ogetbil 0.3.7-1 +- Update to 0.3.7 + * Sun Feb 10 2013 Orcan Ogetbil - 0.3.6-4 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/24 - some specfile cleanup diff --git a/sources b/sources index 287cff0..b04569a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3cba3c87463be75ac188ebc3c3023d12 qsynth-0.3.6.tar.gz +a101a50a7ecfb7319482a5022df1d58b qsynth-0.3.7.tar.gz