rpms/kdebase4/F-8 kdebase-nsplugins-paths.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 kdebase4.spec, 1.16, 1.17 sources, 1.10, 1.11 kdebase-4.0.3-kde#160422.patch, 1.1, NONE kdebase-4.0.3-kwrite-dt_categories.patch, 1.1, NONE kdebase-4.0.4-konqueror-updatehistoryentry.patch, 1.1, NONE
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Fri Jul 25 15:38:48 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv666/F-8
Modified Files:
.cvsignore kdebase4.spec sources
Added Files:
kdebase-nsplugins-paths.patch
Removed Files:
kdebase-4.0.3-kde#160422.patch
kdebase-4.0.3-kwrite-dt_categories.patch
kdebase-4.0.4-konqueror-updatehistoryentry.patch
Log Message:
Sync 4.1.0 from kdebase/devel.
kdebase-nsplugins-paths.patch:
--- NEW FILE kdebase-nsplugins-paths.patch ---
Index: apps/konqueror/settings/konqhtml/pluginopts.cpp
===================================================================
--- apps/konqueror/settings/konqhtml/pluginopts.cpp (revision 823888)
+++ apps/konqueror/settings/konqhtml/pluginopts.cpp (working copy)
@@ -432,6 +432,8 @@
paths.append("/usr/lib/mozilla/plugins");
paths.append("/usr/lib64/netscape/plugins");
paths.append("/usr/lib64/mozilla/plugins");
+ paths.append("/usr/lib64/mozilla/plugins-wrapped");
+ paths.append("/usr/lib/mozilla/plugins-wrapped");
paths.append("$MOZILLA_HOME/plugins");
}
Index: apps/nsplugins/plugin_paths.cpp
===================================================================
--- apps/nsplugins/plugin_paths.cpp (revision 823888)
+++ apps/nsplugins/plugin_paths.cpp (working copy)
@@ -54,6 +54,8 @@
paths.append("/usr/lib/mozilla/plugins");
paths.append("/usr/lib64/netscape/plugins");
paths.append("/usr/lib64/mozilla/plugins");
+ paths.append("/usr/lib64/mozilla/plugins-wrapped");
+ paths.append("/usr/lib/mozilla/plugins-wrapped");
paths.append("$MOZILLA_HOME/plugins");
config.writeEntry( "scanPaths", paths );
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 5 Jun 2008 01:42:41 -0000 1.10
+++ .cvsignore 25 Jul 2008 15:38:18 -0000 1.11
@@ -1 +1,2 @@
-kdebase-4.0.5.tar.bz2
+kdebase-4.0.99.tar.bz2
+kdebase-4.1.0.tar.bz2
Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdebase4.spec 5 Jun 2008 01:42:41 -0000 1.16
+++ kdebase4.spec 25 Jul 2008 15:38:18 -0000 1.17
@@ -1,7 +1,6 @@
-
Summary: K Desktop Environment 4 - Core Files
-Version: 4.0.5
-Release: 2%{?dist}
+Version: 4.1.0
+Release: 1%{?dist}
%if 0%{?fedora} > 8
Name: kdebase
@@ -22,18 +21,13 @@
License: GPLv2
Group: User Interface/Desktops
URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# fedora specific nsplugins paths
+Patch1: kdebase-nsplugins-paths.patch
+
## upstream patches
-# fix Konsole window size (backported from 4.1, #439638, kde#160422)
-# http://websvn.kde.org/?view=rev&revision=793964
-# http://websvn.kde.org/?view=rev&revision=793970
-Patch100: kdebase-4.0.3-kde#160422.patch
-# http://bugzilla.redhat.com/438786 (will upstream -- Rex)
-Patch102: kdebase-4.0.3-kwrite-dt_categories.patch
-# backporte from 4.1
-Patch103: kdebase-4.0.4-konqueror-updatehistoryentry.patch
BuildRequires: kde-filesystem >= 4
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -69,12 +63,16 @@
BuildRequires: hal-devel
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
+%if "%{name}" == "kdebase"
+BuildRequires: kdebase-workspace-devel >= %{version}
+%endif
%ifnarch s390 s390x
BuildRequires: libraw1394-devel
BuildRequires: libusb-devel
%endif
BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel
+BuildRequires: pciutils-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: qimageblitz-devel
@@ -84,11 +82,12 @@
%else
BuildRequires: samba
%endif
-BuildRequires: soprano-devel
-BuildRequires: strigi-devel
+BuildRequires: soprano-devel >= 2.0.97
+BuildRequires: strigi-devel >= 0.5.7
# needed?
BuildRequires: xorg-x11-font-utils
BuildRequires: xorg-x11-proto-devel
+BuildRequires: glib2-devel
# Dolphin needs the ioslaves and icons from kdebase-runtime (#438632)
Requires: kdebase-runtime oxygen-icon-theme
@@ -124,19 +123,15 @@
%prep
%setup -q -n kdebase-%{version}
-
-%patch100 -p0 -b .kde#160422
-%patch102 -p1 -b .kwrite-dt_categories
-%patch103 -p1 -b .konqueror-updatehistoryentry
+%patch1 -p0 -b .nsplugins-paths
%build
-
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
%install
@@ -306,21 +301,57 @@
%changelog
-* Tue Jun 03 2008 Than Ngo <than at redhat.com> - 4.0.5-2
+* Wed Jul 23 2008 Than Ngo <than at redhat.com> 4.1.0-1
+- 4.1.0
+
+* Tue Jul 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-2
+ respin (libraw1394)
+
+* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-1
+- 4.0.99
+
+* Fri Jul 11 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-2
+- BR: pciutils-devel
+
+* Thu Jul 10 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-1
+- 4.0.98
+
+* Sun Jul 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.85-1
+- 4.0.85
+
+* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.84-1
+- 4.0.84
+
+* Tue Jun 24 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.83-2
+- #426108: Add more directories to konqueror's default
+ plugin search path list
+
+* Thu Jun 19 2008 Than Ngo <than at redhat.com> 4.0.83-1
+- 4.0.83 (beta2)
+
+* Mon Jun 16 2008 Than Ngo <than at redhat.com> 4.0.82-2
+- BR kdebase-workspace-devel (F9+)
+
+* Sun Jun 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.82-1
+- 4.0.82
+
+* Tue May 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-3
- respun tarball from upstream
-* Sun Jun 01 2008 Than Ngo <than at redhat.com> 4.0.5-1
-- 4.0.5
+* Tue May 27 2008 Than Ngo <than at redhat.com> 4.0.80-2
+- rebuild to fix undefined symbol issue in dolphin
-* Sat May 24 2008 Than Ngo <than at redhat.com> 4.0.4-3
-- backport konqueror crash fix from trunk
+* Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
+- 4.1 beta1
-* Sun May 11 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.4-2
+* Sun May 11 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-2
- quote semicolon in fix for #442834
- only do the echo when konquerorsu.desktop is actually shipped (#445989)
-* Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-1
-- kde-4.0.4
+* Tue May 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
+- update to 4.0.72 (4.1 alpha 1)
+- drop backported kde#160422 and nspluginviewer patches
+- add minimum versions to soprano-devel and strigi-devel BRs
* Fri Apr 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-9
- kwrite.desktop: Categories += Utility (#438786)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 5 Jun 2008 01:42:41 -0000 1.10
+++ sources 25 Jul 2008 15:38:18 -0000 1.11
@@ -1 +1 @@
-b3ba290cb675fbc4522704a39a503fe5 kdebase-4.0.5.tar.bz2
+6b58b056d27e3103f087f12abe899a49 kdebase-4.1.0.tar.bz2
--- kdebase-4.0.3-kde#160422.patch DELETED ---
--- kdebase-4.0.3-kwrite-dt_categories.patch DELETED ---
--- kdebase-4.0.4-konqueror-updatehistoryentry.patch DELETED ---
More information about the fedora-extras-commits
mailing list