Merge into f20

urbanlightscape.spec

@@ -33,7 +33,7 @@ CXXFLAGS="%{optflags} -msse2"
 export CXXFLAGS
 export CPPFLAGS=${CXXFLAGS}
 %configure
-%make_build
+make %{?_smp_mflags}
 
 %install
 %make_install
@@ -67,8 +67,7 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
-%doc README
-%license COPYING
+%doc COPYING README
 %{_bindir}/urbanlightscape
 %{_datadir}/applications/urbanlightscape.desktop
 %{_datadir}/icons/hicolor/*x*/apps/urbanlightscape.png
@@ -82,9 +81,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Wed Jun 18 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3.2-5
 - Mark ExclusiveArch due to xmmintrin.h usage (#1107042)
 
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
 * Mon Mar 03 2014 Christopher Meng <rpm@cicku.me> - 1.3.2-3
 - Disable sse flags.