rpms/kdelibs/devel kdelibs-3.5.0-101956.patch, NONE, 1.1 kdelibs-3.5.5-kstandarddirs.patch, NONE, 1.1 kdelibs-3.5.6-137675.patch, NONE, 1.1 kdelibs-3.5.6-kde#140768.patch, NONE, 1.1 kde.csh, 1.3, 1.4 kde.sh, 1.4, 1.5 kdelibs-3.5.6-kde#126812.patch, 1.1, 1.2 kdelibs.spec, 1.205, 1.206

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue May 15 18:59:01 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15115

Modified Files:
	kde.csh kde.sh kdelibs-3.5.6-kde#126812.patch kdelibs.spec 
Added Files:
	kdelibs-3.5.0-101956.patch kdelibs-3.5.5-kstandarddirs.patch 
	kdelibs-3.5.6-137675.patch kdelibs-3.5.6-kde#140768.patch 
Log Message:
* Thu May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 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)


kdelibs-3.5.0-101956.patch:

--- NEW FILE kdelibs-3.5.0-101956.patch ---
--- 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;

kdelibs-3.5.5-kstandarddirs.patch:

--- NEW FILE kdelibs-3.5.5-kstandarddirs.patch ---
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;
             }
         }

kdelibs-3.5.6-137675.patch:

--- NEW FILE kdelibs-3.5.6-137675.patch ---
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
 

kdelibs-3.5.6-kde#140768.patch:

--- NEW FILE kdelibs-3.5.6-kde#140768.patch ---
--- 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 );


Index: kde.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde.csh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde.csh	16 May 2006 16:05:25 -0000	1.3
+++ kde.csh	15 May 2007 18:58:25 -0000	1.4
@@ -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 @@
 # 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
+


Index: kde.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde.sh	7 Sep 2006 11:01:04 -0000	1.4
+++ kde.sh	15 May 2007 18:58:25 -0000	1.5
@@ -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

kdelibs-3.5.6-kde#126812.patch:

