From ed02eeb1b705f5dc4c2fba6cd9e59257fc41bce1af16cc77c9a7c4820904e1e3 Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Sun, 24 Jan 2016 13:45:11 +0000
Subject: [PATCH] Accepting request 355556 from home:plater

Fixed various problems

OBS-URL: https://build.opensuse.org/request/show/355556
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=18
---
 buzztrax-appdata.patch | 17 +++++++++++++++++
 buzztrax.changes       |  7 +++++--
 buzztrax.spec          | 15 +++++++++++----
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 buzztrax-appdata.patch

diff --git a/buzztrax-appdata.patch b/buzztrax-appdata.patch
new file mode 100644
index 0000000..12b3852
--- /dev/null
+++ b/buzztrax-appdata.patch
@@ -0,0 +1,17 @@
+Index: buzztrax.appdata.xml.in
+===================================================================
+--- buzztrax.appdata.xml.in.orig
++++ buzztrax.appdata.xml.in
+@@ -1,9 +1,10 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014 Buzztrax team <buzztrax-devel@buzztrax.org> -->
+ <application>
+-  <id type="desktop">buzztrax-edit.desktop</id>
+-  <metadata_license>CC0</metadata_license>
++  <id type="desktop">buzztrax.desktop</id>
++  <metadata_license>CC0-1.0</metadata_license>
+   <project_license>LGPL-2.0+</project_license>
++  <name>Buzztrax Music Editor</name>
+   <_summary>Fully integrated music composer.</_summary>
+   <description>
+     <!-- don't translate 'tracker' -->
diff --git a/buzztrax.changes b/buzztrax.changes
index 021bc48..5dd7db0 100644
--- a/buzztrax.changes
+++ b/buzztrax.changes
@@ -1,8 +1,11 @@
 -------------------------------------------------------------------
 Fri Jan 22 14:06:19 UTC 2016 - davejplater@gmail.com
 
-- Provided appdata(buzztrax-edit.appdata.xml) as a work around for
-  boo#961304 which is marked duplicate of boo#952324
+- Renamed buzztrax-edit.desktop buzztrax.desktop
+- Added buzztrax-appdata.patch to add name matching desktop file's
+  name field, fix incorrect metadata_licence field and to match the
+  actual desktop file name in the id type field.
+- Owned directories that weren't uninstalled with package.
 
 -------------------------------------------------------------------
 Wed Jan  6 10:30:55 UTC 2016 - davejplater@gmail.com
diff --git a/buzztrax.spec b/buzztrax.spec
index 862c110..e396cee 100644
--- a/buzztrax.spec
+++ b/buzztrax.spec
@@ -39,6 +39,7 @@ Source1:        autogen.sh
 Source2:        COPYING-DOCS
 # Combined patch of cherry picked build fixes applies after 0.10.2
 Patch0:         buzztrax-build.patch
+Patch1:         buzztrax-appdata.patch
 BuildRequires:  automake >= 1.13
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -76,7 +77,7 @@ Requires:       %{name}-plugins = %{version}
 Requires:       gstreamer-1_0-plugins-buzztrax = %{version}
 # We provide appdata(buzztrax-edit.appdata.xml) to prevent installation system error see:
 # boo#961304 which is marked duplicate of boo#952304
-Provides:       appdata(buzztrax-edit.appdata.xml)
+#Provides:       appdata(buzztrax-edit.appdata.xml)
 Provides:       buzztard = %{version}
 Obsoletes:      buzztard < %{version}
 %{gconf_schemas_requires}
@@ -198,13 +199,14 @@ This package contains buzztrax plugins
 %prep
 %setup -q
 %patch0
+%patch1
 # Rpmlint complains that COPYING-DOCS is outdated
 cp -v %{SOURCE2} .
 cp -v %{SOURCE1} .
-/bin/sh ./autogen.sh --noconfigure
 
 %build
 #export CFLAGS="-Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=int-to-pointer-cast %%{optflags}"
+/bin/sh ./autogen.sh --noconfigure
 %configure --disable-static \
     --disable-schemas-compile \
     --disable-silent-rules \
@@ -222,6 +224,7 @@ make %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 echo %{buildroot}
 %find_lang %{name}-%{version}
+mv %{buildroot}%{_datadir}/applications/buzztrax-edit.desktop %{buildroot}%{_datadir}/applications/buzztrax.desktop
 #%%find_gconf_schemas
 %fdupes -s %{buildroot}
 printf 'libbuzztrax-ic%{ic_soname}\n
@@ -286,14 +289,19 @@ typelib-1_0-BuzztraxCore-1_1\n
 %defattr(0644,root,root,0755)
 %doc AUTHORS COPYING COPYING-DOCS NEWS README.md TODO
 %attr(0755,root,root) %{_bindir}/*
+%dir %{_datadir}/buzztrax
 %{_datadir}/buzztrax/
-%{_datadir}/applications/buzztrax-edit.desktop
+%{_datadir}/applications/buzztrax.desktop
+%{_datadir}/appdata/buzztrax.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/gnome
 %dir %{_datadir}/omf
+%dir %{_datadir}/omf/buzztrax-edit
 %doc %{_datadir}/omf/buzztrax-edit/
 %dir %{_datadir}/gnome/
 %doc %{_datadir}/gnome/help/
+%dir %{_datadir}/gtk-doc/html/buzztrax-cmd
+%dir %{_datadir}/gtk-doc/html/buzztrax-edit
 %{_datadir}/gtk-doc/html/buzztrax-cmd/
 %{_datadir}/gtk-doc/html/buzztrax-edit/
 %{_datadir}/mime/packages/buzztrax.xml
@@ -302,7 +310,6 @@ typelib-1_0-BuzztraxCore-1_1\n
 # NOTE: These files need a proper home and correct handling.
 %{_datadir}/GConf/gsettings/buzztrax.convert
 %dir %{_datadir}/appdata
-%{_datadir}/appdata/buzztrax.appdata.xml
 %{_datadir}/glib-2.0/schemas/org.buzztrax.gschema.xml
 
 %files -n gstreamer-1_0-plugins-buzztrax