rpms/kdebase/F-13 kdebase.spec,1.426,1.427
Kevin Kofler
kkofler at fedoraproject.org
Sat May 1 18:34:56 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8777/F-13
Modified Files:
kdebase.spec
Log Message:
Sync from devel:
* Sat May 01 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.3-2
- completely drop commented out konsole-session patch (fixed upstream)
- add backwards compatibility hack for a config option change by that patch
Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-13/kdebase.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -p -r1.426 -r1.427
--- kdebase.spec 1 May 2010 14:25:24 -0000 1.426
+++ kdebase.spec 1 May 2010 18:34:56 -0000 1.427
@@ -6,7 +6,7 @@ Name: kdebase
Summary: KDE Core Files
Epoch: 6
Version: 4.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: User Interface/Desktops
@@ -15,8 +15,9 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: kdebase-4.1.80-nsplugins-paths.patch
-# backport from kde-4.2, why are we still carrying this? -- Rex
-Patch1: kdebase-4.1.70-konsole-session.patch
+# backwards compatibility hack for a config option changed by our old
+# konsole-session patch
+Patch1: kdebase-4.4.3-konsole-activetabindex.patch
Patch2: kdebase-4.2.1-home-icon.patch
# fix disabling automatic spell checking in the Konqueror UI (kde#228593)
Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
@@ -126,7 +127,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
%prep
%setup -q -n kdebase-%{version}%{?alphatag}
%patch0 -p1 -b .nsplugins-paths
-#patch1 -p1 -b .konsole-session
+%patch1 -p1 -b .konsole-activetabindex
%patch2 -p1 -b .home-icon
%patch3 -p1 -b .kde#228593
%patch4 -p1 -b .kappfinder
@@ -336,7 +337,11 @@ fi
%changelog
-* Fri Apr 30 2010 Jaroslav Reznik <jreznik at redhat.com> 6:4.4.3-1
+* Sat May 01 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.3-2
+- completely drop commented out konsole-session patch (fixed upstream)
+- add backwards compatibility hack for a config option change by that patch
+
+* Fri Apr 30 2010 Jaroslav Reznik <jreznik at redhat.com> - 6:4.4.3-1
- 4.4.3
* Mon Mar 29 2010 Lukas Tinkl <ltinkl at redhat.com> - 6:4.4.2-1
More information about the scm-commits
mailing list