[packages/rosegarden] - up to 13.04 - rosegarden-dssi_lib64.patch not needed anymore

blekot blekot at pld-linux.org
Wed May 29 18:02:39 CEST 2013


commit d4c8cb74e2df22681ec33e4c2ac69e27ac6bb8e0
Author: Lukasz Glebicki <blekot at pld-linux.org>
Date:   Wed May 29 18:01:50 2013 +0200

    - up to 13.04
    - rosegarden-dssi_lib64.patch not needed anymore

 rosegarden-dssi_lib64.patch | 12 ------------
 rosegarden.spec             |  9 +++------
 2 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/rosegarden.spec b/rosegarden.spec
index 86cb734..9459380 100644
--- a/rosegarden.spec
+++ b/rosegarden.spec
@@ -4,14 +4,13 @@
 Summary:	Rosegarden - an attractive audio and MIDI sequencer
 Summary(pl.UTF-8):	Rosegarden - interaktywny sekwencer MIDI i audio
 Name:		rosegarden
-Version:	11.11.11
+Version:	13.04
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Sound
 Source0:	http://dl.sourceforge.net/rosegarden/%{_name}-%{version}.tar.bz2
-# Source0-md5:	1e6529625b1e793288c3f1f8cdec955a
+# Source0-md5:	bcc9be7bf8c3945e0eefdb95dc037f0b
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-dssi_lib64.patch
 URL:		http://www.rosegardenmusic.com/
 BuildRequires:	QtCore-devel
 BuildRequires:	QtGui-devel
@@ -32,6 +31,7 @@ BuildRequires:	pkgconfig >= 0.15
 BuildRequires:	qt4-build
 BuildRequires:	qt4-linguist
 BuildRequires:	rpmbuild(macros) >= 1.129
+BuildRequires:	xorg-util-makedepend
 Requires(post,postun):	shared-mime-info
 Suggests:	libsndfile-progs
 Suggests:	lilypond
@@ -51,9 +51,6 @@ nutowego, a jego głównym zadaniem jest komponowanie i edycja muzyki.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
-%if "%{_lib}" == "lib64"
-%patch1 -p1
-%endif
 
 %build
 
diff --git a/rosegarden-dssi_lib64.patch b/rosegarden-dssi_lib64.patch
deleted file mode 100644
index 493192b..0000000
--- a/rosegarden-dssi_lib64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur rosegarden-1.7.3.orig/src/sound/DSSIPluginFactory.cpp rosegarden-1.7.3/src/sound/DSSIPluginFactory.cpp
---- rosegarden-1.7.3.orig/src/sound/DSSIPluginFactory.cpp	2009-02-08 05:20:13.000000000 +0100
-+++ rosegarden-1.7.3/src/sound/DSSIPluginFactory.cpp	2009-12-15 09:57:52.000000000 +0100
-@@ -238,7 +238,7 @@
-         path = cpath;
- 
-     if (path == "") {
--        path = "/usr/local/lib/dssi:/usr/lib/dssi";
-+        path = "/usr/local/lib64/dssi:/usr/lib64/dssi";
-         char *home = getenv("HOME");
-         if (home)
-             path = std::string(home) + "/.dssi:" + path;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rosegarden.git/commitdiff/d4c8cb74e2df22681ec33e4c2ac69e27ac6bb8e0



More information about the pld-cvs-commit mailing list