diff --git a/.cvsignore b/.cvsignore index c128cf1..0e13bb9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rosegarden-10.04.tar.bz2 +rosegarden-10.04.2.tar.bz2 diff --git a/rosegarden-qt47.patch b/rosegarden-qt47.patch deleted file mode 100644 index 2569e3e..0000000 --- a/rosegarden-qt47.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -rupN rosegarden-10.04.old/src/base/UrlHash.cpp rosegarden-10.04/src/base/UrlHash.cpp ---- rosegarden-10.04.old/src/base/UrlHash.cpp 2010-04-22 16:43:56.000000000 -0400 -+++ rosegarden-10.04/src/base/UrlHash.cpp 2010-04-22 23:02:09.000000000 -0400 -@@ -16,10 +16,10 @@ - - #include - #include // to ensure correct qHash(const QString &) is found -- -+#if QT_VERSION < 0x040700 - unsigned int - qHash(const QUrl &u) - { - return qHash(u.toString()); - } -- -+#endif -diff -rupN rosegarden-10.04.old/src/gui/dialogs/KeySignatureDialog.h rosegarden-10.04/src/gui/dialogs/KeySignatureDialog.h ---- rosegarden-10.04.old/src/gui/dialogs/KeySignatureDialog.h 2010-04-22 16:43:42.000000000 -0400 -+++ rosegarden-10.04/src/gui/dialogs/KeySignatureDialog.h 2010-04-22 23:24:30.000000000 -0400 -@@ -57,7 +57,7 @@ public: - Rosegarden::Key::DefaultKey, - bool showApplyToAll = true, - bool showConversionOptions = true, -- QString explanatoryText = 0); -+ QString explanatoryText = ""); - - bool isValid() const; - ::Rosegarden::Key getKey() const; -diff -rupN rosegarden-10.04.old/src/gui/dialogs/TimeSignatureDialog.h rosegarden-10.04/src/gui/dialogs/TimeSignatureDialog.h ---- rosegarden-10.04.old/src/gui/dialogs/TimeSignatureDialog.h 2010-04-22 16:43:42.000000000 -0400 -+++ rosegarden-10.04/src/gui/dialogs/TimeSignatureDialog.h 2010-04-22 23:14:09.000000000 -0400 -@@ -49,7 +49,7 @@ public: - TimeSignature defaultSig = - TimeSignature::DefaultTimeSignature, - bool timeEditable = false, -- QString explanatoryText = 0); -+ QString explanatoryText = ""); - - TimeSignature getTimeSignature() const; - diff --git a/rosegarden4.spec b/rosegarden4.spec index d8fc423..5a4d491 100644 --- a/rosegarden4.spec +++ b/rosegarden4.spec @@ -1,20 +1,21 @@ +%global maj 10.04 +%global min .2 + Name: rosegarden4 -Version: 10.04 +Version: %{maj}%{?min} Release: 1%{?dist} Summary: MIDI, audio and notation editor Group: Applications/Multimedia License: GPLv2+ URL: http://www.rosegardenmusic.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{version}/rosegarden-%{version}.tar.bz2 -Source1: http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{version}/rosegarden-%{version}.txt +Source0: http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{maj}/rosegarden-%{version}.tar.bz2 +Source1: http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{maj}/rosegarden-%{maj}.txt # Upstream is informed about all these patches in their mailing list # Fedora doesn't want fonts built into the final binary Patch0: rosegarden-separate-fonts.patch # Look for LADSPA/DSSI plugins in the correct place on 64bit platforms Patch1: rosegarden-pluginpath.patch -# Fix build issue against new version of qt -Patch2: rosegarden-qt47.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -74,7 +75,6 @@ use of Rosegarden. %setup -q -n rosegarden-%{version} %patch0 -p1 -b .fonts %patch1 -p1 -b .pluginpath -%patch2 -p1 -b .qt47 # Release notes cp -a %{SOURCE1} . @@ -131,7 +131,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files %defattr(-,root,root,-) -%doc AUTHORS COPYING CONTRIBUTING README rosegarden-%{version}.txt +%doc AUTHORS COPYING CONTRIBUTING README rosegarden-%{maj}.txt %{_bindir}/rosegarden %{_datadir}/applications/fedora-rosegarden.desktop %{_datadir}/icons/hicolor/*/mimetypes/audio-x-rosegarden-*.png @@ -145,6 +145,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc data/fonts/README %changelog +* Sun May 09 2010 Orcan Ogetbil - 10.04.2-1 +- Update to 10.04.2 +- Drop upstreamed qt-4.7 patch + * Thu Apr 22 2010 Orcan Ogetbil - 10.04-1 - Update to 10.04 - BR qt-devel instead of kdelibs-devel diff --git a/sources b/sources index 8d137e4..ab2cd53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b25f2f629f31ecf24b84db3ccbe555c9 rosegarden-10.04.tar.bz2 +e961a6f1deb2f57c2ed9dd7f1bc71a94 rosegarden-10.04.2.tar.bz2