[rosegarden4: 2/2] Merge un-pulled changes

[Brendan Jones]

commit 70f078c47f261744ccbb913878a2bd082eda60be
Merge: 36bed4c 6a3cac7
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Tue Oct 1 04:32:02 2013 +0200

    Merge un-pulled changes

 rosegarden4.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --cc rosegarden4.spec
index d6fd465,99474d3..dee8a42
--- a/rosegarden4.spec
+++ b/rosegarden4.spec
@@@ -105,10 -103,8 +105,7 @@@ desktop-file-install 
  # Install fonts in the %%_fontdir
  mkdir -p %{buildroot}/%{_fontdir}
  install -pm 644 data/fonts/*.pfa %{buildroot}/%{_fontdir}
- #mkdir -p %{buildroot}/%{_datadir}/appdata/
- #install -pm 644 %{SOURCE2} %{buildroot}/%{_datadir}/appdata/
- 
  
 -
  %clean
  rm -rf %{buildroot}
  
@@@ -147,14 -142,10 +144,17 @@@ gtk-update-icon-cache %{_datadir}/icons
  %doc data/fonts/README COPYING
  
  %changelog
 +* Mon Sep 30 2013 Brendan Jones <brendan.jones.it at gmail.com> 13.06-2
 +- Add appdata file
 +- Clean up changelog
 +
 +* Mon Jul 22 2013 Brendan Jones <brendan.jones.it at gmail.com> 13.06-1
 +- Update to 13.06
 +
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13.04-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
 -* Mon Apr 22 2013 Brendan Jones <brendan.jones.it at gmail.com> -1
 +* Mon Apr 22 2013 Brendan Jones <brendan.jones.it at gmail.com> 13.04-1
  - Update to 13.04
  
  * Wed Feb 13 2013 Brendan Jones <brendan.jones.it at gmail.com> 12.12.25--4