diff --git a/appstream.spec b/appstream.spec index 0340ec8..bce7fd7 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,13 +1,11 @@ -# Qt5 support uses the same base library names, so not parallel-installable -#global qt5 1 # Vala/Vapi support ( upstream disabled by default, probably explains why it the build breaks often ) #global vala 1 Summary: Utilities to generate, maintain and access the AppStream Xapian database Name: appstream Version: 0.7.5 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -24,10 +22,7 @@ BuildRequires: intltool BuildRequires: pkgconfig(gio-2.0) pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(packagekit-glib2) -BuildRequires: pkgconfig(QtCore) -%if 0%{?qt5} BuildRequires: pkgconfig(Qt5Core) -%endif BuildRequires: pkgconfig(yaml-0.1) BuildRequires: xapian-core-devel BuildRequires: xmlto @@ -49,7 +44,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %{summary}. %package qt -Summary: Qt bindings for %{name} +Summary: Qt5 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description qt %{summary}. @@ -57,21 +52,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %package qt-devel Summary: Development files for %{name}-qt bindings Requires: %{name}-qt%{?_isa} = %{version}-%{release} -Requires: pkgconfig(QtCore) -%description qt-devel -%{summary}. - -%package qt5 -Summary: Qt bindings for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -%description qt5 -%{summary}. - -%package qt5-devel -Summary: Development files for %{name}-qt5 bindings -Requires: %{name}-qt5%{?_isa} = %{version}-%{release} Requires: pkgconfig(Qt5Core) -%description qt5-devel +%description qt-devel %{summary}. %if 0%{?vala} @@ -93,31 +75,15 @@ Requires: vala mkdir %{_target_platform} pushd %{_target_platform} %{cmake} .. \ - -DQT:BOOL=ON -DAPPSTREAM_QT_VERSION:STRING="4"\ + -DQT:BOOL=ON -DAPPSTREAM_QT_VERSION:STRING="5"\ -DTESTS:BOOL=ON \ -DVAPI:BOOL=%{?vala:ON}%{!?vala:OFF} popd make %{?_smp_mflags} -C %{_target_platform} -%if 0%{?qt5} -mkdir -p %{_target_platform}-qt5 -pushd %{_target_platform}-qt5 -%{cmake} \ - -DQT:BOOL=ON -DAPPSTREAM_QT_VERSION:STRING="5"\ - -DTESTS:BOOL=ON \ - -DVAPI:BOOL=%{?vala:ON}%{!?vala:OFF} \ - .. -popd - -make %{?_smp_mflags} -C %{_target_platform}-qt5 -%endif - %install -%if 0%{?qt5} -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5 -%endif make install/fast DESTDIR=%{buildroot} -C %{_target_platform} mkdir -p %{buildroot}%{_datadir}/app-info/{icons,xmls} @@ -171,7 +137,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" %postun qt -p /sbin/ldconfig %files qt -%{_libdir}/libAppstreamQt.so.0* +%{_libdir}/libAppstreamQt.so.1* %files qt-devel %{_includedir}/AppstreamQt/ @@ -185,6 +151,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" %changelog +* Wed Jan 21 2015 Rex Dieter 0.7.5-2 +- -qt: Qt5 support (drop deprecated Qt4-based bindings) + * Tue Jan 13 2015 Rex Dieter 0.7.5-1 - 0.7.5