commit 915d385e50839bbbaa6140bc53f6a1af0e4e6c06
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Nov 20 11:20:32 2014 +0100
- up to 5.4.0; drop tons of unneded defines; run tests
kf5-attica.spec | 55 +++++++++++++++++++++++++------------------------------
1 file changed, 25 insertions(+), 30 deletions(-)
---
diff --git a/kf5-attica.spec b/kf5-attica.spec
index fe381db..c2f0f0e 100644
--- a/kf5-attica.spec
+++ b/kf5-attica.spec
@@ -1,34 +1,38 @@
# TODO:
-# - proper place for *.pri,
-# - set ECM_MKSPECS_INSTALL_DIR in kde5-extra-cmake-modules
# - runtime Requires if any
# - dir /usr/include/KF5 not packaged
-%define _state stable
+
+%bcond_without tests
+
+%define _state stable
%define orgname attica
+%define kdeframever 5.4
+%define qt_ver 5.3.2
Summary: A Qt library that implements the Open Collaboration Services API
Name: kf5-%{orgname}
-Version: 5.0.0
-Release: 0.1
+Version: 5.4.0
+Release: 1
License: GPL v2+/LGPL v2.1+
Group: X11/Libraries
-Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/frameworks/%{version}/%{orgname}-%{version}.tar.xz
-# Source0-md5: 73d1d1953b12eda42f6f4010df889b73
+Source0:
http://download.kde.org/%{_state}/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
+# Source0-md5: 493c08ce82d5ab34bf2efeb1a01349ab
URL: http://www.kde.org/
-BuildRequires: Qt5Core-devel >= 5.2.0
-BuildRequires: Qt5Gui-devel >= 5.3.1
-BuildRequires: Qt5Network-devel
-BuildRequires: Qt5Test-devel
-BuildRequires: Qt5Widgets-devel >= 5.2.0
+BuildRequires: Qt5Core-devel >= %{qt_ver}
+BuildRequires: Qt5Gui-devel >= %{qt_ver}
+BuildRequires: Qt5Network-devel >= %{qt_ver}
+BuildRequires: Qt5Test-devel >= %{qt_ver}
+%if %{with tests}
+BuildRequires: Qt5Gui-devel >= %{qt_ver}
+BuildRequires: Qt5Widgets-devel >= %{qt_ver}
+%endif
BuildRequires: cmake >= 2.8.12
-BuildRequires: kf5-extra-cmake-modules >= 1.0.0
+BuildRequires: kf5-extra-cmake-modules >= 1.4.0
BuildRequires: rpmbuild(macros) >= 1.164
BuildRequires: tar >= 1:1.22
BuildRequires: xz
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define qt5dir %{_libdir}/qt5
-
%description
Attica is a Qt library that implements the Open Collaboration Services
API version 1.6. The REST API is defined here:
@@ -58,21 +62,12 @@ Pliki nagłówkowe dla programistów używających %{orgname}.
install -d build
cd build
%cmake \
- -DBIN_INSTALL_DIR=%{_bindir} \
- -DKCFG_INSTALL_DIR=%{_datadir}/config.kcfg \
- -DPLUGIN_INSTALL_DIR=%{qt5dir}/plugins \
- -DQT_PLUGIN_INSTALL_DIR=%{qt5dir}/plugins \
- -DQML_INSTALL_DIR=%{qt5dir}/qml \
- -DIMPORTS_INSTALL_DIR=%{qt5dirs}/imports \
- -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
- -DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
- -DKF5_LIBEXEC_INSTALL_DIR=%{_libexecdir} \
- -DKF5_INCLUDE_INSTALL_DIR=%{_includedir} \
- -DECM_MKSPECS_INSTALL_DIR=%{qt5dir}/mkspecs/modules \
- -D_IMPORT_PREFIX=%{_prefix} \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
..
%{__make}
+%{?with_tests:%{__make} test}
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -89,13 +84,13 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS README.md
%attr(755,root,root) %ghost %{_libdir}/libKF5Attica.so.5
-%attr(755,root,root) %{_libdir}/libKF5Attica.so.5.0.0
+%attr(755,root,root) %{_libdir}/libKF5Attica.so.*.*.*
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libKF5Attica.so
%{_includedir}/KF5/Attica
%{_includedir}/KF5/attica_version.h
%{_libdir}/cmake/KF5Attica
-%attr(755,root,root) %{_libdir}/libKF5Attica.so
%{_pkgconfigdir}/libKF5Attica.pc
-%{qt5dir}/mkspecs/modules/qt_Attica.pri
+%{_libdir}/qt5/mkspecs/modules/qt_Attica.pri
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kf5-attica.git/commitdiff/915d385e50839bbbaa6140bc53f6a1af0e4e6c06
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
