X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=AppStream.spec;h=66747f6fb1a5d3ce6876c9784bface565828bc2e;hb=c478a3e4c8afa35cee73488cacafb3a7841f50bc;hp=3533aec6b9754f77560a514c68aedc8170a80fac;hpb=6778f2838de7c3681e37224b9e837281d0c5ff28;p=packages%2FAppStream.git

diff --git a/AppStream.spec b/AppStream.spec
index 3533aec..66747f6 100644
--- a/AppStream.spec
+++ b/AppStream.spec
@@ -1,36 +1,37 @@
-# TODO: qt5 support (on bcond? devel package not parallel installable with qt4, only soname differs)
 #
 # Conditional build:
 %bcond_without	apidocs		# API documentation build
 %bcond_without	qt		# Qt library (libappstream-qt)
 %bcond_without	vala		# Vala API (VAPI)
-#
+
 Summary:	AppStream-Core library and tools
 Summary(pl.UTF-8):	Biblioteka i narzędzia AppStream-Core
 Name:		AppStream
-Version:	0.7.5
+Version:	0.8.4
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	25c9d393787a1db04ed418be4be21caa
+# Source0-md5:	8294719755719d64640b84f7a3217591
 Patch0:		%{name}-cmake.patch
 URL:		http://www.freedesktop.org/wiki/Distributions/AppStream/Software/
-%{?with_qt:BuildRequires:	QtCore-devel >= 4.8.0}
 BuildRequires:	cmake >= 2.8.12
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.36
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	intltool
 BuildRequires:	libstdc++-devel
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	pkgconfig
-%{?with_qt:BuildRequires:	qt4-qmake >= 4.8.0}
 BuildRequires:	tar >= 1:1.22
 %{?with_vala:BuildRequires:	vala}
 BuildRequires:	xapian-core-devel >= 1.2
 BuildRequires:	xz
 BuildRequires:	yaml-devel >= 0.1
+%if %{with qt}
+BuildRequires:	Qt5Core-devel >= 5.0
+BuildRequires:	qt5-qmake >= 5.0
+%endif
 %if %{with apidocs}
 BuildRequires:	gtk-doc
 BuildRequires:	publican
@@ -66,6 +67,9 @@ Pliki nagłówkowe biblioteki AppStream.
 Summary:	AppStream API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki AppStream
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 API documentation for AppStream library.
@@ -77,7 +81,7 @@ Dokumentacja API biblioteki AppStream.
 Summary:	AppstreamQt library
 Summary(pl.UTF-8):	Biblioteka AppstreamQt
 Group:		Libraries
-Requires:	QtCore >= 4.8.0
+Requires:	Qt5Core >= 5.0
 Requires:	xapian-core-libs >= 1.2
 
 %description qt
@@ -91,7 +95,7 @@ Summary:	Header files for AppstreamQt library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki AppstreamQt
 Group:		Libraries
 Requires:	%{name}-qt = %{version}-%{release}
-Requires:	QtCore-devel >= 4.8.0
+Requires:	Qt5Core-devel >= 5.0
 
 %description qt-devel
 Header files for AppstreamQt library.
@@ -149,27 +153,26 @@ rm -rf $RPM_BUILD_ROOT
 %files -f appstream.lang
 %defattr(644,root,root,755)
 %doc AUTHORS MAINTAINERS NEWS README.md RELEASE
-%attr(755,root,root) %{_bindir}/appstream-index
-%attr(755,root,root) %{_bindir}/appstream-validate
+%attr(755,root,root) %{_bindir}/appstreamcli
 %attr(755,root,root) %{_libdir}/libappstream.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libappstream.so.1
-%{_libdir}/girepository-1.0/AppStream-0.7.typelib
+%attr(755,root,root) %ghost %{_libdir}/libappstream.so.2
+%{_libdir}/girepository-1.0/AppStream-0.8.typelib
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/appstream.conf
 %dir %{_datadir}/app-info
 %{_datadir}/app-info/categories.xml
-%{_mandir}/man1/appstream-index.1*
-%{_mandir}/man1/appstream-validate.1*
+%{_mandir}/man1/appstreamcli.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libappstream.so
-%{_datadir}/gir-1.0/AppStream-0.7.gir
+%{_datadir}/gir-1.0/AppStream-0.8.gir
 %{_includedir}/AppStream
 %{_pkgconfigdir}/appstream.pc
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
+%{_docdir}/appstream
 %{_gtkdocdir}/appstream
 %endif
 
@@ -177,7 +180,7 @@ rm -rf $RPM_BUILD_ROOT
 %files qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libAppstreamQt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libAppstreamQt.so.0
+%attr(755,root,root) %ghost %{_libdir}/libAppstreamQt.so.1
 
 %files qt-devel
 %defattr(644,root,root,755)