dvratil pushed to kf5-kwallet (f20). "Merge branch 'master' into f20"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 11:04:40 UTC 2015
>From e57411f41080c1f4ec7d4e85c5485ef259d1fd97 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 25 Mar 2015 10:30:35 -0500
Subject: 5.8.0-2
- -libs: Requires: kf5-kwallet
- drop -runtime (include in main pkg now)
diff --git a/kf5-kwallet.spec b/kf5-kwallet.spec
index 79fc952..1583745 100644
--- a/kf5-kwallet.spec
+++ b/kf5-kwallet.spec
@@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for password management
License: LGPLv2+
@@ -32,8 +32,11 @@ BuildRequires: kf5-knotifications-devel
BuildRequires: kf5-kservice-devel
BuildRequires: kf5-kwidgetsaddons-devel
+Obsoletes: kf5-kwallet-runtime < 5.8.0-2
+Provides: kf5-kwallet-runtime = %{version}-%{release}
+Provides: kf5-kwallet-runtime%{?_isa} = %{version}-%{release}
+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: %{name}-runtime%{?_isa} = %{version}-%{release}
%description
KWallet is a secure and unified container for user passwords.
@@ -41,18 +44,10 @@ KWallet is a secure and unified container for user passwords.
%package libs
Summary: KWallet framework libraries
Requires: kf5-filesystem
+Requires: %{name} = %{version}-%{release}
%description libs
Provides API to access KWallet data from applications.
-%package runtime
-Summary: KWallet runtime deamon
-
-%description runtime
-Provides a runtime deamon that stores passwords.
-
-# FIXME: -devel can only depend on -api, otherwise we get circular dependency
-# problem, because -runtime depends on kf5-kded, which is not compiled at this point
-# (kf5-kio requires kf5-kwallet, but kf5-kded requires kf5-kinit, which requires kf5-kio)
%package devel
Summary: Development files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -68,21 +63,28 @@ developing applications that use %{name}.
%prep
%setup -q -n %{framework}-%{version}
+
%build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kf5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
+
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang kwalletd5_qt --with-qt --all-name
+%find_lang %{name} --with-qt --all-name
-%files
+%files -f %{name}.lang
%doc COPYING.LIB README.md
+%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd5.service
+%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd.service
+%{_kf5_bindir}/kwalletd5
+%{_kf5_datadir}/kservices5/kwalletd5.desktop
+%{_kf5_datadir}/knotifications5/kwalletd.notifyrc
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -91,13 +93,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%{_kf5_libdir}/libKF5Wallet.so.*
%{_kf5_libdir}/libkwalletbackend5.so.*
-%files runtime -f kwalletd5_qt.lang
-%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd5.service
-%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd.service
-%{_kf5_bindir}/kwalletd5
-%{_kf5_datadir}/kservices5/kwalletd5.desktop
-%{_kf5_datadir}/knotifications5/kwalletd.notifyrc
-
%files devel
%{_kf5_datadir}/dbus-1/interfaces/kf5_org.kde.KWallet.xml
%{_kf5_includedir}/kwallet_version.h
@@ -109,6 +104,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Wed Mar 25 2015 Rex Dieter <rdieter at fedoraproject.org>
+- 5.8.0-2
+- -libs: Requires: kf5-kwallet
+- drop -runtime (include in main pkg now)
+
* Mon Mar 16 2015 Daniel Vrátil <dvratil at redhat.com> - 5.8.0-1
- KDE Frameworks 5.8.0
--
cgit v0.10.2
>From 514a57c6084f27073e0db8e1092a5ff366806a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Tue, 7 Apr 2015 13:56:06 +0200
Subject: KDE Frameworks 5.9.0
diff --git a/.gitignore b/.gitignore
index f262eb4..2360f73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/kwallet-5.6.0.tar.xz
/kwallet-5.7.0.tar.xz
/kwallet-5.8.0.tar.xz
+/kwallet-5.9.0.tar.xz
diff --git a/kf5-kwallet.spec b/kf5-kwallet.spec
index 1583745..cf11aaa 100644
--- a/kf5-kwallet.spec
+++ b/kf5-kwallet.spec
@@ -1,8 +1,8 @@
%global framework kwallet
Name: kf5-%{framework}
-Version: 5.8.0
-Release: 2%{?dist}
+Version: 5.9.0
+Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for password management
License: LGPLv2+
@@ -104,6 +104,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Tue Apr 07 2015 Daniel Vrátil <dvratil at redhat.com> - 5.9.0-1
+- KDE Frameworks 5.9.0
+
* Wed Mar 25 2015 Rex Dieter <rdieter at fedoraproject.org>
- 5.8.0-2
- -libs: Requires: kf5-kwallet
diff --git a/sources b/sources
index 990ea4c..646e7de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c5803acbbe295726017b80d7b5d1d49 kwallet-5.8.0.tar.xz
+2128a04d80f4898282b50c3861ff21d7 kwallet-5.9.0.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kf5-kwallet.git/commit/?h=f20&id=245ccb896c116e945d2eeea738a706bcb65708de
More information about the scm-commits
mailing list