rpms/qsynth/F-11 qsynth-desktopfix.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 qsynth-fix-locale-path.patch, 1.1, 1.2 qsynth.spec, 1.14, 1.15 sources, 1.4, 1.5
Orcan Ogetbil
oget at fedoraproject.org
Sun May 9 22:19:20 UTC 2010
Author: oget
Update of /cvs/pkgs/rpms/qsynth/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17891
Modified Files:
.cvsignore qsynth-fix-locale-path.patch qsynth.spec sources
Added Files:
qsynth-desktopfix.patch
Log Message:
* Sat May 09 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
- Update to 0.3.5
qsynth-desktopfix.patch:
qsynth.desktop.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE qsynth-desktopfix.patch ---
--- qsynth-0.3.5.old/src/qsynth.desktop.in 2010-04-13 03:09:23.000000000 -0400
+++ qsynth-0.3.5/src/qsynth.desktop.in 2010-05-09 17:07:52.000000000 -0400
@@ -1,11 +1,11 @@
[Desktop Entry]
Name=@PACKAGE_NAME@
-Version=@PACKAGE_VERSION@
+Version=1.0
GenericName=FluidSynth GUI
Comment=Qsynth is a FluidSynth Qt GUI Interface
Exec=@ac_prefix@/bin/qsynth
Icon=@ac_prefix@/share/pixmaps/qsynth.png
-Categories=Audio;AudioVideo;MIDI;JACK;ALSA;Qt;
+Categories=Audio;AudioVideo;Qt;Midi;X-Jack;X-Alsa;X-Synthesis;
Terminal=false
Type=Application
X-SuSE-translate=true
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 12 May 2009 06:16:47 -0000 1.4
+++ .cvsignore 9 May 2010 22:19:20 -0000 1.5
@@ -1 +1 @@
-qsynth-0.3.4.tar.gz
+qsynth-0.3.5.tar.gz
qsynth-fix-locale-path.patch:
CMakeLists.txt | 2 +-
qsynth.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: qsynth-fix-locale-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-11/qsynth-fix-locale-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qsynth-fix-locale-path.patch 17 Apr 2009 22:31:07 -0000 1.1
+++ qsynth-fix-locale-path.patch 9 May 2010 22:19:20 -0000 1.2
@@ -1,34 +1,19 @@
-diff -rupN qsynth-0.3.3.old/Makefile.in qsynth-0.3.3/Makefile.in
---- qsynth-0.3.3.old/Makefile.in 2008-06-22 15:36:31.000000000 -0400
-+++ qsynth-0.3.3/Makefile.in 2009-04-06 22:30:05.000000000 -0400
-@@ -81,19 +81,19 @@ install: $(name) icons/$(name).png $(tra
- @install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
- @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
- @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-- @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
-+ @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale
- @install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
- @install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
- @install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-- @install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
-+ @install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale
-
- uninstall: $(DESTDIR)$(prefix)/bin/$(name)
- @rm -vf $(DESTDIR)$(prefix)/bin/$(name)
- @rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
- @rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-- @rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
-+ @rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets)
- @for x in $(translations_targets); do \
-- rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
-+ rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done
-
- clean: $(name).mak
- @make -f $(name).mak clean
-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:30:05.000000000 -0400
-@@ -77,7 +77,7 @@ public:
+diff -rupN qsynth-0.3.5.old/src/CMakeLists.txt qsynth-0.3.5/src/CMakeLists.txt
+--- qsynth-0.3.5.old/src/CMakeLists.txt 2010-04-10 09:24:54.000000000 -0400
++++ qsynth-0.3.5/src/CMakeLists.txt 2010-05-09 16:38:53.000000000 -0400
+@@ -118,7 +118,7 @@ if (UNIX AND NOT APPLE)
+ install ( TARGETS qsynth
+ RUNTIME DESTINATION bin )
+ install ( FILES ${QM_FILES}
+- DESTINATION share/locale )
++ DESTINATION share/qsynth/locale )
+ install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/qsynth.desktop
+ DESTINATION share/applications )
+ install ( FILES images/qsynth.png
+diff -rupN qsynth-0.3.5.old/src/qsynth.cpp qsynth-0.3.5/src/qsynth.cpp
+--- qsynth-0.3.5.old/src/qsynth.cpp 2010-03-26 10:44:58.000000000 -0400
++++ qsynth-0.3.5/src/qsynth.cpp 2010-05-09 16:28:37.000000000 -0400
+@@ -91,7 +91,7 @@ public:
if (m_pMyTranslator->load(sLocName, sLocPath)) {
QApplication::installTranslator(m_pMyTranslator);
} else {
Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-11/qsynth.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- qsynth.spec 12 May 2009 06:16:47 -0000 1.14
+++ qsynth.spec 9 May 2010 22:19:20 -0000 1.15
@@ -2,25 +2,28 @@
Summary: Qt based Fluidsynth GUI front end
Name: qsynth
-Version: 0.3.4
+Version: 0.3.5
Release: 1%{?dist}
URL: http://qsynth.sourceforge.net
-Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
+# Fix .desktop file according to freedesktop standards
+# https://sourceforge.net/tracker/?func=detail&aid=2999060&group_id=93509&atid=604540
+Patch0: qsynth-desktopfix.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
Patch3: qsynth-fedora-defaults.patch
+# Fix DSO linking error
+# https://sourceforge.net/tracker/?func=detail&aid=2951295&group_id=93509&atid=604540
+Patch4: qsynth-linking.patch
License: GPLv2+
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: hicolor-icon-theme
-
-%if 0%{?fedora} < 11
-Requires: PersonalCopy-Lite-soundfont
-%else
Requires: soundfont2-default
-%endif
+
+BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: fluidsynth-devel
BuildRequires: qt-devel
@@ -30,43 +33,35 @@ QSynth is a fluidsynth GUI front-end app
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.
+command line software synthesizer based on the Soundfont specification.
%prep
%setup -q
+%patch0 -p1 -b .freedesktop
%patch2 -p1 -b .localedir
%patch3 -p1 -b .defaults
-
-# default.sf2 not available for Fedora < 11
-%if 0%{?fedora} < 11
-sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
-%endif
+%patch4 -p1 -b .linking
iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
touch -r AUTHORS AUTHORS.tmp
mv -f AUTHORS.tmp AUTHORS
-
%build
-%configure
-make # doesn't understand %%{?_smp_mflags}
-
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
+make %{?_smp_mflags} -C %{_target_platform}
%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"
+make DESTDIR=%{buildroot} install -C %{_target_platform}
+# desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor %{desktop_vendor} \
--delete-original \
--dir %{buildroot}%{_datadir}/applications \
- `for c in ${INCORRECT} ; do echo "--remove-category $c " ; done` \
- `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
%{buildroot}%{_datadir}/applications/qsynth.desktop
# Create the lang file. %%find_lang does not handle .qm files
@@ -91,6 +86,16 @@ rm -rf %{buildroot}
%changelog
+* Sat May 09 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
+- Update to 0.3.5
+
+* Sat Feb 13 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-3
+- Fix DSO linking failure RHBZ#564615
+- Clean up the specfile from bits related to Fedora < 11
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Tue May 12 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
- Update to 0.3.4
- Update specfile for macro consistency
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 12 May 2009 06:16:47 -0000 1.4
+++ sources 9 May 2010 22:19:20 -0000 1.5
@@ -1 +1 @@
-800ab77b59c947bd8f1c8bb10545a59d qsynth-0.3.4.tar.gz
+e1566eecf7bf3869211783cfe7a327b5 qsynth-0.3.5.tar.gz
More information about the scm-commits
mailing list