rpms/kdelibs4/F-7 kdelibs-4.0.2-branding.patch, NONE, 1.1 kdelibs-4.0.2-install-all-css.patch, NONE, 1.1 kdelibs-4.0.x-kio.patch, NONE, 1.1 kdelibs4.spec, 1.11, 1.12 kdelibs-3.93.0-kde149703.diff, 1.1, NONE kdelibs-4.0.1-autostart.patch, 1.1, NONE kdelibs-4.0.1-kde#771201-khtml.patch, 1.1, NONE kdelibs-4.0.1-objectembed-handling.patch, 1.1, NONE

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Mar 8 18:53:27 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25884/F-7

Modified Files:
	kdelibs4.spec 
Added Files:
	kdelibs-4.0.2-branding.patch 
	kdelibs-4.0.2-install-all-css.patch kdelibs-4.0.x-kio.patch 
Removed Files:
	kdelibs-3.93.0-kde149703.diff kdelibs-4.0.1-autostart.patch 
	kdelibs-4.0.1-kde#771201-khtml.patch 
	kdelibs-4.0.1-objectembed-handling.patch 
Log Message:
Sync from devel:

* Fri Mar 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-8
- touchup KDE_DISTRIBUTION_TEXT
- add Fedora/V-R to KHTML UA string (thanks caillon)

* Thu Mar 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-7
- exclude apidocs from the main package

* Thu Mar 06 2008 Than Ngo <than at redhat.com> 4.0.2-6
- apply upstream patch to fix issue in KPropertiesDialog

* Thu Mar 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-5
- also install Doxyfile.global in -common to build kdepimlibs-apidocs against

* Wed Mar 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-4
- install all .css files in kdelibs-common to build kdepimlibs-apidocs against
- install doxygen.sh as kde4-doxygen.sh in -devel
- build apidocs and put them into an -apidocs subpackage (can be turned off)
- BR doxygen, graphviz and qt4-doc when building apidocs

* Fri Feb 29 2008 Than Ngo <than at redhat.com> 4.0.2-3
- rebuilt

* Fri Feb 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
- drop obsolete kde#149703 patch (fixed upstream by code rewrite)
- drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml

* Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2

* Wed Feb 27 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.1-8
- add Fedora branding to the package (#434815)

* Mon Feb 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-7
- -devel: own %%_kde4_libdir/kde4/plugins (thanks wolfy!)

kdelibs-4.0.2-branding.patch:

--- NEW FILE kdelibs-4.0.2-branding.patch ---
diff -up kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp
--- kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding	2008-01-04 18:00:15.000000000 -0600
+++ kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp	2008-03-07 14:49:46.000000000 -0600
@@ -73,7 +73,7 @@ KProtocolManagerPrivate::~KProtocolManag
 
 // DEFAULT USERAGENT STRING
 #define CFG_DEFAULT_UAGENT(X) \
-QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \
+QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko) Fedora/@@VERSION_RELEASE@@") \
         .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
 
 #define PRIVATE_DATA \

kdelibs-4.0.2-install-all-css.patch:

--- NEW FILE kdelibs-4.0.2-install-all-css.patch ---
diff -ur kdelibs-4.0.2/doc/common/CMakeLists.txt kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt
--- kdelibs-4.0.2/doc/common/CMakeLists.txt	2008-01-05 01:00:05.000000000 +0100
+++ kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt	2008-03-06 05:18:11.000000000 +0100
@@ -7,6 +7,8 @@
     xml.dcl
     doxygen.css
     tabs.css
+    kde.css flat.css print.css
+    Doxyfile.global
     header.html
     footer.html
     mainheader.html

kdelibs-4.0.x-kio.patch:

--- NEW FILE kdelibs-4.0.x-kio.patch ---
diff -up kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp
--- kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio	2008-01-05 01:00:16.000000000 +0100
+++ kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp	2008-03-06 12:34:08.000000000 +0100
@@ -879,7 +879,7 @@ void KOpenWithDialogPrivate::_k_slotOK()
   KConfigGroup cg = desktop->desktopGroup();
   cg.writeEntry("Type", "Application");
   cg.writeEntry("Name", initialServiceName);
