[codeblocks] Remove the incorrect --vendor conditional

Richard Hughes rhughes at fedoraproject.org
Mon Jul 7 08:27:42 UTC 2014


commit 04d991af7cfb8e7a5e48bf5249653470f0b3c6f2
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jul 7 09:26:47 2014 +0100

    Remove the incorrect --vendor conditional

 codeblocks.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/codeblocks.spec b/codeblocks.spec
index aa094d7..b1fe7bd 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -7,7 +7,7 @@
 
 Name:		codeblocks
 Version:	13.12
-Release:	5%{?svnrelease}%{?dist}
+Release:	6%{?svnrelease}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -182,9 +182,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/wxContribItems/*.la
 rm -f $RPM_BUILD_ROOT%{plugindir}/*.la
 
 desktop-file-install \
-%if 0%{?rhel} < 7 || 0%{?fedora} < 19
-	--vendor fedora \
-%endif
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--delete-original \
 	$RPM_BUILD_ROOT%{_datadir}/applications/codeblocks.desktop
@@ -233,11 +230,7 @@ update-mime-database /usr/share/mime &> /dev/null || :
 %{plugindir}/libscriptedwizard.so
 %{plugindir}/libtodo.so
 
-%if 0%{?rhel} < 7 || 0%{?fedora} < 19
-%{_datadir}/applications/fedora-%{name}.desktop
-%else
 %{_datadir}/applications/%{name}.desktop
-%endif
 %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/pixmaps/%{name}.png
@@ -388,6 +381,12 @@ update-mime-database /usr/share/mime &> /dev/null || :
 
 
 %changelog
+* Mon Jul 07 2014 Richard Hughes <richard at hughsie.com> - 13.12-6
+- Remove the incorrect conditional (which doesn't work) to never use --vendor
+  when installing desktop files. Using --vendor means the AppStream builder
+  cannot match an AppData file which means Code::Blocks doesn't appear in the
+  software center.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13.12-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list