fix license and standardize the specfile [release 5.9.0-3mamba;Sat Apr 25 2015]

README.md

@@ -1,4 +1,5 @@
 # solid
 
-Solid is a device integration framework. It provides a way of querying and interacting with hardware independently of the underlying operating system.
+Solid is a device integration framework.
+It provides a way of querying and interacting with hardware independently of the underlying operating system.
 

solid.spec

@@ -1,15 +1,16 @@
 %define majver %(echo %version | cut -d. -f1-2)
+
 Name:          solid
 Version:       5.9.0
-Release:       2mamba
+Release:       3mamba
-Summary:       KDE5 device integration framework
+Summary:       KDE Frameworks 5 hardware abstraction framework
 Group:         Graphical Desktop/Libraries/KDE
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.kde.org
 Source:        http://download.kde.org/stable/frameworks/%{majver}/solid-%{version}.tar.xz
-License:       GPL
+License:       LGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libgcc
@@ -18,11 +19,37 @@ BuildRequires: libstdc++6-devel
 BuildRequires: libudev-devel
 ## AUTOBUILDREQ-END
 BuildRequires: cmake
+BuildRequires: extra-cmake-modules
+BuildRequires: rpm-macros-kde5
+BuildRequires: libQt5Core
+BuildRequires: libQt5Xml
+BuildRequires: libQt5DBus
+BuildRequires: libQt5Widgets
+#BuildRequires: Qt5LinguistTools
+BuildRequires: libQt5Test
+BuildRequires: libsystemd-devel
+BuildRequires: udisks2-devel
+BuildRequires: upower-devel
+BuildRequires: bison
+BuildRequires: flex
+# MediaPlayerInfo: enables identification and querying of portable media players
+# Runtime-only dependency of the udev solid backend.
+# Support for m-p-i is included even if not found during build
+Requires:      media-player-info
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
+#-- The following features have been disabled:
+#
+# * Solid::Job, WIP: Base class for Solid Asynchronous apis
+# * Solid::PowerManagement, WIP: Freedesktop backend for the asyncrhonous api
+# * Solid::PowerManagement, WIP: Freedesktop backend for the asyncrhonous api
+
+# Note: that API is turned off deliberately (it's not ready yet)
+
 %description
-Solid is a device integration framework. It provides a way of querying and interacting with hardware independently of the underlying operating system.
+Solid is a device integration framework.
+It provides a way of querying and interacting with hardware independently of the underlying operating system.
 
 %package -n lib%{name}
 Group:         System/Libraries
@@ -45,19 +72,14 @@ This package contains libraries and header files for developing applications tha
 %setup -q
 
 %build
-%cmake -d build \
+%cmake_kde5 -d build
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLIB_INSTALL_DIR=%{_lib} \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-
 %make
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall -C build
 
-%find_lang %{name} || touch %{name}.lang
+%find_lang solid5_qt --with-qt --all-name || touch solid.lang
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -65,33 +87,29 @@ This package contains libraries and header files for developing applications tha
 %post -n lib%{name} -p /sbin/ldconfig
 %postun -n lib%{name} -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files -f solid5_qt.lang
 %defattr(-,root,root)
-%{_bindir}/solid-hardware5
+%{_kde5_bindir}/solid-hardware5
 
 %files -n lib%{name}
 %defattr(-,root,root)
-%{_libdir}/libKF5Solid.so.*
+%{_kde5_libdir}/libKF5Solid.so.*
+%{_kde5_qmldir}/org/kde/solid
 %doc COPYING.LIB
 
 %files -n lib%{name}-devel
 %defattr(-,root,root)
-%dir %{_includedir}/KF5/Solid
+%{_kde5_includedir}/Solid
-%dir %{_includedir}/KF5/Solid/Solid
+%{_kde5_includedir}/solid_version.h
-%{_includedir}/KF5/Solid/Solid/*
+%{_kde5_libdir}/cmake/KF5Solid
-%dir %{_includedir}/KF5/Solid/solid
+%{_kde5_libdir}/libKF5Solid.so
-%{_includedir}/KF5/Solid/solid/*
+%{_kde5_mkspecsdir}/qt_Solid.pri
-%{_includedir}/KF5/solid_version.h
-%{_libdir}/cmake/KF5Solid/KF5Solid*.cmake
-%{_libdir}/libKF5Solid.so
-%{_libdir}/qt5/mkspecs/modules/qt_Solid.pri
-%dir %{_libdir}/qt5/qml/org/kde/solid
-%{_libdir}/qt5/qml/org/kde/solid/libsolidextensionplugin.so
-%{_libdir}/qt5/qml/org/kde/solid/qmldir
-%{_datadir}/locale/*/LC_MESSAGES/solid5_qt.qm
 %doc README.md TODO
 
 %changelog
+* Sat Apr 25 2015 Davide Madrisan <davide.madrisan@gmail.com> 5.9.0-3mamba
+- fix license and standardize the specfile
+
 * Sat Apr 11 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 5.9.0-2mamba
 - automatic version update by autodist