rpms/kdebase-runtime/devel .cvsignore, 1.50, 1.51 kdebase-runtime.spec, 1.189, 1.190 sources, 1.51, 1.52

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19562

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Tue Mar 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-2
- Requires: hal-storage-addon (f14+)
- drop <f11 Conflicts baggage
- plasma-scriptengine-javascript-4.4-errata



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	27 Feb 2010 21:52:25 -0000	1.50
+++ .cvsignore	16 Mar 2010 17:27:40 -0000	1.51
@@ -1 +1,2 @@
 kdebase-runtime-4.4.1.tar.bz2
+plasma-scriptengine-javascript-4.4-errata.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- kdebase-runtime.spec	27 Feb 2010 22:16:21 -0000	1.189
+++ kdebase-runtime.spec	16 Mar 2010 17:27:40 -0000	1.190
@@ -6,7 +6,7 @@
 Name:          kdebase-runtime
 Summary:       KDE Runtime
 Version:       4.4.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -17,6 +17,9 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
 
+# drop when 4.4.2 lands
+Source10:      http://plasma.kde.org/plasma-scriptengine-javascript-4.4-errata.tar.bz2
+
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
@@ -27,11 +30,6 @@ Patch6:        kdebase-runtime-4.3.3-hom
 ## 4.4 Upstream patches
 Patch101: kdebase-runtime-4.4.0-virtuosoconverter.patch
 
-# when kdesu was removed, this is/should-be only temporary
-%if 0%{?fedora} && 0%{?fedora} < 11
-Conflicts: kdebase3 < 3.5.10-4
-%endif
-
 %if 0%{?fedora} && 0%{?fedora} < 12
 # kcm_filetypes moved to here
 Conflicts: kdebase4 < 4.3.0
@@ -55,6 +53,10 @@ Requires: htdig
 # beware of bootstrapping, there be dragons
 Requires: oxygen-icon-theme >= %{version}
 
+%if 0%{?fedora} > 13
+Requires: hal-storage-addon
+%endif
+
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: attica-devel
@@ -107,7 +109,10 @@ BuildArch: noarch
 
 
 %prep
-%setup -q -n kdebase-runtime-%{version}%{?alphatag}
+%setup -q -n kdebase-runtime-%{version}%{?alphatag} -a 10
+
+mv plasma/scriptengines/javascript plasma/scriptengines/javascript.orig
+mv plasma-scriptengine-javascript-4.4-errata plasma/scriptengines/javascript
 
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
@@ -242,6 +247,11 @@ fi
 
 
 %changelog
+* Tue Mar 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-2
+- Requires: hal-storage-addon (f14+)
+- drop <f11 Conflicts baggage
+- plasma-scriptengine-javascript-4.4-errata
+
 * Sat Feb 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-1
 - 4.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	27 Feb 2010 21:52:24 -0000	1.51
+++ sources	16 Mar 2010 17:27:40 -0000	1.52
@@ -1 +1,2 @@
 d0e6f9afbd73c3f8321a468ae3d9c5e5  kdebase-runtime-4.4.1.tar.bz2
+6b3de2872757230d4731c4d4193853a7  plasma-scriptengine-javascript-4.4-errata.tar.bz2