-  cg.writePathEntry("Exec", fullExec);
+  cg.writeEntry("Exec", fullExec);
   if (terminal->isChecked())
   {
     cg.writeEntry("Terminal", true);
diff -up kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp
--- kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio	2008-01-31 00:54:05.000000000 +0100
+++ kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp	2008-03-06 12:31:52.000000000 +0100
@@ -3015,7 +3015,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin
   QString nameStr = _config.readName();
   QString genNameStr = _config.readGenericName();
   QString commentStr = _config.readComment();
-  QString commandStr = config.readPathEntry( "Exec", QString() );
+  QString commandStr = config.readEntry( "Exec", QString() );
   if (commandStr.startsWith(QLatin1String("ksystraycmd ")))
   {
     commandStr.remove(0, 12);
@@ -3176,9 +3176,9 @@ void KDesktopPropsPlugin::applyChanges()
   config.writeEntry( "GenericName", d->w->genNameEdit->text(), KConfigGroup::Persistent|KConfigGroup::Localized ); // for compat
 
   if (d->m_systrayBool)
-    config.writePathEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") );
+    config.writeEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") );
   else
-    config.writePathEntry( "Exec", d->w->commandEdit->text() );
+    config.writeEntry( "Exec", d->w->commandEdit->text() );
   config.writePathEntry( "Path", d->w->pathEdit->lineEdit()->text() );
 
   // Write mimeTypes


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/kdelibs4.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kdelibs4.spec	20 Feb 2008 02:17:35 -0000	1.11
+++ kdelibs4.spec	8 Mar 2008 18:52:54 -0000	1.12
@@ -1,10 +1,9 @@
-
-# TODO:
-# 1. package some noarch bits separately: apidocs.
+# set this to 0 to disable -apidocs for a faster build
+%define apidocs 1
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.0.1
-Release: 6%{?dist}.1
+Version: 4.0.2
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -47,8 +46,6 @@
 
 # make -devel packages parallel-installable
 Patch0: kdelibs-3.95.0-parallel_devel.patch
-# fix kde#149703
-Patch1: kdelibs-3.93.0-kde149703.diff
 # fix kde#149705
 Patch2: kdelibs-3.95.0-kde149705.patch
 # Force Phonon to use the ALSA default device by default
@@ -63,11 +60,14 @@
 # fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin
 # (can't talk over D-Bus to an app only supporting DCOP)
 Patch7: kdelibs-4.0.1-dcop-servicetype.patch
+# install all .css files and Doxyfile.global in kdelibs-common to build
+# kdepimlibs-apidocs against
+Patch8: kdelibs-4.0.2-install-all-css.patch
+# add Fedora/V-R to KHTML UA string
+Patch9: kdelibs-4.0.2-branding.patch
 
 # upstream patches
-Patch100: kdelibs-4.0.1-objectembed-handling.patch
-Patch101: kdelibs-4.0.1-autostart.patch
-Patch102: kdelibs-4.0.1-kde#771201-khtml.patch
+Patch100: kdelibs-4.0.x-kio.patch
 
 BuildRequires: qt4-devel >= 4.3.0
 Requires: qt4 >= %{_qt4_version} 
@@ -110,6 +110,12 @@
 BuildRequires: openssh-clients
 BuildRequires: subversion
 
+%if "%{?apidocs}" == "1"
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: qt4-doc
+%endif
+
 %description
 Libraries for the K Desktop Environment 4.
 
@@ -138,12 +144,28 @@
 This package includes the header files you will need to compile
 applications for KDE 4.
 
+%package apidocs
+Group: Development/Documentation
+Summary: KDE 4 API documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}
+%if "%{name}" == "kdelibs"
+Provides: kdelibs4-apidocs = %{version}-%{release}
+#else
+# Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs
+# (in kdevelop etc.) are fixed to kdelibs3-apidocs first and it may not be
+# worth it anyway.
+#Provides: kdelibs-apidocs = 6:%{version}-%{release}
+%endif
+
+%description apidocs
+This package includes the KDE 4 API documentation in HTML
+format for easy browsing.
+
 
 %prep
 %setup -q -n kdelibs-%{version}
 
 %patch0 -p1 -b .parallel_devel
-%patch1 -p1 -b .kde149703
 %patch2 -p1 -b .kde149705
 %patch4 -p1 -b .alsa-default
 %if 0%{?fedora} >= 9
@@ -153,23 +175,27 @@
 %patch6 -p1 -b .openssl
 %endif
 %patch7 -p1 -b .dcop-servicetype
+%patch8 -p1 -b .all-css
+%patch9 -p1 -b .branding
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 
 # upstream patches
-%patch100 -p0 -b .objectembed-handling
-%patch101 -p1 -b .xdg-autostart
-%patch102 -p0 -b .kde#771201-khtml
+%patch100 -p1 -b .kio
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
-%{cmake_kde4} ..
+%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
-# FIXME/TODO: apidocs
-# doc/api/doxygen.sh --doxdatadir=doc/common .
+# build apidocs
+%if "%{?apidocs}" == "1"
+export QTDOCDIR=`pkg-config --variable=docdir Qt`
+doc/api/doxygen.sh .
+%endif
 
 
 %install
@@ -211,6 +237,12 @@
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
 
+# install apidocs and generator script
+install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
+%if "%{?apidocs}" == "1"
+cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs
+%endif
+
 
 %post
 /sbin/ldconfig ||:
@@ -251,10 +283,17 @@
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/kde4/
-%exclude %{_kde4_libdir}/kde4/devel/
+%dir %{_kde4_libdir}/kde4/
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/libexec/
+%dir %{_kde4_libdir}/kde4/plugins/
+%{_kde4_libdir}/kde4/plugins/imageformats/
+%{_kde4_libdir}/kde4/plugins/phonon_platform/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 %doc %{_mandir}/man*/*
+%if "%{?apidocs}" == "1"
+%exclude %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/
+%endif
 # kdelibs-common comes from here for fedora >= 9
 %if "%{name}" == "kdelibs"
 %exclude %{_kde4_configdir}/kdebug.areas
@@ -277,18 +316,56 @@
 %doc KDE4PORTING.html
 %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_bindir}/makekdewidgets4
+%{_kde4_bindir}/kde4-doxygen.sh
 %{_kde4_appsdir}/cmake/
 %{_kde4_appsdir}/kdewidgets/
-%dir %{_kde4_libdir}/kde4/plugins/designer
-%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
 %{_kde4_appsdir}/ksgmltools2/
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/
+%{_kde4_libdir}/kde4/plugins/designer/
+
+%if "%{?apidocs}" == "1"
+%files apidocs
+%defattr(-,root,root,-)
+%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/
+%endif
 
 
 %changelog
-* Wed Feb 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.1-6.fc7.1
-- bump Release to work around Koji bug
+* Fri Mar 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-8
+- touchup KDE_DISTRIBUTION_TEXT
+- add Fedora/V-R to KHTML UA string (thanks caillon)
+
+* Thu Mar 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-7
+- exclude apidocs from the main package
+
+* Thu Mar 06 2008 Than Ngo <than at redhat.com> 4.0.2-6
+- apply upstream patch to fix issue in KPropertiesDialog
+
+* Thu Mar 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-5
+- also install Doxyfile.global in -common to build kdepimlibs-apidocs against
+
+* Wed Mar 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-4
+- install all .css files in kdelibs-common to build kdepimlibs-apidocs against
+- install doxygen.sh as kde4-doxygen.sh in -devel
+- build apidocs and put them into an -apidocs subpackage (can be turned off)
+- BR doxygen, graphviz and qt4-doc when building apidocs
+
+* Fri Feb 29 2008 Than Ngo <than at redhat.com> 4.0.2-3
+- rebuilt
+
+* Fri Feb 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
+- drop obsolete kde#149703 patch (fixed upstream by code rewrite)
+- drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml
+
+* Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
+- 4.0.2
+
+* Wed Feb 27 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.1-8
+- add Fedora branding to the package (#434815)
+
+* Mon Feb 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-7
+- -devel: own %%_kde4_libdir/kde4/plugins (thanks wolfy!)
 
 * Tue Feb 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.1-6
 - fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin


--- kdelibs-3.93.0-kde149703.diff DELETED ---


--- kdelibs-4.0.1-autostart.patch DELETED ---


--- kdelibs-4.0.1-kde#771201-khtml.patch DELETED ---


--- kdelibs-4.0.1-objectembed-handling.patch DELETED ---




More information about the fedora-extras-commits mailing list