From 09d34e804f1f94bc733d39aaa607b34d109a0923 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 29 Sep 2015 12:47:40 -0500 Subject: [PATCH] qtkeychain-0.5.0 (#1136285), enable Qt5 support --- .gitignore | 1 + qtkeychain.spec | 76 ++++++++++++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 62 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 030dd54..1e2dc08 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /qtkeychain-0.3.0.tar.gz /qtkeychain-3.90.zip /qtkeychain-0.3.90.zip +/qtkeychain-0.5.0.tar.gz diff --git a/qtkeychain.spec b/qtkeychain.spec index b3375a3..f7b8b6f 100644 --- a/qtkeychain.spec +++ b/qtkeychain.spec @@ -1,59 +1,103 @@ Name: qtkeychain -Version: 0.3.90 -Release: 6.20140405git%{?dist} +Version: 0.5.0 +Release: 1%{?dist} License: BSD Summary: A password store library Url: https://github.com/frankosterfeld/qtkeychain -Source0: %{name}-%{version}.zip +Source0: https://github.com/frankosterfeld/qtkeychain/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake -BuildRequires: qt4-devel +BuildRequires: pkgconfig(QtDBus) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: qt5-linguist %description The qtkeychain library allows you to store passwords easy and secure. %package devel -Summary: A cross platform password store library +Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} - %description devel This package contains development files for qtkeychain. +%package qt5 +Summary: A password store library +Requires: %{name}%{?_isa} = %{version}-%{release} +%description qt5 +The qt5keychain library allows you to store passwords easy and secure. + +%package qt5-devel +Summary: Development files for %{name}-qt5 +Requires: %{name}-qt5%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} +%description qt5-devel +This package contains development files for qt5keychain. + + %prep -%setup -q -n %{name}-master +%setup -q %build mkdir build pushd build - %cmake .. \ -DBUILD_WITH_QT4:BOOL=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DCMAKE_BUILD_TYPE=Release make %{?_smp_mflags} popd -%install -pushd build -make install DESTDIR=%{buildroot} +mkdir build-qt5 +pushd build-qt5 +%cmake .. \ + -DBUILD_WITH_QT4:BOOL=OFF \ + -DCMAKE_BUILD_TYPE=Release + +make %{?_smp_mflags} popd + +%install +make install DESTDIR=%{buildroot} -C build-qt5 +make install DESTDIR=%{buildroot} -C build + %find_lang %{name} --with-qt -%post -p /sbin/ldconfig +grep %{_qt4_translationdir} %{name}.lang > %{name}-qt4.lang +grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang + +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f %{name}.lang +%files -f %{name}-qt4.lang +%doc ReadMe.txt +%license COPYING %{_libdir}/libqtkeychain.so.0* -%doc COPYING ReadMe.txt %files devel -%{_includedir}/qtkeychain +%{_includedir}/qtkeychain/ %{_libdir}/cmake/QtKeychain/ %{_libdir}/libqtkeychain.so +%post qt5 -p /sbin/ldconfig +%postun qt5 -p /sbin/ldconfig + +%files qt5 -f %{name}-qt5.lang +%doc ReadMe.txt +%license COPYING +%{_libdir}/libqt5keychain.so.0* + +%files qt5-devel +%{_includedir}/qt5keychain/ +%{_libdir}/cmake/Qt5Keychain/ +%{_libdir}/libqt5keychain.so + + %changelog +* Tue Sep 29 2015 Rex Dieter 0.5.0-1 +- qtkeychain-0.5.0 (#1136285), enable Qt5 support + * Thu Jun 18 2015 Fedora Release Engineering - 0.3.90-6.20140405git - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index d87b670..2bf8d00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcbb1fc2bc215b7002bbabef9f800cb7 qtkeychain-0.3.90.zip +ed813a5db320883c2cf34db16a72b2a1 qtkeychain-0.5.0.tar.gz