diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index f528a7a..6f35b1b 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 16 23:19:32 UTC 2013 - hrvoje.senjan@gmail.com + +- Make devel packages naming consistent: + use libqt5-$upstreammodulename-(devel, private-headers-devel) + ------------------------------------------------------------------- Thu Dec 12 14:34:54 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index d5ab623..f1f263a 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -27,12 +27,12 @@ Group: Development/Libraries/X11 Url: http://qt.digia.com Source: %{tar_version}.tar.xz BuildRequires: fdupes -BuildRequires: libQt5Svg-devel >= %{version} +BuildRequires: libqt5-qtsvg-devel >= %{version} %define base_name libqt5 %define real_version 5.2.0 %define so_version 5.2.0 %define tar_version qtdeclarative-opensource-src-%{real_version} -BuildRequires: libQt5XmlPatterns-devel >= %{version} +BuildRequires: libqt5-qtxmlpatterns-devel >= %{version} BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: xz @@ -57,24 +57,30 @@ Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. -%package -n libQt5Quick-devel +%package devel Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: %libname = %{version} -Requires: libQt5Svg-devel >= %{version} -Requires: libQt5XmlPatterns-devel >= %{version} +Requires: libqt5-qtsvg-devel >= %{version} +Requires: libqt5-qtxmlpatterns-devel >= %{version} Requires: libqt5-qtbase-devel >= %{version} +Provides: libQt5Quick-devel = %{version} +# TODO: change to < on 5.2.1 update +Obsoletes: libQt5Quick-devel <= %{version} -%description -n libQt5Quick-devel +%description devel You need this package, if you want to compile programs with qtdeclarative. -%package -n libQt5Quick-private-headers-devel +%package private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -Requires: libQt5Quick-devel = %{version} +Requires: %{name}-devel = %{version} Requires: libqt5-qtbase-private-headers-devel >= %{version} +Provides: libQt5Quick-private-headers-devel = %{version} +# TODO: change to < on 5.2.1 update +Obsoletes: libQt5Quick-private-headers-devel <= %{version} -%description -n libQt5Quick-private-headers-devel +%description private-headers-devel This package provides private headers of libqt5-qtdeclarative that are normally not used by application development and that do not have any ABI or API guarantees. The packages that build against these have to require @@ -84,10 +90,6 @@ the exact Qt version. %postun -n %libname -p /sbin/ldconfig -%post -n libQt5Quick-devel -p /sbin/ldconfig - -%postun -n libQt5Quick-devel -p /sbin/ldconfig - %build %qmake5 %make_jobs @@ -127,11 +129,11 @@ rm -rf %{buildroot} %{_libqt5_plugindir}/accessible %{_libqt5_plugindir}/qmltooling -%files -n libQt5Quick-private-headers-devel +%files private-headers-devel %defattr(-,root,root,755) %{_libqt5_includedir}/Qt*/%{so_version} -%files -n libQt5Quick-devel +%files devel %defattr(-,root,root,755) %{_bindir}/* %{_libqt5_bindir}/*