X-Git-Url: http://git.pld-linux.org/?p=packages%2FAppStream.git;a=blobdiff_plain;f=AppStream.spec;h=8f43d4d9e312cc3ab40e52574e15f1e1ce99d61e;hp=94305bae43fad6539aaf088d0d0420d102f13653;hb=4c88c945ff592a788ee840348c2d7f7efa805135;hpb=031678adae969220c4c3b0c189e1f203848466e3;ds=sidebyside

diff --git a/AppStream.spec b/AppStream.spec
index 94305ba..8f43d4d 100644
--- a/AppStream.spec
+++ b/AppStream.spec
@@ -1,20 +1,23 @@
+# 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.6.2
+Version:	0.7.4
 Release:	1
-License:	LGPL v3
+License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	c5df357df76156f7a6d4dd9a27b50b66
+Source0:	http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz
+# Source0-md5:	69e6bd4b07a4ece3104acaded5276ba8
+Patch0:		%{name}-cmake.patch
 URL:		http://www.freedesktop.org/wiki/Distributions/AppStream/Software/
-BuildRequires:	PackageKit-devel
-BuildRequires:	cmake >= 2.8.6
+%{?with_qt:BuildRequires:	QtCore-devel >= 4.8.0}
+BuildRequires:	cmake >= 2.8.12
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.36
 BuildRequires:	gobject-introspection-devel
@@ -22,8 +25,12 @@ 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 apidocs}
 BuildRequires:	gtk-doc
 BuildRequires:	publican
@@ -31,6 +38,7 @@ BuildRequires:	xmlto
 %endif
 Requires:	glib2 >= 1:2.36
 Requires:	xapian-core-libs >= 1.2
+Obsoletes:	PackageKit-plugin-appstream
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -65,6 +73,32 @@ API documentation for AppStream library.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki AppStream.
 
+%package qt
+Summary:	AppstreamQt library
+Summary(pl.UTF-8):	Biblioteka AppstreamQt
+Group:		Libraries
+Requires:	QtCore >= 4.8.0
+Requires:	xapian-core-libs >= 1.2
+
+%description qt
+AppstreamQt library.
+
+%description qt -l pl.UTF-8
+Biblioteka AppstreamQt.
+
+%package qt-devel
+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
+
+%description qt-devel
+Header files for AppstreamQt library.
+
+%description qt-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki AppstreamQt.
+
 %package -n vala-appstream
 Summary:	Vala API for AppStream library
 Summary(pl.UTF-8):	API języka Vala do biblioteki AppStream
@@ -78,29 +112,16 @@ Vala API for AppStream library.
 %description -n vala-appstream -l pl.UTF-8
 API języka Vala do biblioteki AppStream.
 
-%package -n PackageKit-plugin-appstream
-Summary:	AppStream plugin for PackageKit
-Summary(pl.UTF-8):	Wtyczka AppStream dla PackageKita
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	PackageKit
-
-%description -n PackageKit-plugin-appstream
-AppStream plugin for PackageKit. It refreshes the AppStream database
-of available applications.
-
-%description -n PackageKit-plugin-appstream -l pl.UTF-8
-Wtyczka AppStream dla PackageKita. Odświeża bazę danych AppStream
-dostępnych aplikacji.
-
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
 cd build
 %cmake .. \
 	%{?with_apidocs:-DDOCUMENTATION=ON} \
+	%{?with_qt:-DQT=ON} \
 	%{?with_vala:-DVAPI=ON}
 
 %{__make} -j1
@@ -111,20 +132,28 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_docdir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/gtk-doc $RPM_BUILD_ROOT%{_docdir}
+
+%find_lang appstream
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files
+%post	qt -p /sbin/ldconfig
+%postun	qt -p /sbin/ldconfig
+
+%files -f appstream.lang
 %defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS NEWS README RELEASE
+%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) %{_libdir}/libappstream.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libappstream.so.0
-%{_libdir}/girepository-1.0/Appstream-0.6.typelib
+%attr(755,root,root) %ghost %{_libdir}/libappstream.so.1
+%{_libdir}/girepository-1.0/AppStream-0.7.typelib
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/appstream.conf
 %dir %{_datadir}/app-info
 %{_datadir}/app-info/categories.xml
@@ -134,14 +163,27 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libappstream.so
-%{_datadir}/gir-1.0/Appstream-0.6.gir
-%{_includedir}/Appstream
+%{_datadir}/gir-1.0/AppStream-0.7.gir
+%{_includedir}/AppStream
 %{_pkgconfigdir}/appstream.pc
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc docs/html/*
+%{_gtkdocdir}/appstream
+%endif
+
+%if %{with qt}
+%files qt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libAppstreamQt.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libAppstreamQt.so.0
+
+%files qt-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libAppstreamQt.so
+%{_includedir}/AppstreamQt
+%{_libdir}/cmake/AppstreamQt
 %endif
 
 %if %{with vala}
@@ -149,7 +191,3 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_datadir}/vala/vapi/appstream.vapi
 %endif
-
-%files -n PackageKit-plugin-appstream
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin_appstream.so