rpms/rosegarden4/devel rosegarden-4-1.2.3-build-fixes.patch, NONE, 1.1 rosegarden-4-1.2.3-lib64.patch, NONE, 1.1 rosegarden-4-desktop-file.patch, NONE, 1.1 rosegarden4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Callum Lerwick (seg)
fedora-extras-commits at redhat.com
Tue Jul 18 21:29:33 UTC 2006
Author: seg
Update of /cvs/extras/rpms/rosegarden4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17655/devel
Modified Files:
.cvsignore sources
Added Files:
rosegarden-4-1.2.3-build-fixes.patch
rosegarden-4-1.2.3-lib64.patch rosegarden-4-desktop-file.patch
rosegarden4.spec
Log Message:
auto-import rosegarden4-1.2.3-3 on branch devel from rosegarden4-1.2.3-3.src.rpm
rosegarden-4-1.2.3-build-fixes.patch:
--- NEW FILE rosegarden-4-1.2.3-build-fixes.patch ---
--- rosegarden-4-1.2.3/scons_admin/kde.py.orig 2006-04-16 19:53:00.000000000 -0500
+++ rosegarden-4-1.2.3/scons_admin/kde.py 2006-04-16 19:54:38.000000000 -0500
@@ -28,7 +28,7 @@
kdelibpaths=[]
if lenv['KDELIBPATH'] == lenv['KDELIB']: kdelibpaths = [lenv['KDELIB']]
else: kdelibpaths = [lenv['KDELIBPATH'], lenv['KDELIB']]
- lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths )
+ #lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths )
if 'thread' in _flags:
## Uncomment the following if you need threading support
lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] )
@@ -533,7 +533,7 @@
def KDEinstallas(lenv, restype, destfile, file):
if not env['_INSTALL']: return
dir = getInstDirForResType(lenv, restype)
- install_list = lenv.InstallAs(lenv.join(dir, destfile), file)
+ install_list = lenv.InstallAs(lenv.join(env['DESTDIR'], dir, destfile), file)
env.Alias('install', install_list)
return install_list
--- rosegarden-4-1.2.3/SConstruct.orig 2006-02-14 01:55:21.000000000 -0600
+++ rosegarden-4-1.2.3/SConstruct 2006-04-16 19:55:05.000000000 -0500
@@ -70,7 +70,7 @@
env.AppendUnique( ENV = {'PATH' : os.environ['PATH'], 'HOME' : os.environ['HOME']} )
## Use this to set rpath - this may cause trouble if folders are moved (chrpath)
-env.Append( RPATH = [env['QTLIBPATH'], env['KDELIBPATH'], env['KDEMODULE']] )
+#env.Append( RPATH = [env['QTLIBPATH'], env['KDELIBPATH'], env['KDEMODULE']] )
# Export 'env' so that sconscripts in subdirectories can use it
Export( "env" )
rosegarden-4-1.2.3-lib64.patch:
--- NEW FILE rosegarden-4-1.2.3-lib64.patch ---
diff -ur rosegarden-4-1.2.3.orig/sound/DSSIPluginFactory.cpp rosegarden-4-1.2.3/sound/DSSIPluginFactory.cpp
--- rosegarden-4-1.2.3.orig/sound/DSSIPluginFactory.cpp 2006-01-03 14:14:39.000000000 -0600
+++ rosegarden-4-1.2.3/sound/DSSIPluginFactory.cpp 2006-07-16 23:18:08.000000000 -0500
@@ -236,7 +236,7 @@
if (cpath) 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;
}
diff -ur rosegarden-4-1.2.3.orig/sound/LADSPAPluginFactory.cpp rosegarden-4-1.2.3/sound/LADSPAPluginFactory.cpp
--- rosegarden-4-1.2.3.orig/sound/LADSPAPluginFactory.cpp 2006-01-03 14:14:39.000000000 -0600
+++ rosegarden-4-1.2.3/sound/LADSPAPluginFactory.cpp 2006-07-16 23:16:16.000000000 -0500
@@ -512,7 +512,7 @@
if (cpath) path = cpath;
if (path == "") {
- path = "/usr/local/lib/ladspa:/usr/lib/ladspa";
+ path = "/usr/local/lib64/ladspa:/usr/lib64/ladspa";
char *home = getenv("HOME");
if (home) path = std::string(home) + "/.ladspa:" + path;
}
@@ -699,9 +699,9 @@
std::vector<QString> path;
for (size_t i = 0; i < pluginPath.size(); ++i) {
- if (pluginPath[i].contains("/lib/")) {
+ if (pluginPath[i].contains("/lib64/")) {
QString p(pluginPath[i]);
- p.replace("/lib/", "/share/");
+ p.replace("/lib64/", "/share/");
path.push_back(p);
// std::cerr << "LADSPAPluginFactory::generateFallbackCategories: path element " << p << std::endl;
}
rosegarden-4-desktop-file.patch:
--- NEW FILE rosegarden-4-desktop-file.patch ---
diff -ur rosegarden-4-1.2.3/gui/rosegarden.desktop rosegarden-4-1.2.3.desktop/gui/rosegarden.desktop
--- rosegarden-4-1.2.3/gui/rosegarden.desktop 2004-05-22 03:06:53.000000000 -0500
+++ rosegarden-4-1.2.3.desktop/gui/rosegarden.desktop 2006-06-17 01:39:46.000000000 -0500
@@ -1,15 +1,12 @@
-# KDE Config File
-[KDE Desktop Entry]
+[Desktop Entry]
Type=Application
-Categories=AudioVideo;Application;X-SuSE-Sequencer;X-Red-Hat-Base;
+Categories=AudioVideo;Application;
Exec=rosegarden -caption "%c" %i %m
MimeType=audio/x-rosegarden;audio/x-rosegarden-device
X-KDE-NativeMimeType=audio/x-rosegarden
Icon=rosegarden.png
-MiniIcon=rosegarden.png
DocPath=rosegarden/index.html
Comment=MIDI and Audio Sequencer and Editor
-Comment[de]=
-Terminal=0
+Terminal=false
Name=Rosegarden
-Name[de]=Rosegarden
+Encoding=UTF-8
Only in rosegarden-4-1.2.3.desktop/gui: rosegarden.desktop~
--- NEW FILE rosegarden4.spec ---
Name: rosegarden4
Version: 1.2.3
Release: 3%{?dist}
Summary: MIDI, audio and notation editor
Group: Applications/Multimedia
License: GPL
URL: http://www.rosegardenmusic.com/
Source0: http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-4-%{version}.tar.bz2
Patch0: rosegarden-4-1.2.3-build-fixes.patch
Patch1: rosegarden-4-desktop-file.patch
Patch2: rosegarden-4-1.2.3-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: scons
BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: kdelibs-devel
BuildRequires: liblo-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
BuildRequires: liblrdf-devel
BuildRequires: dssi-devel
BuildRequires: lirc-devel
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
%description
Rosegarden is a professional audio and MIDI sequencer, score editor, and
general purpose music composition and editing environment.
Rosegarden is an easy to learn, attractive application, ideal for composers,
musicians, music students, and small studio or home recording environments.
%prep
%setup -q -n rosegarden-4-%{version}
%patch0 -p1
%patch1 -p1
# Look for LADSPA/DSSI plugins in the correct place on x86_64
%ifarch x86_64
%patch2 -p1
%endif
%build
CFLAGS="%{optflags}" \
CXXFLAGS="%{optflags}" \
scons configure prefix=%{_prefix}
scons %{?_smp_mflags}
%install
rm -rf %{buildroot}
scons install DESTDIR=%{buildroot}
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora \
--delete-original \
%{buildroot}%{_datadir}/applnk/Applications/rosegarden.desktop
%find_lang rosegarden
%clean
rm -rf %{buildroot}
%post
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# locolor seems to be a KDE thing?
touch --no-create %{_datadir}/icons/locolor || :
%postun
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
touch --no-create %{_datadir}/icons/locolor || :
%files -f rosegarden.lang
%defattr(-,root,root)
%doc AUTHORS COPYING
%{_bindir}/rosegarden
%{_bindir}/rosegarden-lilypondview
%{_bindir}/rosegarden-project-package
%{_bindir}/rosegardensequencer
%{_datadir}/applications/fedora-rosegarden.desktop
%{_datadir}/apps/rosegarden/
%{_docdir}/HTML/*/rosegarden/
%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.xpm
%{_datadir}/icons/hicolor/16x16/mimetypes/x-rosegarden.png
%{_datadir}/icons/hicolor/32x32/apps/rosegarden.png
%{_datadir}/icons/hicolor/32x32/mimetypes/x-rosegarden.png
%{_datadir}/icons/hicolor/48x48/apps/rosegarden.png
%{_datadir}/icons/hicolor/64x64/apps/rosegarden.png
%{_datadir}/icons/hicolor/128x128/apps/rosegarden.png
%{_datadir}/icons/locolor/16x16/apps/x-rosegarden.xpm
%{_datadir}/icons/locolor/16x16/mimetypes/x-rosegarden.png
%{_datadir}/icons/locolor/32x32/apps/rosegarden.xpm
%{_datadir}/icons/locolor/32x32/mimetypes/x-rosegarden.png
%{_datadir}/mimelnk/audio/x-rosegarden21.desktop
%{_datadir}/mimelnk/audio/x-rosegarden.desktop
%{_datadir}/mimelnk/audio/x-rosegarden-device.desktop
%{_datadir}/mimelnk/audio/x-soundfont.desktop
%changelog
* Sun Jul 16 2006 Callum Lerwick <seg at haxxed.com> - 1.2.3-3
- Look for DSSI plugins in the correct place on x86_64.
- Add gettext BR.
* Sat Jun 17 2006 Callum Lerwick <seg at haxxed.com> - 1.2.3-2
- Removed which from Buildrequires, mock needing it is confirmed to be a bug.
- Use find_lang macro.
- Look for ladspa plugins in the correct place on x86_64.
- Build against liblo, jack, dssi, lirc.
- Salvage the upstream desktop file, rather than using our own.
* Sat Apr 15 2006 Callum Lerwick <seg at haxxed.com> - 1.2.3-1
- Initial packaging for Extras.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Jul 2006 21:25:42 -0000 1.1
+++ .cvsignore 18 Jul 2006 21:29:33 -0000 1.2
@@ -0,0 +1 @@
+rosegarden-4-1.2.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Jul 2006 21:25:42 -0000 1.1
+++ sources 18 Jul 2006 21:29:33 -0000 1.2
@@ -0,0 +1 @@
+e7fb7ebcb21ac6841ac5cfd6683f5fb2 rosegarden-4-1.2.3.tar.bz2
More information about the fedora-extras-commits
mailing list