Revert dropping vendor from desktop file for f18

Revert "Fix name for desktop file"
This reverts commit 89d96cf4ca.
2013-02-24 12:15:29 -07:00 · 2013-02-24 12:14:07 -07:00 · 2013-02-24 12:13:43 -07:00 · 2012-12-21 21:14:50 -07:00 · 2012-12-03 19:51:10 +02:00
1 changed files with 6 additions and 23 deletions
--- a/octave.spec
+++ b/octave.spec
@ -131,7 +131,7 @@ touch %{buildroot}%{_datadir}/%{name}/ls-R

 # Create desktop file
 rm %{buildroot}%{_datadir}/applications/www.octave.org-octave.desktop
-desktop-file-install --remove-category Development --add-category "Education" \
+desktop-file-install --vendor fedora --remove-category Development --add-category "Education" \
  --add-category "DataVisualization" --add-category "NumericalAnalysis" --add-category "Engineering" --add-category "Physics" \
  --dir %{buildroot}%{_datadir}/applications doc/icons/octave.desktop

@ -232,7 +232,7 @@ fi
 %{_infodir}/liboctave.info*
 %{_infodir}/octave.info*
 %{_infodir}/OctaveFAQ.info*
-%{_datadir}/applications/octave.desktop
+%{_datadir}/applications/fedora-octave.desktop
 # octave_packages is %ghost, so need to list everything else separately
 %dir %{_datadir}/octave
 %{_datadir}/octave/%{version}%{?rctag}/
@ -260,30 +260,13 @@ fi
 %changelog
 * Sat Feb 23 2013 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.6.4-1
 - Update to 3.6.4 final
+- Drop sparse patch applied upstream

-* Tue Feb 12 2013 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.6.4-0.7.rc2
- Update to 3.6.4-rc2
-
-* Tue Feb 12 2013 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.6.4-0.6.rc1
- Drop vendor from desktop file
-
-* Sun Feb 03 2013 Kevin Fenzi <kevin@scrye.com> - 6:3.6.4-0.5.rc1
- Rebuild for broken deps in rawhide
-
-* Fri Jan 4 2013 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.6.4-0.4.rc1
- Update to 3.6.4-rc1
- Drop gets patch
-
-* Fri Dec 21 2012 Orion Poplawski <orion@cora.nwra.com> - 6:3.6.4-0.3.rc0
+* Fri Dec 21 2012 Orion Poplawski <orion@cora.nwra.com> - 6:3.6.3-2.2
 - Add patch to ignore deps when building packages for now (bug 733615)

-* Wed Dec 05 2012 Orion Poplawski <orion@cora.nwra.com> - 6:3.6.4-0.2.rc0
- Restore gets patch
- Rebuild for hdf5 1.8.10
-
-* Wed Oct 17 2012 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.6.4-0.1.rc0
- Update to 3.6.4-rc0
- Drop sparse patch applied upstream
+* Mon Dec 3 2012 Susi Lehtola <jussilehtola@fedoraproject.org> - 6:3.6.3-2.1
+- Rebuild against newer fltk in Fedora 18.

 * Thu Sep 6 2012 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.6.3-2
 - Add upstream patch to fix sparse matrix test crash
Author	SHA1	Message	Date
Orion Poplawski	1f17009505	Revert dropping vendor from desktop file for f18	2013-02-24 12:15:29 -07:00
Orion Poplawski	ccd1c67391	Revert "Fix name for desktop file" This reverts commit `89d96cf4ca`.	2013-02-24 12:14:07 -07:00
Orion Poplawski	833ac8cf8c	Fixup changelog	2013-02-24 12:13:43 -07:00
Orion Poplawski	04394b46f4	Add patch to ignore deps when building packages for now (bug 733615)	2012-12-21 21:14:50 -07:00
Jussi Lehtola	87f3769f2e	Bump spec.	2012-12-03 19:51:10 +02:00