[kdebase-workspace] hwclock patch upstreamed.
Kevin Kofler
kkofler at fedoraproject.org
Sat Oct 29 15:25:59 UTC 2011
commit 5aabf9f421c72a514e13579c86f611c8671b59b3
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Oct 29 17:25:41 2011 +0200
hwclock patch upstreamed.
kdebase-workspace.spec | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 2eb7f16..0518355 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -79,11 +79,12 @@ Patch50: kdebase-workspace-4.6.80-kde#171685.patch
# use /etc/login.defs to define a 'system' account instead of hard-coding 500
Patch52: kdebase-workspace-4.7.0-bz#732830-login.patch
+## upstream patches
# kcm_clock helper: Sync the hwclock after setting the date (#749516)
# https://git.reviewboard.kde.org/r/102985/
-Patch53: kdebase-workspace-4.7.2-hwclock.patch
-
-## upstream patches
+# patch by Kevin Kofler, upstreamed for 4.7.4:
+# http://commits.kde.org/kde-workspace/981e56cacc7117c541965ddec1e8181bffcc5a2a
+Patch100: kdebase-workspace-4.7.2-hwclock.patch
## Fedora specific patches
## HAL-ectomy
@@ -366,9 +367,9 @@ pushd %{name}-%{version}
# upstreamable patches
%patch50 -p1 -b .kde#171685
%patch52 -p1 -b .bz#732830-login
-%patch53 -p1 -b .hwclock
# upstream patches
+%patch100 -p1 -b .hwclock
# Fedora patches
%patch200 -p0 -b .no_HAL
More information about the scm-commits
mailing list