diff --git a/accounts-qt.spec b/accounts-qt.spec index 241dfba..839de1e 100644 --- a/accounts-qt.spec +++ b/accounts-qt.spec @@ -1,5 +1,5 @@ Name: accounts-qt -Version: 1.13 +Version: 1.16 Release: 1mamba Summary: Qt bindings to the Accounts & SSO framework Group: System/Libraries @@ -7,14 +7,14 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://code.google.com/p/accounts-sso/ -Source: https://gitlab.com/accounts-sso/libaccounts-qt.git/%{version}/libaccounts-qt-%{version}.tar.bz2 +Source: https://gitlab.com/accounts-sso/libaccounts-qt.git/VERSION_%{version}/libaccounts-qt-%{version}.tar.bz2 License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ldconfig BuildRequires: libaccounts-glib-devel BuildRequires: libgcc BuildRequires: libglib-devel -BuildRequires: libqt4-devel BuildRequires: libqt5-devel BuildRequires: libstdc++6-devel ## AUTOBUILDREQ-END @@ -23,23 +23,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Qt bindings to the Accounts & SSO framework. -%package -n lib%{name} -Group: System/Libraries -Summary: Qt bindings to the Accounts & SSO framework - -%description -n lib%{name} -Qt bindings to the Accounts & SSO framework. -This package contains shared libraries for %{name}. - -%package -n lib%{name}-devel -Group: Development/Libraries -Summary: Development files for %{name} -Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} -Requires: pkg-config - -%description -n lib%{name}-devel -This package contains libraries and header files for developing applications that use %{name}. - %package -n lib%{name}5 Group: System/Libraries Summary: Qt5 bindings to the Accounts & SSO framework @@ -63,58 +46,23 @@ This package contains libraries and header files for developing applications tha %setup -q -n libaccounts-qt-%{version} %build -qmake-qt4 -%make +mkdir build +cd build +%{_qt5_qmake} CONFIG+="nostrip" LIBDIR=%{_libdir} .. -mkdir -p build-qt5 -cd build-qt5 -qmake-qt5 .. -%make sub-Accounts +%make +#sub-Accounts %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall INSTALL_ROOT=%{buildroot} -%makeinstall -C build-qt5/Accounts INSTALL_ROOT=%{buildroot} +%makeinstall -C build INSTALL_ROOT=%{buildroot} %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%post -n lib%{name} -p /sbin/ldconfig -%postun -n lib%{name} -p /sbin/ldconfig - %post -n lib%{name}5 -p /sbin/ldconfig %postun -n lib%{name}5 -p /sbin/ldconfig -%files -%defattr(-,root,root) -%{_bindir}/accountstest -%{_datadir}/libaccounts-qt-tests/MyProvider.provider -%{_datadir}/libaccounts-qt-tests/MyService.service -%{_datadir}/libaccounts-qt-tests/OtherService.service -%{_datadir}/libaccounts-qt-tests/e-mail.service-type -%{_datadir}/libaccounts-qt-tests/tests.xml - -%files -n lib%{name} -%defattr(-,root,root) -%{_libdir}/libaccounts-qt.so.* -%doc COPYING - -%files -n lib%{name}-devel -%defattr(-,root,root) -%dir %{_includedir}/accounts-qt -%dir %{_includedir}/accounts-qt/Accounts -%{_includedir}/accounts-qt/Accounts/* -%{_libdir}/cmake/AccountsQt/AccountsQtConfig.cmake -%{_libdir}/cmake/AccountsQt/AccountsQtConfigVersion.cmake -%{_libdir}/libaccounts-qt.so -%{_libdir}/pkgconfig/accounts-qt.pc -%dir %{_datadir}/doc/accounts-qt -%dir %{_datadir}/doc/accounts-qt/html/ -%{_datadir}/doc/accounts-qt/html/* -%dir %{_datadir}/doc/accounts-qt/qch/ -%{_datadir}/doc/accounts-qt/qch/* -%doc README TODO - %files -n lib%{name}5 %defattr(-,root,root) %{_libdir}/libaccounts-qt5.so.* @@ -122,6 +70,7 @@ qmake-qt5 .. %files -n lib%{name}5-devel %defattr(-,root,root) +%{_bindir}/accountstest %dir %{_includedir}/accounts-qt5 %dir %{_includedir}/accounts-qt5/Accounts %{_includedir}/accounts-qt5/Accounts/* @@ -129,9 +78,17 @@ qmake-qt5 .. %{_libdir}/cmake/AccountsQt5/AccountsQt5ConfigVersion.cmake %{_libdir}/libaccounts-qt5.so %{_libdir}/pkgconfig/accounts-qt5.pc -%doc README TODO +%dir %{_datadir}/doc/accounts-qt +%dir %{_datadir}/doc/accounts-qt/html +%{_datadir}/doc/accounts-qt/html/* +%dir %{_datadir}/doc/accounts-qt/qch +%{_datadir}/doc/accounts-qt/qch/* +%doc TODO %changelog +* Sat Jan 16 2021 Silvan Calarco 1.16-1mamba +- update to 1.16 + * Sun Aug 16 2015 Silvan Calarco 1.13-1mamba - update to 1.13 - added qt5 subpackages