From a58eb5a36894e097c92935794c2a2dfc1166ba089658ed8f11812210376c5383 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 Dec 2013 11:43:29 +0000 Subject: [PATCH] Accepting request 211346 from KDE:Qt5 Move away from pkgconfig(...) BuildRequires and just use libqt5-$upstreammodulename-(devel|private-headers-devel) No hurry to checkin ;-) but it is needed for QtLocation OBS-URL: https://build.opensuse.org/request/show/211346 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtscript?expand=0&rev=6 --- libqt5-qtscript.changes | 6 ++++++ libqt5-qtscript.spec | 20 +++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/libqt5-qtscript.changes b/libqt5-qtscript.changes index 8590fe7..27125ca 100644 --- a/libqt5-qtscript.changes +++ b/libqt5-qtscript.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 16 23:01:11 UTC 2013 - hrvoje.senjan@gmail.com + +- Make devel and private headers subpackages have consistent naming + with the rest of Qt 5 subpackages + ------------------------------------------------------------------- Thu Dec 12 13:42:39 UTC 2013 - hrvoje.senjan@gmail.com - Update to 5.2.0 final: diff --git a/libqt5-qtscript.spec b/libqt5-qtscript.spec index 060c082..3ecaf9e 100644 --- a/libqt5-qtscript.spec +++ b/libqt5-qtscript.spec @@ -55,22 +55,28 @@ Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. -%package -n libQt5Script-devel +%package devel Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: %libname = %{version} Requires: libqt5-qtbase-devel >= %{version} +Provides: libQt5Script-devel = %{version} +# TODO: change to < on 5.2.1 update +Obsoletes: libQt5Script-devel <= %{version} -%description -n libQt5Script-devel +%description devel You need this package, if you want to compile programs with qtscript. -%package -n libQt5Script-private-headers-devel +%package private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -Requires: libQt5Script-devel = %{version} +Requires: libqt5-qtscript-devel = %{version} Requires: libqt5-qtbase-private-headers-devel >= %{version} +Provides: libQt5Script-private-headers-devel = %{version} +# TODO: change to < on 5.2.1 update +Obsoletes: libQt5Script-private-headers-devel <= %{version} -%description -n libQt5Script-private-headers-devel +%description private-headers-devel This package provides private headers of libqt5-qtscript 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 @@ -96,11 +102,11 @@ rm -rf %{buildroot} %defattr(-,root,root,755) %{_libqt5_libdir}/libQt5*.so.* -%files -n libQt5Script-private-headers-devel +%files private-headers-devel %defattr(-,root,root,755) %{_libqt5_includedir}/Qt*/%{so_version} -%files -n libQt5Script-devel +%files devel %defattr(-,root,root,755) %exclude %{_libqt5_includedir}/Qt*/%{so_version} %{_libqt5_includedir}/Qt*