Accepting request 60052 from home:plater

Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/60052
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/rosegarden?expand=0&rev=7

rosegarden.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package rosegarden (Version 10.10)
+# spec file for package rosegarden4 (Version 11.02)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,27 +13,28 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
 
 # norootforbuild
 
-
 Name:           rosegarden
-BuildRequires:  libjack-devel
-BuildRequires:  libqt4-devel >= 4.4.0
-BuildRequires:  alsa-devel dssi-devel fftw3-devel ladspa-devel liblrdf-devel libxml2-devel lirc-devel
-BuildRequires:  libsamplerate-devel libsndfile-devel
-BuildRequires:  fdupes liblo-devel shared-mime-info update-desktop-files
-Version:        10.10
-Release:        1
+BuildRequires:  libjack-devel xorg-x11-util-devel
+BuildRequires:  libqt4-devel >= 4.4.0 pkg-config liblo-devel
+BuildRequires:  alsa-devel dssi-devel fftw3-devel ladspa-devel liblrdf-devel
+BuildRequires:  libsamplerate-devel libsndfile-devel libxml2-devel lirc-devel
+BuildRequires:  fdupes shared-mime-info update-desktop-files hicolor-icon-theme
+Version:        11.02
+Release:        0
 License:        GPLv2+
 Source0:        http://sourceforge.net/projects/rosegarden/rosegarden-%{version}.tar.bz2
 Source1:        rosegarden.xpm
 Source2:        rosegarden.1
+Source3:        CHANGES.txt
 # This patch fixes the 64 bit lib search path for dssi and ladspa and is distro specific for now.
 Patch0:         rosegarden-10.02-plugin-lib64path.patch
 # This patch fixes the file search paths for examples, templates and midi driver libraries.
-Patch1:         rosegarden-%{version}-filepaths.patch
+Patch1:         rosegarden-10.10-filepaths.patch
+#This patch is merged upstream but I'm leaving it here for future gcc46 errors.
+#Patch2:         rosegarden-gcc46fix.patch
 Group:          Productivity/Multimedia/Sound/Midi
 Summary:        Midi, Audio And Notation Editor
 Icon:           rosegarden.xpm
@@ -71,7 +72,10 @@ Authors:
 %prep
 %setup -q
 %patch0
-%patch1 -p1
+%patch1
+#This patch is merged upstream but I'm leaving it here for future gcc46 errors.
+#%%patch2
+# When we build svn we need to execute bootstrap.sh it doesn't harm the release build either.
 sh bootstrap.sh
 %{?suse_update_config:%{suse_update_config -f}}
 
@@ -81,7 +85,6 @@ export QTDIR=/usr/
 export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb"
 export CXXFLAGS="$CFLAGS"
 # -fmessage-length=0 -O2 -fno-strict-aliasing -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
-#sh bootstrap.sh
 %configure --enable-debug --localedir=%{_datadir}/rosegarden/locale/
 %__make %{?jobs:-j%{jobs}}
 # This translation handling make section is possibly only necessary when building svn
@@ -104,6 +107,8 @@ chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/lircrc.rosegarden
 chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/README
 chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/color-list
 chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/simple-makefile
+# Copy CHANGES.txt, created from sourceforge web page.
+cp -v %{S:3} ./
 
 %__install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/pixmaps/rosegarden.xpm"
 %suse_update_desktop_file %{buildroot}/%{_datadir}/applications/rosegarden.desktop
@@ -123,7 +128,7 @@ rm -rf %buildroot
 
 %files
 %defattr(-,root,root)
-%dir %{_datadir}/icons/hicolor
+%doc AUTHORS COPYING README CHANGES.txt
 %dir %{_datadir}/rosegarden/
 %dir %{_datadir}/rosegarden/autoload
 %dir %{_datadir}/rosegarden/chords
@@ -140,7 +145,7 @@ rm -rf %buildroot
 %{_datadir}/pixmaps/rosegarden.xpm
 %{_datadir}/applications/rosegarden.desktop
 %{_bindir}/rosegarden
- %{_mandir}/man1/*
+%{_mandir}/man1/*
 %{_datadir}/rosegarden/*
 %{_datadir}/rosegarden/presets/*
 %{_datadir}/rosegarden/pixmaps/*