Index: kdelibs-3.5.6-kde#126812.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-3.5.6-kde#126812.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-3.5.6-kde#126812.patch	5 Apr 2007 13:14:27 -0000	1.1
+++ kdelibs-3.5.6-kde#126812.patch	15 May 2007 18:58:25 -0000	1.2
@@ -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<KIO::TransferJob*>(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<HTMLObjectElementImpl *>(renderPart->element());
+       if (!elt)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- kdelibs.spec	5 Apr 2007 13:14:27 -0000	1.205
+++ kdelibs.spec	15 May 2007 18:58:25 -0000	1.206
@@ -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
+Epoch:	 6
+Version: 3.5.6
+Release: 5%{?dist}
+
+License: LGPL
 Url: http://www.kde.org/
-Epoch: 6
 Group: System Environment/Libraries
-License: LGPL
 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 @@
 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: 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: 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: 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: %{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: 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 @@
 %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 @@
 %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 @@
 %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 @@
 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 @@
 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 at -lfam@@g" \
+ -e "s@%{_libdir}/libfam.la@@g" \
+ -e "s at -lart_lgpl_2@@g" \
+ -e "s@%{_libdir}/libpcreposix.la@@g" \
+ -e "s at -lpcreposix@@g" \
+ -e "s at -lpcre@@g" \
+ -e "s at -lidn@@g" \
+ -e "s@%{_libdir}/libidn.la@@g" \
+ -e "s at -lpng@@g" \
+ -e "s at -ljpeg@@g" \
+ -e "s@%{_libdir}/libjpeg.la@@g" \
+ -e "s at -ldns_sd@@g" \
+ -e "s at -lacl@@g" \
+ -e "s@%{_libdir}/libacl.la@@g" \
+ -e "s@/%{_lib}/libacl.la@@g" \
+ -e "s at -lattr@@g" \
+ -e "s@%{_libdir}/libattr.la@@g" \
+ -e "s@/%{_lib}/libattr.la@@g" \
+ -e "s at -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 @@
 %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 @@
 %{_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 <than at redhat.com> - 6:3.5.5-3.fc7
+* Thu May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 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 <than at redhat.com> - 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 <than at redhat.com> - 6:3.5.5-2.fc7
+* Tue Feb 27 2007 Than Ngo <than at redhat.com> - 6:3.5.6-2.fc7
 - cleanup specfile
 
-* Mon Feb 05 2007 Than Ngo <than at redhat.com> - 6:3.5.5-1.fc7
+* Mon Feb 05 2007 Than Ngo <than at redhat.com> - 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 @@
 * Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-1
 - Update to final
 - Add fixes from KDE_3_0_BRANCH
-
-* Wed Mar 27 2002 Than Ngo <than at redhat.com> 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 <bero at redhat.com> 3.0.0-0.cvs20020325.1
-- Build the Keramik style
-
-* Thu Mar 14 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020314.1
-- s/qDebug/kdDebug/
-
-* Mon Mar 11 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020311.1
-- Reduce debug spewage
-
-* Fri Mar  1 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020301.1
-- Update
-
-* Fri Feb 15 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020215.1
-- Update
-- arts is no longer part of kdelibs
-
-* Mon Feb 11 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020211.1
-- Update
-- Build with Xinerama support
-
-* Mon Jan 28 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020128.3
-- Rebuild from a fresh CVS checkout
-
-* Mon Jan 28 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020128.1
-- KABC::AddressBook::reload() added
-
-* Sat Jan 26 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020126.1
-- Update to get API changes
-- Build with CUPS support
-
-* Thu Jan 17 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020117.1
-- Update
-
-* Wed Jan  9 2002 Bernhard Rosenkraenzer <bero at redhat.com> 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 <bero at redhat.com> 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 <bero at redhat.com> 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 <bero at redhat.com> 3.0.0-0.cvs20011229.1
-- Update
-- stop excluding alpha
-
-* Fri Dec 14 2001 Bernhard Rosenkraenzer <bero at redhat.com> 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 <bero at redhat.com> 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 <bero at redhat.com> 3.0-0.cvs20011018.1
-- Various 3.0 related fixes
-
-* Thu Aug  2 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010802.1
-- Remove the japanese khtml patches, they break too many non-japanese web
-  pages
-
-* Mon Jul 30 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010730.1
-- Update, fixes <option size> handling in khtml (#50303)
-- Add japanese patches
-
-* Thu Jul 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010726.1
-- Add yet another build dependency (#49909)
-
-* Tue Jul 24 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010724.1
-- Remove internal libxslt, we have the real thing
-- Remove ia64 workarounds, no longer needed
-
-* Sat Jul 21 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010721.1
-- Move artsmessage from arts to kdelibs-sound
-- Update
-
-* Fri Jul 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010720.2
-- Move libartskde from arts to kdelibs-sound
-
-* Fri Jul 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010720.1
-- Update
-- Work around ia64 breakages
-
-* Wed Jun 27 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.beta1.1
-- beta 1
-
-* Tue Jun 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010626.1
-- Update
-- Obsolete kdesupport, kdesupport-devel
-
-* Wed May 16 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010516.1
-- Update
-
-* Mon May 14 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010514.1
-- Fix up pcre detection in CVS
-- Update, fixes "easy enter form" in Bugzilla
-
-* Thu May 10 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010510.1
-- Update to CVS, fix second half of bug #40087
-
-* Fri May 04 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010503.1
-- Update to CVS after fixing bugs #38894, #30575
-  directly in the CVS tree
-
-* Sun Apr 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.alpha1.2
-- create subpackages for MySQL and Postgres KDB plugins to avoid
-  unnecessary dependencies
-
-* Wed Apr 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.alpha1.1
-- 2.2alpha1
-- require pcre, pcre-devel
-
-* Tue Apr  3 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1.1-5
-- Merge fixes from current KDE_2_1_BRANCH - fixes 2 memory leaks and
-  makes kio_http more tolerant to broken Auth requests sent by some
-  servers
-- Add missing mcop{class,type} files in arts package
-- Handle PATH changes in kdesu, some KControl modules need /sbin in the
-  PATH... (#34209)
-- Add KDE2PORTING.html file in /usr/share/docs/kdelibs-devel-%{version},
-  it's quite useful...
-
-* Thu Mar 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1.1-3
-- Fix up kded to watch directories we can't write to
-- Use mkstemp() rather than tmpfile() for xauth file generation
-  in kdesu
-
-* Wed Mar 21 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1.1-2
-- Fix up cookie escaping (this should finally fix bugzilla for good)
-- Security: cookies shouldn't be world readable, some websites store
-  login information
-
-* Wed Mar 21 2001 Than Ngo <than at redhat.com>
-- disable debug as default
-
-* Tue Mar 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1.1-1
-- 2.1.1
-- Escape cookies when necessary
-
-* Mon Mar 19 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1-10
-- Don't crash in KProcess if getpwuid() returns NULL, happens with
-  LDAP authentication
-- Require qt >= 2.3.0 (#31770)
-- Fix crash in KURLCompletion
-
-* Tue Mar 13 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.1-9
-- Add some more fixes and <layer> support from KDE_2_1_BRANCH
-- Patch KService to not add K menu entries if the desktop files
-  aren't readable by the user we're running at (removes bogus
-  timetool, control-panel etc. entries; I'd still prefer running
-  those through consolehelper over hiding them from users...)
-
-* Fri Mar  9 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Revert to putting config files in /usr/share/config
-- Fix up cookie handling when combined with JavaScript (#30577)
-- Add some html rendering fixes from KDE_2_1_BRANCH
-
-* Wed Feb 28 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- /usr/share/config -> /etc/kde
-- Use --disable-debug, it works with Qt 2.3.0
-
-* Tue Feb 27 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add khtml+DOM fixes from KDE_2_1_BRANCH
-- BuildPrereq docbook stuff so we don't get broken kdb2html stuff
-
-* Thu Feb 22 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- YAR (Yet Another Respin)
-
-* Wed Feb 21 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.1-respin
-
-* Mon Feb 19 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.1
-
-* Sun Feb 18 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update
-- Disable some more debugging (but leave -DNDEBUG out, it's broken)
-
-* Thu Feb 15 2001 Than Ngo <than at redhat.com>
-- create the kdoc-preferences for kdevelop
-- put the html documents /usr/share/doc/kdelibs-devel-2
-
-* Wed Feb 14 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add workaround for merging GNOME's non-UTF8 .desktop files
-  in the KDE menu
-
-* Tue Feb 13 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- disable debug, but patch out the CXXFLAGS change
-
-* Mon Feb 12 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Back out --disable-debug change
-
-* Fri Feb  9 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Build with --disable-debug
-
-* Tue Feb  6 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Get rid of libkdefakes.so.0 (obsolete)
-- Fix the escape sequence patch (#25307)
-
-* Mon Feb  5 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add Japanese patch from Sato Satoru <ssato at redhat.com>
-
-* Thu Feb  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix klauncher escape sequence handling (#25307, Patch from Tim Waugh)
-- Fix krun escape sequence handling (#25134, Patch from Tim Waugh)
-- Make /usr/share/doc/HTML/en/kspell/common symlink relative (#24793)
-
-* Thu Jan 25 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Apply patch from CVS to fix up Cookie handling in Konqueror.
-  Finally Bugzilla works perfectly in Konqueror.
-
-* Mon Jan 22 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- kdelibs-sound-devel requires audiofile-devel, kdelibs-sound doesn't.
-- Update, fixes various HTML rendering bugs
-
-* Sat Jan 20 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Require kdesupport >= 2.0.99 rather than >= %%{version}
-  kdesupport doesn't change frequently.
-
-* Fri Jan 19 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update
-
-* Wed Jan 17 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- remove the Java hacks; KDE now requires a Java 2 compliant
-  environment, so there's no chance to get any of it to run
-  with current kaffe.
-
-* Tue Jan 16 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- restore real arts %%description
-- require Qt >= 2.2.3 rather than 2.2.0
-
-* Tue Jan 16 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Move libkmedia2_idl to arts; it's needed there
-- Fix up the Java stuff. The new stuff is ugly, but seems to work
-- Get rid of the compiler bug workaround: the ICE was triggered by
-  unclean code
-- Change the description of the arts package for translation purposes
-
-* Mon Jan 15 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Work around compiler bugs (sigh)
-- Fix specfile (added files)
-- Split arts into a separate package; it's required by SDL,
-  and depending on kdelibs-sound (which requires kdelibs)
-  is overkill
-
-* Thu Jan 11 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Modify the check for an acceptable JVM to accept Kaffe
-
-* Mon Jan  8 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add a hack to get a static libartsc
-
-* Sun Jan  7 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Obsolete kdelibs2* (from 7.0preview)
-
-* Mon Jan  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update
-
-* Wed Dec 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Run ldconfig in %post/%postun for kdelibs-sound
-- Turn off optimizations on ia64
-
-* Mon Dec 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.1beta1
-
-* Thu Nov  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- update to current HEAD
-
-* Fri Nov  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Another one - fix segfaults in the spellchecker
-- fix docs
-
-* Fri Nov  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update CVS yet again - styles crash fix
-
-* Thu Nov  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update CVS - security fix in Java/Javascript code.
-  There seems to be some conspiracy going on - "commit important
-  fixes right after Red Hat built new RPMs" or the likes. :>
-
-* Thu Nov  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix up handling of desktop files that use TryExec (Bug #20020)
-  Patch also committed to KDE CVS
-
-* Wed Nov  1 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Rebuild with fixed kdoc
-
-* Fri Oct 27 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- update to current KDE_2_0_BRANCH, now that most of the ".0 release"
-  bugs are fixed
-- fix typo in specfile: it's mitshm, not libshm
-- Add ksendbugmail, required for the "Report Bug" feature to work
-
-* Sun Oct 22 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.0 final
-- don't --enable-final on alpha (compiler problems)
-
-* Sun Oct  1 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- rebuild
-
-* Sat Sep 30 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new CVS snapshot
-- fix up specfile
-- exclude alpha for now (compiler bugs)
-
-* Sat Sep 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- major specfile cleanups
-- update CVS
-
-* Fri Sep 22 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Move back to /usr
-- New CVS snapshot
-- Clean up specfile
-- Use %%defines so we can build CVS snapshots and releases from the same
-  specfile
-
-* Fri Aug 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- rebuild with optimizations re-enabled (Qt works around the problem now)
-
-* Thu Aug 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- rebuild with new Qt
-
-* Tue Aug 22 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 1.93
-
-* Sat Aug 05 2000 Than Ngo <than at redhat.de>
-- don't use -DNDEBUG and -O2 on alpha,sparc to build, it breaks with Internal
-  error (c++ bug)
-
-* Fri Aug  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- update to current (I fixed the libGL detection issue there)
-
-* Wed Aug  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- move to /usr/lib/kde2
-- new snapshot
-
-* Wed Jul 26 2000 Than Ngo <than at redhat.de>
-- new snapshot
-
-* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-
-* Thu Jul 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot, new Qt
-- various fixes to spec file
-- get rid of -O0, no longer required with gcc 2.96-41 (except on alpha)
-
-* Tue Jul 18 2000 Than Ngo <than at redhat.de>
-- rebuilt with gcc-2.96-40
-
-* Sun Jul 16 2000 Than Ngo <than at redhat.de>
-- use gcc 2.96
-- new snapshot
-- use -O0 for now (ICE)
-
-* Sun Jul  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Use egcs++
-- Epoch 3
-- Update to current
-
-* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update to current - segfaulting at initialization time is not a nice
-  feature.
-
-* Tue Jun 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- disable build on ia64 for now (compiler bugs)
-- FHSify
-
-* Thu Mar 30 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- split: move sound support to a separate package, suggestion from
-  David Faure <david at linux-mandrake.com>
-
-* Sat Mar 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- move it to /usr, where it belongs
-
-* Wed Jan 05 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- move programming docs to %{_docdir}/kdelibs-devel-%{version}-%{release}
-  and to kdelibs-devel package
-- new snapshot
-
-* Tue Dec 14 1999 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add qt version number in Requires, add kdoc HTML help
-  (patch from David Faure <david at mandrakesoft.com>)
-- Actually use the %clean section
-
-* Mon Nov  1 1999 Bernhard Rosenkraenzer <bero at redhat.com>
-- almost completely rewrite spec file - move to DESTDIR system
-- current snapshot
-
-* Thu Oct 15 1999 Bernhard Rosenkraenzer <bero at redhat.de>
-- 2.0 snapshots
-- Change prefix to respect %{prefix} so we can coexist with KDE 1.x
-- kdelibs-devel requires kdelibs
-
-* Thu Sep 23 1999 Preston Brown <pbrown at redhat.com>
-- move kde_htmldir to /usr/doc/kde
-- mark doc files as such
-
-* Tue Sep 21 1999 Preston Brown <pbrown at redhat.com>
-- fix up perl include path for kdoc
-
-* Thu Sep 16 1999 Preston Brown <pbrown at redhat.com>
-- remove linking to qimgio from kdecore, moved to kpanel/kfm directly
-- renamed "lowcolor" directory to "locolor"
-
-* Mon Sep 13 1999 Preston Brown <pbrown at redhat.com>
-- added lowcolor icons directory and /usr/share/pixmaps to icon search path
-- hacking to recognize .desktop files as application/x-kdelnk
-
-* Thu Sep 09 1999 Preston Brown <pbrown at redhat.com>
-- added kdoc index files.
-
-* Wed Sep 08 1999 Preston Brown <pbrown at redhat.com>
-- updated to KDE 1.1.2.
-- use /usr/lib/qt-1.44 as qt root.
-- separate devel subpackages; include documentation and kdoc.
-- added KDE icon.
-- relocated includes to /usr/include/kde
-
-* Fri Jun 11 1999 Preston Brown <pbrown at redhat.com>
-- snapshot, includes kde 1.1.1 + fixes
-
-* Mon Apr 19 1999 Preston Brown <pbrown at redhat.com>
-- last snapshot before release
-
-* Mon Apr 12 1999 Preston Brown <pbrown at redhat.com>
-- latest stable snapshot
-
-* Wed Feb 24 1999 Preston Brown <pbrown at redhat.com>
-- Injected new description and group.
-
-* Mon Feb 08 1999 Preston Brown <pbrown at redhat.com>
-- upgraded to KDE 1.1 final.
-
-* Fri Jan 15 1999 Preston Brown <pbrown at redhat.com>
-- updated macros for RPM 3.0, removed redhat-release dependency
-
-* Tue Jan 05 1999 Preston Brown <pbrown at redhat.com>
-- re-integrated changes from Duncan Haldane




More information about the fedora-extras-commits mailing list