diff --git a/.cvsignore b/.cvsignore index 9586492..1774d97 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -qsynth-0.3.3.tar.gz +qsynth-0.3.4.tar.gz diff --git a/qsynth-0.3.3-qt4.patch b/qsynth-0.3.3-qt4.patch deleted file mode 100644 index 08b652a..0000000 --- a/qsynth-0.3.3-qt4.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- qsynth-0.3.3/configure.qt4 2008-07-10 13:13:33.000000000 -0400 -+++ qsynth-0.3.3/configure 2008-09-05 19:16:02.000000000 -0400 -@@ -3859,7 +3859,7 @@ - - # Check for Qt qmake utility. - # Extract the first word of "qmake", so it can be a program name with args. --set dummy qmake; ac_word=$2 -+set dummy qmake-qt4; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_ac_qmake+set}" = set; then -@@ -3908,7 +3908,7 @@ - - # Check for Qt moc utility. - # Extract the first word of "moc", so it can be a program name with args. --set dummy moc; ac_word=$2 -+set dummy moc-qt4; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_ac_moc+set}" = set; then -@@ -3957,7 +3957,7 @@ - - # Check for Qt uic utility. - # Extract the first word of "uic", so it can be a program name with args. --set dummy uic; ac_word=$2 -+set dummy uic-qt4; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_ac_uic+set}" = set; then -@@ -4006,7 +4006,7 @@ - - # Check for Qt lupdate utility. - # Extract the first word of "lupdate", so it can be a program name with args. --set dummy lupdate; ac_word=$2 -+set dummy lupdate-qt4; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_ac_lupdate+set}" = set; then -@@ -4055,7 +4055,7 @@ - - # Check for Qt lrelease utility. - # Extract the first word of "lrelease", so it can be a program name with args. --set dummy lrelease; ac_word=$2 -+set dummy lrelease-qt4; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_ac_lrelease+set}" = set; then diff --git a/qsynth-0.3.3-qt45.patch b/qsynth-0.3.3-qt45.patch deleted file mode 100644 index ce84766..0000000 --- a/qsynth-0.3.3-qt45.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -rupN qsynth-0.3.3.old/src/main.cpp qsynth-0.3.3/src/main.cpp ---- qsynth-0.3.3.old/src/main.cpp 2008-07-10 13:11:48.000000000 -0400 -+++ qsynth-0.3.3/src/main.cpp 2009-04-06 22:06:07.000000000 -0400 -@@ -260,6 +260,9 @@ int main ( int argc, char **argv ) - Qt::WindowFlags wflags = Qt::Window - #if QT_VERSION >= 0x040200 - | Qt::CustomizeWindowHint -+#if QT_VERSION >= 0x040500 -+ | Qt::WindowCloseButtonHint -+#endif - #endif - | Qt::WindowTitleHint - | Qt::WindowSystemMenuHint -diff -rupN qsynth-0.3.3.old/src/qsynthMainForm.cpp qsynth-0.3.3/src/qsynthMainForm.cpp ---- qsynth-0.3.3.old/src/qsynthMainForm.cpp 2008-07-01 10:04:41.000000000 -0400 -+++ qsynth-0.3.3/src/qsynthMainForm.cpp 2009-04-06 22:05:12.000000000 -0400 -@@ -544,6 +544,9 @@ void qsynthMainForm::setup ( qsynthOptio - Qt::WindowFlags wflags = Qt::Window - #if QT_VERSION >= 0x040200 - | Qt::CustomizeWindowHint -+#if QT_VERSION >= 0x040500 -+ | Qt::WindowCloseButtonHint -+#endif - #endif - | Qt::WindowTitleHint - | Qt::WindowSystemMenuHint diff --git a/qsynth.spec b/qsynth.spec index b301916..792f578 100644 --- a/qsynth.spec +++ b/qsynth.spec @@ -2,15 +2,10 @@ Summary: Qt based Fluidsynth GUI front end Name: qsynth -Version: 0.3.3 -Release: 6%{?dist}.1 +Version: 0.3.4 +Release: 1%{?dist} URL: http://qsynth.sourceforge.net Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz -#Source1: qsynth.desktop -# Fedora qt4 binaries have -qt4 suffix -Patch0: qsynth-0.3.3-qt4.patch -# Fix close button not shown with Qt 4.5 (#494470) -Patch1: qsynth-0.3.3-qt45.patch # We don't want .qm files in the default locale dir Patch2: qsynth-fix-locale-path.patch # Tweak the defaults to make things work properly @@ -26,20 +21,19 @@ Requires: PersonalCopy-Lite-soundfont Requires: soundfont2-default %endif -BuildRequires: fluidsynth-devel qt-devel desktop-file-utils +BuildRequires: desktop-file-utils +BuildRequires: fluidsynth-devel +BuildRequires: qt-devel %description -QSynth is a fluidsynth GUI front-end application written in C++ around -the Qt4 toolkit using Qt Designer. Eventually it may evolve into a -softsynth management application allowing the user to control and -manage a variety of command line softsynth but for the moment it wraps -the excellent FluidSynth. FluidSynth is a command line software -synthesiser based on the Soundfont specification. +QSynth is a fluidsynth GUI front-end application written in C++ around the Qt4 +toolkit using Qt Designer. Eventually it may evolve into a softsynth management +application allowing the user to control and manage a variety of command line +softsynth but for the moment it wraps the excellent FluidSynth. FluidSynth is a +command line software synthesiser based on the Soundfont specification. %prep %setup -q -%patch0 -p1 -b .qt4 -%patch1 -p1 -b .qt45 %patch2 -p1 -b .localedir %patch3 -p1 -b .defaults @@ -55,19 +49,19 @@ mv -f AUTHORS.tmp AUTHORS %build %configure -%{__make} # doesn't understand %%{?_smp_mflags} +make # doesn't understand %%{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__make} DESTDIR=%{buildroot} install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install # desktop file categories INCORRECT="Applications Multimedia MIDI JACK ALSA" BASE="Audio" XTRA="X-MIDI X-Jack X-Alsa X-Synthesis" -%{__mkdir} -p %{buildroot}%{_datadir}/applications +mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --vendor %{desktop_vendor} \ --delete-original \ --dir %{buildroot}%{_datadir}/applications \ @@ -83,7 +77,7 @@ done %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %files -f qsynth.lang @@ -92,10 +86,17 @@ done %{_bindir}/qsynth %{_datadir}/pixmaps/qsynth.png %dir %{_datadir}/qsynth/ +%dir %{_datadir}/qsynth/locale %{_datadir}/applications/%{desktop_vendor}-qsynth.desktop %changelog +* Tue May 12 2009 Orcan Ogetbil 0.3.4-1 +- Update to 0.3.4 +- Update specfile for macro consistency +- Own %%{_datadir}/qsynth/locale +- Drop patches that are no longer needed + * Wed Apr 22 2009 Kevin Kofler 0.3.3-6.1 - Fix disttag comparison for F9 diff --git a/sources b/sources index d16c4ca..cef6362 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -648c49d8935814be03f4001f42b169cf qsynth-0.3.3.tar.gz +800ab77b59c947bd8f1c8bb10545a59d qsynth-0.3.4.tar.gz