[astromenace: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/astromenace

[Jon Ciesla]

commit 4b08a41d04accd24c50e624f841e7abf55f22b74
Merge: 5e26267 0ca2b8b
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Apr 3 13:40:23 2013 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/astromenace
    
    Conflicts:
    	astromenace.spec

 astromenace.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc astromenace.spec
index 67d11da,101884f..356d26d
--- a/astromenace.spec
+++ b/astromenace.spec
@@@ -93,17 -91,16 +93,23 @@@ rm -rf %{buildroot
  %{_bindir}/astromenace
  %{_bindir}/%{name}-wrapper
  %doc ReadMe.txt License.txt gpl-3.0.txt
 -%{_datadir}/applications/fedora-astromenace.desktop
 +%{_datadir}/applications/astromenace.desktop
  %{_datadir}/icons/hicolor/64x64/apps/astromenace.png
 +%{_datadir}/astromenace/
  
  %changelog
 +* Thu Mar 21 2013 Jon Ciesla <limburgher at gmail.com> - 1.3.1-1
 +- 1.3.1.
 +- Drop desktop vendor tag.
 +- Obsolete/provide -data.
 +- Using modified tarball and patch to avoid Ubuntu Font License, non-free.
 +
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-20
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 1.2-19
+ - rebuild due to "jpeg8-ABI" feature drop
+ 
  * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.2-18
  - rebuild against new libjpeg