[kde-settings] s/kpackagekit/apper/ configs drop gpg-agent scripts (autostarts on demand now)
Rex Dieter
rdieter at fedoraproject.org
Fri Oct 21 22:27:54 UTC 2011
commit 8e02977c54e5e1ea5aaed575e0f48f109d460ece
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Oct 21 17:27:53 2011 -0500
s/kpackagekit/apper/ configs
drop gpg-agent scripts (autostarts on demand now)
.gitignore | 3 +--
kde-settings.spec | 16 +++++++---------
sources | 1 +
3 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98da012..52902ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
/kde-settings-4.6-10.tar.bz2
/kde-settings-plasma-rpm-20110927.tar.xz
-/kde-settings-4.7-11.tar.xz
-/kde-settings-4.7-12.tar.xz
+/kde-settings-4.7-13.tar.xz
diff --git a/kde-settings.spec b/kde-settings.spec
index 875d9b4..924ae75 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -5,7 +5,7 @@
%global plasma_rpm 1
%endif
-%global rel 12
+%global rel 13
Summary: Config files for kde
Name: kde-settings
@@ -27,13 +27,10 @@ Requires: kde-filesystem
# /etc/pam.d/ ownership
Requires: pam
Requires: xdg-user-dirs
-# sed/kill used in gpg-agent-(startup/shutdown).sh
-Requires: coreutils sed util-linux
Requires: adwaita-cursor-theme
Requires: polkit-desktop-policy
-Requires(post): coreutils
-Requires(postun): coreutils
+Requires(post): coreutils sed
%description
%{summary}.
@@ -95,8 +92,7 @@ mkdir -p -m775 %{buildroot}%{_localstatedir}/spool/gdm
# rhel stuff
%if 0%{?rhel}
-rm -f %{buildroot}%{_sysconfdir}/kde/env/fedora-bookmarks.sh \
- %{buildroot}%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
+rm -f %{buildroot}%{_sysconfdir}/kde/env/fedora-bookmarks.sh
%endif
@@ -116,11 +112,9 @@ rm -rf %{buildroot}
%doc COPYING
%config(noreplace) %{_sysconfdir}/profile.d/kde.*
%{_sysconfdir}/kde/env/env.sh
-%{_sysconfdir}/kde/env/gpg-agent*.sh
%{_sysconfdir}/kde/env/gtk2_rc_files.sh
%if 0%{?fedora}
%{_sysconfdir}/kde/env/fedora-bookmarks.sh
-%{_sysconfdir}/kde/shutdown/gpg-agent*.sh
%endif
%config(noreplace) /etc/pam.d/kcheckpass
%config(noreplace) /etc/pam.d/kscreensaver
@@ -163,6 +157,10 @@ rm -rf %{buildroot}
%changelog
+* Fri Oct 21 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7-13
+- s/kpackagekit/apper/ configs
+- drop gpg-agent scripts (autostarts on demand now)
+
* Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7-12
- disable the default Plasma digital-clock's displayEvents option by default
diff --git a/sources b/sources
index 8ead237..41cf6af 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
1ba7c8a66a359aaaab650baba3813513 kde-settings-plasma-rpm-20110927.tar.xz
c597bcc7162e83f9ed681eefd1128564 kde-settings-4.7-12.tar.xz
+ca526ffee8a88c36250da7b9ac823604 kde-settings-4.7-13.tar.xz
More information about the scm-commits
mailing list