From d88d9d16f57bc95addd8192ff8a85bae2fad2125 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 15 May 2007 18:58:25 +0000 Subject: [PATCH] * Thu May 14 2007 Rex Dieter - 6:3.5.6-5 - %changelog: prune pre-kde3 entries - %ghost %{_datadir}/services/ksycoca - omit extraneous .la file references (#178733) - BR: jasper-devel OpenEXR-devel - xdg-menu compat symlinks (to help transition to using XDG_MENU_PREFIX) - fix kde#126812.patch to be non-empty - cleanup kde.(sh|csh) - Requires: +kde-settings -redhat-artwork - make apidocs build optional (default on) - use FHS-friendly /etc/kde (#238136) --- kde.csh | 15 +- kde.sh | 25 +- kdelibs-3.5.0-101956.patch | 32 ++ kdelibs-3.5.5-kstandarddirs.patch | 14 + kdelibs-3.5.6-137675.patch | 133 ++++++ kdelibs-3.5.6-kde#126812.patch | 11 + kdelibs-3.5.6-kde#140768.patch | 11 + kdelibs.spec | 676 +++++++----------------------- 8 files changed, 374 insertions(+), 543 deletions(-) create mode 100644 kdelibs-3.5.0-101956.patch create mode 100644 kdelibs-3.5.5-kstandarddirs.patch create mode 100644 kdelibs-3.5.6-137675.patch create mode 100644 kdelibs-3.5.6-kde#140768.patch diff --git a/kde.csh b/kde.csh index 28bf989..cf3fe74 100755 --- a/kde.csh +++ b/kde.csh @@ -1,6 +1,9 @@ -# When/if using prelinking, avoids (some) use of kdeinit +## http://kde.ground.cz/tiki-index.php?page=Environment+Variables +## for possible entries here + +# When/if using prelinking, avoids (some) use of kdeinit if ( -f /etc/sysconfig/prelink ) then - set PRELINKING = `cat /etc/sysconfig/prelink | grep "^PRELINKING=" | cut -d"=" -f2` + set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2` if ( "$PRELINKING" == "yes" ) then if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1 endif @@ -9,8 +12,6 @@ endif # if not using IP6, speeds DNS operations # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1 -# Make sure KDEDIR is set -if ( $?KDEDIR ) then - exit -endif -setenv KDEDIR /usr +# Make sure KDEDIRS is set +if ( ! $?KDEDIRS ) setenv KDEDIRS /usr + diff --git a/kde.sh b/kde.sh index 7b95f1e..d7203ae 100755 --- a/kde.sh +++ b/kde.sh @@ -1,15 +1,14 @@ -# When/if using prelinking, avoids (some) use of kdeinit -if [ -f /etc/sysconfig/prelink ] ; then - source /etc/sysconfig/prelink - if [ "$PRELINKING" = yes ] ; then - [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED - fi -fi +## http://kde.ground.cz/tiki-index.php?page=Environment+Variables +## for possible entries here -# IPV6 support -[ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 -export KDE_NO_IPV6 +## When/if using prelinking, avoids (some) use of kdeinit +if [ -f /etc/sysconfig/prelink ]; then + if [ grep '^PRELINKING=yes' /etc/sysconfig/prelink ] ; then + [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED + fi -# Make sure KDEDIR is set -[ -z "$KDEDIR" ] && KDEDIR="/usr" -export KDEDIR +## IPV6 support +#[ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6 + +## Make sure KDEDIRS is set +[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS diff --git a/kdelibs-3.5.0-101956.patch b/kdelibs-3.5.0-101956.patch new file mode 100644 index 0000000..bd7f304 --- /dev/null +++ b/kdelibs-3.5.0-101956.patch @@ -0,0 +1,32 @@ +--- kdelibs-3.5.0/kioslave/http/http.cc.101956 2005-11-08 16:39:17.000000000 -0600 ++++ kdelibs-3.5.0/kioslave/http/http.cc 2005-12-01 13:23:39.000000000 -0600 +@@ -2103,6 +2103,8 @@ + return false; + } + ++ bool bCacheOnly = (m_request.cache == KIO::CC_CacheOnly); ++ + m_request.fcache = 0; + m_request.bCachedRead = false; + m_request.bCachedWrite = false; +@@ -2114,7 +2116,6 @@ + { + m_request.fcache = checkCacheEntry( ); + +- bool bCacheOnly = (m_request.cache == KIO::CC_CacheOnly); + bool bOffline = isOffline(m_request.doProxy ? m_proxyURL : m_request.url); + if (bOffline && (m_request.cache != KIO::CC_Reload)) + m_request.cache = KIO::CC_CacheOnly; +@@ -2156,6 +2157,12 @@ + return false; + } + } ++ else if (bCacheOnly) ++ { ++ // Instructed to only check cache, but _not_ to use cache. Oops. ++ error( ERR_DOES_NOT_EXIST, m_request.url.url() ); ++ return false; ++ } + + QString header; + QString davHeader; diff --git a/kdelibs-3.5.5-kstandarddirs.patch b/kdelibs-3.5.5-kstandarddirs.patch new file mode 100644 index 0000000..651973e --- /dev/null +++ b/kdelibs-3.5.5-kstandarddirs.patch @@ -0,0 +1,14 @@ +diff -urN kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp kdelibs-3.3.91/kdecore/kstandarddirs.cpp +--- kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp 2005-01-14 21:46:57.964666000 -0800 ++++ kdelibs-3.3.91/kdecore/kstandarddirs.cpp 2005-01-14 21:49:53.043136983 -0800 +@@ -833,6 +833,10 @@ + if ((local || testdir.exists()) && !candidates->contains(path)) + candidates->append(path); + } ++ // UGLY HACK - Chris CHeney ++ if (local && (!strcmp("config", type))) ++ candidates->append("/etc/kde/"); ++ // + local = false; + } + } diff --git a/kdelibs-3.5.6-137675.patch b/kdelibs-3.5.6-137675.patch new file mode 100644 index 0000000..7d34f34 --- /dev/null +++ b/kdelibs-3.5.6-137675.patch @@ -0,0 +1,133 @@ +Index: kioslave/metainfo/Makefile.am +=================================================================== +--- kioslave/metainfo/Makefile.am (Revision 606834) ++++ kioslave/metainfo/Makefile.am (Arbeitskopie) +@@ -2,7 +2,7 @@ + ## Makefile.am of kdebase/kioslave/metainfo + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++AM_LDFLAGS = $(KDE_RPATH) $(all_libraries) + METASOURCES = AUTO + + kde_module_LTLIBRARIES = kio_metainfo.la +Index: kioslave/gzip/Makefile.am +=================================================================== +--- kioslave/gzip/Makefile.am (Revision 606834) ++++ kioslave/gzip/Makefile.am (Arbeitskopie) +@@ -1,5 +1,5 @@ + INCLUDES = -I$(top_srcdir)/kio $(all_includes) +-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++AM_LDFLAGS = $(KDE_RPATH) $(all_libraries) + METASOURCES = AUTO + + kde_module_LTLIBRARIES = kgzipfilter.la +Index: kio/tests/Makefile.am +=================================================================== +--- kio/tests/Makefile.am (Revision 606834) ++++ kio/tests/Makefile.am (Arbeitskopie) +@@ -18,7 +18,7 @@ + + INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes) + LDADD = $(LIB_KIO) +-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++AM_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\ + kioslavetest kdirwatchtest kshredtest speed kurifiltertest \ +Index: dcop/tests/Makefile.am +=================================================================== +--- dcop/tests/Makefile.am (Revision 606834) ++++ dcop/tests/Makefile.am (Arbeitskopie) +@@ -3,7 +3,6 @@ + @echo -e "dcop tests not run.\nRun make tests in the tests directory to make them" + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) + + METASOURCES = AUTO + +@@ -17,7 +16,7 @@ + + driver_SOURCES = driver.cpp test.stub + driver_LDADD = $(LIB_KDECORE) +-driver_LDFLAGS = $(KDE_RPATH) ++driver_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + CLEANFILES = batch.generated definitions.generated driver.generated shell.generated + +Index: dcop/dcopidl2cpp/Makefile.am +=================================================================== +--- dcop/dcopidl2cpp/Makefile.am (Revision 606834) ++++ dcop/dcopidl2cpp/Makefile.am (Arbeitskopie) +@@ -1,6 +1,5 @@ + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) + + ####### Files + +@@ -10,7 +9,7 @@ + noinst_HEADERS = main.h + + dcopidl2cpp_LDADD = $(LIB_QT) +-dcopidl2cpp_LDFLAGS = $(KDE_RPATH) ++dcopidl2cpp_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h + ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl +Index: dcop/client/Makefile.am +=================================================================== +--- dcop/client/Makefile.am (Revision 606834) ++++ dcop/client/Makefile.am (Arbeitskopie) +@@ -1,6 +1,5 @@ + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) + DCOP_LIB = ../libDCOP.la + + ####### Files +@@ -9,19 +8,19 @@ + + dcop_SOURCES = dcop.cpp + dcop_LDADD = $(LIB_QT) $(DCOP_LIB) +-dcop_LDFLAGS = $(KDE_RPATH) ++dcop_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + dcopstart_SOURCES = dcopstart.cpp + dcopstart_LDADD = $(LIB_QT) $(DCOP_LIB) +-dcopstart_LDFLAGS = $(KDE_RPATH) ++dcopstart_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + dcopquit_SOURCES = dcopquit.cpp + dcopquit_LDADD = $(LIB_QT) $(DCOP_LIB) +-dcopquit_LDFLAGS = $(KDE_RPATH) ++dcopquit_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + dcopfind_SOURCES = dcopfind.cpp + dcopfind_LDADD = $(LIB_QT) $(DCOP_LIB) +-dcopfind_LDFLAGS = $(KDE_RPATH) ++dcopfind_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + dcopclient_SOURCES = dcopclient.c + dcopobject_SOURCES = dcopobject.c +Index: dcop/dcopidl/Makefile.am +=================================================================== +--- dcop/dcopidl/Makefile.am (Revision 606834) ++++ dcop/dcopidl/Makefile.am (Arbeitskopie) +@@ -1,6 +1,5 @@ + + INCLUDES = $(all_includes) +-AM_LDFLAGS = $(all_libraries) + AM_CPPFLAGS = -DYYDEBUG + + ####### Files +@@ -11,7 +10,7 @@ + noinst_HEADERS = yacc.cc.h + + dcopidl_LDADD = $(LIB_QT) +-dcopidl_LDFLAGS = $(KDE_RPATH) ++dcopidl_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + ####### Build rules + diff --git a/kdelibs-3.5.6-kde#126812.patch b/kdelibs-3.5.6-kde#126812.patch index e69de29..8625df6 100644 --- a/kdelibs-3.5.6-kde#126812.patch +++ b/kdelibs-3.5.6-kde#126812.patch @@ -0,0 +1,11 @@ +--- kdelibs-3.5.6/khtml/khtml_part.cpp.kde#126812 2007-01-15 05:34:06.000000000 -0600 ++++ kdelibs-3.5.6/khtml/khtml_part.cpp 2007-05-14 15:20:50.000000000 -0500 +@@ -1843,7 +1843,7 @@ + } + KIO::TransferJob *tjob = ::qt_cast(job); + if (tjob && tjob->isErrorPage()) { +- khtml::RenderPart *renderPart = d->m_frame->m_frame; ++ khtml::RenderPart *renderPart = d->m_frame ? d->m_frame->m_frame : 0L; + if (renderPart) { + HTMLObjectElementImpl* elt = static_cast(renderPart->element()); + if (!elt) diff --git a/kdelibs-3.5.6-kde#140768.patch b/kdelibs-3.5.6-kde#140768.patch new file mode 100644 index 0000000..cf0e7a7 --- /dev/null +++ b/kdelibs-3.5.6-kde#140768.patch @@ -0,0 +1,11 @@ +--- kdelibs-3.5.6/khtml/html/html_documentimpl.cpp.kde#140768 2007-01-15 05:34:00.000000000 -0600 ++++ kdelibs-3.5.6/khtml/html/html_documentimpl.cpp 2007-02-16 09:38:24.000000000 -0600 +@@ -222,7 +222,7 @@ + + void HTMLDocumentImpl::slotHistoryChanged() + { +- if ( !m_render ) ++ if ( true || !m_render ) + return; + + recalcStyle( Force ); diff --git a/kdelibs.spec b/kdelibs.spec index 13d7b73..de93a43 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,7 +1,10 @@ + %define distname "Fedora" -%define debug 0 +#define debug 1 %define final 1 +%define kde_settings 1 +%define apidocs 1 %define qt_epoch 1 %define arts_epoch 8 @@ -13,17 +16,18 @@ %define qtdocdir %{_docdir}/qt-devel-%{qt_version} -%define make_cvs 0 +%define make_cvs 1 %define arts 1 -Version: 3.5.6 -Release: 3%{?dist} +Name: kdelibs Summary: K Desktop Environment - Libraries -Name: kdelibs -Url: http://www.kde.org/ -Epoch: 6 -Group: System Environment/Libraries +Epoch: 6 +Version: 3.5.6 +Release: 5%{?dist} + License: LGPL +Url: http://www.kde.org/ +Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Source1: kde.sh @@ -47,10 +51,18 @@ Patch39: kdelibs-3.5.4-kabc-make.patch Patch40: kdelibs-3.5.4-kdeprint-utf8.patch Patch41: kdelibs-3.5.6-utempter.patch +# kstandarddirs patch, use /etc/kde in addition to /usr/share/config, borrowed from debian +Patch104: kdelibs-3.5.5-kstandarddirs.patch # upstream patches Patch500: kdelibs-3.5.6-qt3.3.8.patch Patch501: kdelibs-3.5.6-kde#126812.patch +# http://bugs.kde.org/101956 (kget ignores simultaneous download limit) +Patch101956: kdelibs-3.5.0-101956.patch +# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675) +Patch137675: kdelibs-3.5.6-137675.patch +## http://bugs.kde.org/140768 +Patch140768: kdelibs-3.5.6-kde#140768.patch # security issue # CVE-2007-0537 @@ -60,22 +72,27 @@ Requires: arts >= %{arts_epoch}:%{arts_version} Requires: qt >= %{qt_epoch}:%{qt_version} Requires: cups-libs >= %{cups_epoch}:1.1.12 Requires: iceauth -Requires: desktop-backgrounds-basic + +%if %{kde_settings} +Requires: kde-settings >= 3.5 +%else Requires: redhat-artwork >= 0.239-2 +%endif +Requires: desktop-backgrounds-basic Requires: hicolor-icon-theme Requires: redhat-menus >= 5.0.4 + Requires(pre): coreutils Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: shadow-utils Requires: libkdnssd -BuildRequires: qt-devel-docs BuildRequires: gettext BuildRequires: pcre-devel -BuildRequires: cups-devel >= %{cups_epoch}:1.1.20 -BuildRequires: cups >= %{cups_epoch}:1.1.20 -BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version} +BuildRequires: cups-devel >= %{cups_epoch}:1.1.20, cups +BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}, qt-devel-docs +BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version} BuildRequires: flex >= 2.5.4a-13 BuildRequires: doxygen BuildRequires: libxslt-devel >= 1.1.15 @@ -88,19 +105,15 @@ BuildRequires: perl-SGMLSpm BuildRequires: docbook-utils BuildRequires: zlib-devel BuildRequires: libidn-devel -BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version} BuildRequires: audiofile-devel BuildRequires: openssl-devel BuildRequires: perl BuildRequires: gawk BuildRequires: byacc -BuildRequires: libart_lgpl-devel >= 2.3.8 +BuildRequires: libart_lgpl-devel BuildRequires: bzip2-devel BuildRequires: libtiff-devel -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libacl-devel -BuildRequires: libattr-devel +BuildRequires: libacl-devel libattr-devel BuildRequires: aspell-devel BuildRequires: krb5-devel BuildRequires: openldap-devel @@ -109,6 +122,12 @@ BuildRequires: alsa-lib-devel BuildRequires: pkgconfig BuildRequires: glibc-kernheaders BuildRequires: libutempter-devel +BuildRequires: findutils +BuildRequires: jasper-devel +BuildRequires: OpenEXR-devel +%if %{make_cvs} +BuildRequires: automake libtool +%endif %description Libraries for the K Desktop Environment: @@ -124,6 +143,8 @@ Requires: qt-devel >= %{qt_epoch}:%{qt_version} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: qt-devel Requires: arts-devel +Requires: libkdnssd-devel +## those below can/should be omitted from future builds -- Rex Requires: libart_lgpl-devel Requires: libxslt-devel Requires: libjpeg-devel @@ -134,9 +155,7 @@ Requires: libtiff-devel Requires: libidn-devel Requires: libacl-devel Requires: pcre-devel -Requires: libkdnssd-devel Requires: libutempter-devel - %description devel This package includes the header files you will need to compile applications for KDE. @@ -144,9 +163,8 @@ applications for KDE. %package apidocs Group: Development/Documentation Summary: KDE API documentation. -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{epoch}:%{version} Obsoletes: kdelibs-docs < %{epoch}:%{version}-%{release} - %description apidocs This package includes the KDE API documentation in HTML format for easy browsing @@ -155,14 +173,14 @@ format for easy browsing %prep %setup -q %patch1 -p1 -b .xdg-menu -%if %{debug} == 0 +%if "%{?debug}" != "1" %patch2 -p1 -b .debug %endif %patch4 -p1 -b .ksyscoca %patch5 -p1 -b .openssl %patch15 -p1 -b .buildroot %patch16 -p1 -b .ssl-krb5 -%patch20 -p1 -b .defaultstyle +#patch20 -p1 -b .defaultstyle %patch32 -p1 -b .cups %patch33 -p1 -b .ppc %patch34 -p1 -b .qtdoc @@ -173,59 +191,70 @@ format for easy browsing %patch40 -p1 -b .kdeprint-utf8 %patch41 -p1 -b .utempter +%patch104 -p1 -b .kstandarddirs + # upstream patches %patch500 -p0 -b .qt3.3.8 -%patch501 -p0 -b .kde#126812 +%patch501 -p1 -b .kde#126812 +%patch137675 -p0 -b .kde#137675 +%patch140768 -p1 -b .kde#140768 + # security %patch1000 -p0 -b .bz#225420-CVE-2007-0537 -perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h +sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h + +%if %{make_cvs} + make -f admin/Makefile.common cvs +%endif + %build unset QTDIR && . /etc/profile.d/qt.sh export QTDOC=%{qtdocdir} export libltdl_cv_shlibext=".so" -export PATH=/usr/kerberos/bin:${PATH} -%if %{make_cvs} - make -f admin/Makefile.common cvs -%endif - -VERSION=`cat /etc/redhat-release 2>/dev/null` - -suffix="" -if [ "%{_lib}" == "lib64" ] ; then - suffix="64" +if [ -x /etc/profile.d/krb5.sh ]; then + . /etc/profile.d/krb5.sh +elif ! echo ${PATH} | grep -q /usr/kerberos/bin ; then + export PATH=/usr/kerberos/bin:${PATH} fi %configure \ - --disable-fast-malloc \ + --includedir=%{_includedir}/kde \ + --disable-rpath \ --enable-new-ldflags \ - --with-qt-libraries=$QTLIB \ - --enable-libsuffix="$suffix" \ + --disable-dependency-tracking \ + %{!?debug: --disable-debug --disable-warnings --enable-final} \ + %{?debug:--enable-debug --enable-warnings --disable-final} \ + --disable-fast-malloc \ +%if "%{_lib}" == "lib64" + --enable-libsuffix="64" \ +%endif --enable-cups \ --enable-mitshm \ - --with-xinerama \ - --disable-gcc-hidden-visibility \ --enable-pie \ - --with-distribution="$VERSION" \ + --enable-sendfile \ + --with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \ --with-alsa \ - --includedir=%{_includedir}/kde \ + --with-aspell \ --disable-libfam \ --enable-dnotify \ --enable-inotify \ - --disable-rpath \ --with-utempter \ - --disable-debug --disable-warnings \ - --disable-dependency-tracking --enable-final \ - %{?debug:--enable-debug --enable-warnings --disable-final} \ %{!?arts:--without-arts} \ - --with-rgbfile=%{_datadir}/X11/rgb.txt + --with-rgbfile=%{_datadir}/X11/rgb.txt \ + --with-jasper \ + --with-openexr \ + --with-xinerama make %{?_smp_mflags} +%if %{apidocs} make %{?_smp_mflags} apidox +%endif + %install rm -rf %{buildroot} @@ -233,14 +262,14 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install chmod a+x %{buildroot}%{_libdir}/* -install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/ +install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol pushd %{buildroot}%{_docdir} ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version} popd mkdir -p %{buildroot}%{_sysconfdir}/profile.d -install -m 755 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/ +install -p -m 755 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/ # Make symlinks relative pushd %{buildroot}%{_docdir}/HTML/en @@ -252,18 +281,59 @@ for i in *; do done popd +## menus mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus -mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu %{buildroot}%{_sysconfdir}/kde/xdg/menus +mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \ + %{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu +# compat-symlinks, can go away eventually -- Rex +ln -s %{_sysconfdir}/xdg/menus/kde-applications.menu \ + %{buildroot}%{_sysconfdir}/kde/xdg/menus/kde-applications.menu +ln -s kde-applications.menu \ + %{buildroot}%{_sysconfdir}/kde/xdg/menus/applications.menu echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop -rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme +# Use hicolor-icon-theme rpm/pkg instead (#178319) +rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/ + +# ghost'd files +touch $RPM_BUILD_ROOT%{_datadir}/services/ksycoca + +## remove references to extraneous/optional libraries in .la files (#170602) +# fam, libart_lgpl, pcre, libidn, libpng, libjpeg, libdns_sd, libacl/libattr, alsa-lib/asound +find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \ + sed -i \ + -e "s@-lfam@@g" \ + -e "s@%{_libdir}/libfam.la@@g" \ + -e "s@-lart_lgpl_2@@g" \ + -e "s@%{_libdir}/libpcreposix.la@@g" \ + -e "s@-lpcreposix@@g" \ + -e "s@-lpcre@@g" \ + -e "s@-lidn@@g" \ + -e "s@%{_libdir}/libidn.la@@g" \ + -e "s@-lpng@@g" \ + -e "s@-ljpeg@@g" \ + -e "s@%{_libdir}/libjpeg.la@@g" \ + -e "s@-ldns_sd@@g" \ + -e "s@-lacl@@g" \ + -e "s@%{_libdir}/libacl.la@@g" \ + -e "s@/%{_lib}/libacl.la@@g" \ + -e "s@-lattr@@g" \ + -e "s@%{_libdir}/libattr.la@@g" \ + -e "s@/%{_lib}/libattr.la@@g" \ + -e "s@-lasound@@g" + +## unpackaged files +# libkdnssd bits rm -f %{buildroot}%{_libdir}/libkdnssd.* rm -rf %{buildroot}%{_includedir}/kde/dnssd + %clean rm -rf %{buildroot} + +# Not sure if this is really needed anymore, but doesn't look harmful either -- Rex %pre if [ -d /etc/skel/Desktop/Autostart ]; then mv -f /etc/skel/Desktop/Autostart /etc/skel/Desktop/Autostart-OLD..KDE @@ -275,26 +345,24 @@ exit 0 %post /sbin/ldconfig touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : -fi +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : %{_bindir}/update-desktop-database > /dev/null 2>&1 || : %postun /sbin/ldconfig touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : -fi +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : %{_bindir}/update-desktop-database > /dev/null 2>&1 || : + %files %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/profile.d/* %dir %{_sysconfdir}/kde %dir %{_sysconfdir}/kde/xdg -%dir %{_sysconfdir}/kde/xdg/menus -%{_sysconfdir}/kde/xdg/menus/* +%dir %{_sysconfdir}/kde/xdg/menus +%{_sysconfdir}/kde/xdg/menus/*.menu +%{_sysconfdir}/xdg/menus/*.menu %{_bindir}/artsmessage %{_bindir}/checkXML %{_bindir}/cupsdconf @@ -369,35 +437,51 @@ fi %{_datadir}/mimelnk %{_datadir}/autostart %{_datadir}/services +%ghost %{_datadir}/services/ksycoca %{_datadir}/servicetypes %dir %{_docdir}/HTML %dir %{_docdir}/HTML/en -%doc %{_docdir}/HTML/en/common -%doc %{_docdir}/HTML/en/kspell +%{_docdir}/HTML/en/common +%{_docdir}/HTML/en/kspell %files devel %defattr(-,root,root) %{_bindir}/dcopidl* -%{_includedir}/kde +%{_includedir}/kde/ %{_libdir}/lib*.so %{_libdir}/lib*.a %exclude %{_libdir}/libkdeinit_*.so +%if %{apidocs} %files apidocs %defattr(-,root,root) -%doc %{_docdir}/%{name}-devel-%{kde_major_version} -%doc %{_docdir}/HTML/en/kdelibs* +%{_docdir}/%{name}-devel-%{kde_major_version} +%{_docdir}/HTML/en/kdelibs* +%endif + %changelog -* Mon Mar 26 2007 Than Ngo - 6:3.5.5-3.fc7 +* Thu May 14 2007 Rex Dieter - 6:3.5.6-5 +- %%changelog: prune pre-kde3 entries +- %%ghost %%{_datadir}/services/ksycoca +- omit extraneous .la file references (#178733) +- BR: jasper-devel OpenEXR-devel +- xdg-menu compat symlinks (to help transition to using XDG_MENU_PREFIX) +- fix kde#126812.patch to be non-empty +- cleanup kde.(sh|csh) +- Requires: +kde-settings -redhat-artwork +- make apidocs build optional (default on) +- use FHS-friendly /etc/kde (#238136) + +* Mon Mar 26 2007 Than Ngo - 6:3.5.6-3.fc7 - apply upstream patch to fix build issue with qt-3.3.8 - apply upstream patch to to fix crash on particular 404 url in embedded HTML viewer -* Tue Feb 27 2007 Than Ngo - 6:3.5.5-2.fc7 +* Tue Feb 27 2007 Than Ngo - 6:3.5.6-2.fc7 - cleanup specfile -* Mon Feb 05 2007 Than Ngo - 6:3.5.5-1.fc7 +* Mon Feb 05 2007 Than Ngo - 6:3.5.6-1.fc7 - 3.5.6 - apply patch to fix #225420, CVE-2007-0537 Konqueror improper HTML comment rendering, thanks to Dirk Müller, KDE security team @@ -1179,457 +1263,3 @@ fi * Wed Mar 27 2002 Bernhard Rosenkraenzer 3.0.0-1 - Update to final - Add fixes from KDE_3_0_BRANCH - -* Wed Mar 27 2002 Than Ngo 3.0.0-0.cvs20020326.2 -- scale down icons for submenus pointing to legacy - applications rather than keeping them at 32x32 (bug #61506) - -* Mon Mar 25 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020325.1 -- Build the Keramik style - -* Thu Mar 14 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020314.1 -- s/qDebug/kdDebug/ - -* Mon Mar 11 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020311.1 -- Reduce debug spewage - -* Fri Mar 1 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020301.1 -- Update - -* Fri Feb 15 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020215.1 -- Update -- arts is no longer part of kdelibs - -* Mon Feb 11 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020211.1 -- Update -- Build with Xinerama support - -* Mon Jan 28 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020128.3 -- Rebuild from a fresh CVS checkout - -* Mon Jan 28 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020128.1 -- KABC::AddressBook::reload() added - -* Sat Jan 26 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020126.1 -- Update to get API changes -- Build with CUPS support - -* Thu Jan 17 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020117.1 -- Update - -* Wed Jan 9 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020109.1 -- Stop excluding alpha, gcc has been fixed -- Fix generation of API docs -- Fix up SSL support - -* Mon Jan 7 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020107.1 -- arts-devel provides kdelibs-sound-devel for backwards compatibility -- Update, rebuild with gcc 3.1-0.15 - -* Fri Jan 4 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020104.1 -- Update -- Make sure we aren't built with gcc 3.1 prior to -0.14 -- Remove -O0 hack, no longer needed with gcc 3.1-0.14 -- Adapt spec file to base changes (good-bye, libkfile, libkssl and libksycoca!) - -* Sat Dec 29 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20011229.1 -- Update -- stop excluding alpha - -* Fri Dec 14 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20011214.1 -- Update -- Update Japanese patches -- Temporarily exclude alpha (compiler bugs) -- Add workaround for gcc bug #57502 - -* Sun Nov 11 2001 Bernhard Rosenkraenzer 3.0-0.cvs20011111.1 -- Get rid of kdelibs-sound, kdelibs-sound-devel; add arts-devel. Makes more - sense. - -* Thu Oct 18 2001 Bernhard Rosenkraenzer 3.0-0.cvs20011018.1 -- Various 3.0 related fixes - -* Thu Aug 2 2001 Bernhard Rosenkraenzer 2.2-0.cvs20010802.1 -- Remove the japanese khtml patches, they break too many non-japanese web - pages - -* Mon Jul 30 2001 Bernhard Rosenkraenzer 2.2-0.cvs20010730.1 -- Update, fixes