X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=AppStream.spec;h=d49febc12f9f5ad159eda8316a33adc07e079a4e;hb=309888e2ad865ca939348dfda81041d67fa05e0b;hp=1e4681853f228241ef0b135c9c20d9964c3b84fd;hpb=112490e9742630f9a2ffe7e6e05d14f88484eac9;p=packages%2FAppStream.git

diff --git a/AppStream.spec b/AppStream.spec
index 1e46818..d49febc 100644
--- a/AppStream.spec
+++ b/AppStream.spec
@@ -2,18 +2,17 @@
 # Conditional build:
 %bcond_without	apidocs		# API documentation build
 %bcond_without	qt		# Qt library (libappstream-qt)
-%bcond_with	qt4		# Qt 4.x instead of Qt 5 (note: devel supports only single package at a time)
 %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.8.0
+Version:	0.8.5
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	9efd0d73f7b0b9391c862cb925b729cf
+# Source0-md5:	7f67e2d822f83f1cb0fbbeac4aa9e55a
 Patch0:		%{name}-cmake.patch
 URL:		http://www.freedesktop.org/wiki/Distributions/AppStream/Software/
 BuildRequires:	cmake >= 2.8.12
@@ -24,20 +23,16 @@ BuildRequires:	intltool
 BuildRequires:	libstdc++-devel
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	pkgconfig
+BuildRequires:	protobuf-devel
 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}
-%if %{with qt4}
-BuildRequires:	QtCore-devel >= 4.8.0
-BuildRequires:	qt4-qmake >= 4.8.0
-%else
 BuildRequires:	Qt5Core-devel >= 5.0
 BuildRequires:	qt5-qmake >= 5.0
 %endif
-%endif
 %if %{with apidocs}
 BuildRequires:	gtk-doc
 BuildRequires:	publican
@@ -73,6 +68,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.
@@ -84,11 +82,7 @@ Dokumentacja API biblioteki AppStream.
 Summary:	AppstreamQt library
 Summary(pl.UTF-8):	Biblioteka AppstreamQt
 Group:		Libraries
-%if %{with qt4}
-Requires:	QtCore >= 4.8.0
-%else
 Requires:	Qt5Core >= 5.0
-%endif
 Requires:	xapian-core-libs >= 1.2
 
 %description qt
@@ -102,11 +96,7 @@ Summary:	Header files for AppstreamQt library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki AppstreamQt
 Group:		Libraries
 Requires:	%{name}-qt = %{version}-%{release}
-%if %{with qt4}
-Requires:	QtCore-devel >= 4.8.0
-%else
 Requires:	Qt5Core-devel >= 5.0
-%endif
 
 %description qt-devel
 Header files for AppstreamQt library.
@@ -136,7 +126,7 @@ install -d build
 cd build
 %cmake .. \
 	%{?with_apidocs:-DDOCUMENTATION=ON} \
-	%{?with_qt:-DQT=ON %{?with_qt4:-DAPPSTREAM_QT_VERSION=4}} \
+	%{?with_qt:-DQT=ON} \
 	%{?with_vala:-DVAPI=ON}
 
 %{__make} -j1
@@ -164,16 +154,14 @@ 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.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)
@@ -193,11 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 %files qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libAppstreamQt.so.*.*.*
-%if %{with qt4}
-%attr(755,root,root) %ghost %{_libdir}/libAppstreamQt.so.0
-%else
 %attr(755,root,root) %ghost %{_libdir}/libAppstreamQt.so.1
-%endif
 
 %files qt-devel
 %defattr(644,root,root,755)