[codeblocks] Use the AppData and MetaInfo files written by Ryan

Richard Hughes rhughes at fedoraproject.org
Mon Jul 7 14:59:25 UTC 2014


commit 2b5c9521d3f16a16fd71e27020d729773456fb34
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jul 7 15:59:35 2014 +0100

    Use the AppData and MetaInfo files written by Ryan

 .gitignore      |    2 ++
 codeblocks.spec |   12 +++++++++++-
 sources         |    2 ++
 3 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3fd0eda..1d1cbf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 codeblocks-10.05-src.tar.bz2
 /codeblocks_12.11-1.tar.gz
 /codeblocks_13.12-1.tar.gz
+/codeblocks.appdata.xml
+/codeblocks-contrib.metainfo.xml
diff --git a/codeblocks.spec b/codeblocks.spec
index b1fe7bd..9b5f8cb 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -7,7 +7,7 @@
 
 Name:		codeblocks
 Version:	13.12
-Release:	6%{?svnrelease}%{?dist}
+Release:	7%{?svnrelease}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -19,6 +19,9 @@ Patch0:		codeblocks-autorev.patch
 %else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}_%{version}-1.tar.gz
 %endif
+Source1:	codeblocks.appdata.xml
+Source2:	codeblocks-contrib.metainfo.xml
+
 BuildRequires:	libtool
 BuildRequires:	wxGTK-devel
 BuildRequires:	zlib-devel
@@ -41,6 +44,7 @@ BuildRequires:	gamin-devel
 BuildRequires:	zip
 BuildRequires:	dos2unix
 BuildRequires:	desktop-file-utils
+BuildRequires:	libappstream-glib
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	shared-mime-info
 Requires:	xterm
@@ -176,6 +180,7 @@ make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" install
+DESTDIR=%{buildroot} appstream-util install %{SOURCE1} %{SOURCE2}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/wxContribItems/*.la
@@ -230,6 +235,7 @@ update-mime-database /usr/share/mime &> /dev/null || :
 %{plugindir}/libscriptedwizard.so
 %{plugindir}/libtodo.so
 
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
 %{_datadir}/mime/packages/%{name}.xml
@@ -378,9 +384,13 @@ update-mime-database /usr/share/mime &> /dev/null || :
 %{plugindir}/libSpellChecker.so
 %endif
 %{plugindir}/libSmartIndent*.so
+%{_datadir}/appdata/%{name}-contrib.metainfo.xml
 
 
 %changelog
+* Mon Jul 07 2014 Richard Hughes <richard at hughsie.com> - 13.12-7
+- Use the AppData and MetaInfo files written by Ryan
+
 * 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
diff --git a/sources b/sources
index 4c3bd64..2d5921e 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 4b450f620d9f1875ecf6882ab3c11402  codeblocks_13.12-1.tar.gz
+652294efd372f439f5cd8870216265d5  codeblocks.appdata.xml
+c142b0a9827b6d0e375b99c54c929dbb  codeblocks-contrib.metainfo.xml


More information about the scm-commits mailing list