rpms/kdelibs/devel kdelibs-3.91.0-fix-katehighlight.patch, NONE, 1.1.2.1 .cvsignore, 1.40.2.1, 1.40.2.2 branch, 1.1.2.1, 1.1.2.2 kdelibs.spec, 1.223.2.1, 1.223.2.2

Tue Jul 24 23:31:48 UTC 2007

Author: rdieter

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

Modified Files:
      Tag: kdelibs-kde4-branch
	.cvsignore branch kdelibs.spec 
Added Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.91.0-fix-katehighlight.patch 
Log Message:
sync w/kde-redhat pkg updates


kdelibs-3.91.0-fix-katehighlight.patch:

--- NEW FILE kdelibs-3.91.0-fix-katehighlight.patch ---
--- trunk/KDE/kdelibs/kate/syntax/katehighlight.cpp	2007/07/06 00:10:29	684046
+++ trunk/KDE/kdelibs/kate/syntax/katehighlight.cpp	2007/07/06 00:20:13	684047
@@ -1786,12 +1786,12 @@
     for (uint z = 0; z < nAttribs; z++)
     {
       KateExtendedAttribute::Ptr itemData = itemDataList.at(z);
-      KTextEditor::Attribute::Ptr n = defaultStyleList.at(itemData->defaultStyleIndex());
+      KTextEditor::Attribute::Ptr newAttribute( new KTextEditor::Attribute(*defaultStyleList.at(itemData->defaultStyleIndex())) );
 
       if (itemData && itemData->hasAnyProperty())
-        *n += *itemData;
+        *newAttribute += *itemData;
 
-      array.append(n);
+      array.append(newAttribute);
     }
   }
 }
@@ -1812,16 +1812,15 @@
   getKateExtendedAttributeList(schema, itemDataList);
 
   uint nAttribs = itemDataList.count();
-
   for (uint z = 0; z < nAttribs; z++)
   {
     KateExtendedAttribute::Ptr itemData = itemDataList.at(z);
-    KTextEditor::Attribute::Ptr n = defaultStyleList.at(itemData->defaultStyleIndex());
+    KTextEditor::Attribute::Ptr newAttribute( new KTextEditor::Attribute(*defaultStyleList.at(itemData->defaultStyleIndex())) );
 
     if (itemData && itemData->hasAnyProperty())
-      *n += *itemData;
+      *newAttribute += *itemData;
 
-    array.append(n);
+    array.append(newAttribute);
   }
 
   m_attributeArrays.insert(schema, array);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -r1.40.2.1 -r1.40.2.2
--- .cvsignore	24 Jul 2007 13:03:58 -0000	1.40.2.1
+++ .cvsignore	24 Jul 2007 23:31:16 -0000	1.40.2.2
@@ -1,4 +1,2 @@
 clog
-kdelibs-3.5.6.tar.bz2
-kdelibs-3.5.7.tar.bz2
 kdelibs-3.91.0.tar.bz2


Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/branch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- branch	24 Jul 2007 13:03:58 -0000	1.1.2.1
+++ branch	24 Jul 2007 23:31:16 -0000	1.1.2.2
@@ -1 +1 @@
-kde4
+devel


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.1
retrieving revision 1.223.2.2
diff -u -r1.223.2.1 -r1.223.2.2
--- kdelibs.spec	24 Jul 2007 13:03:58 -0000	1.223.2.1
+++ kdelibs.spec	24 Jul 2007 23:31:16 -0000	1.223.2.2
@@ -1,57 +1,61 @@
-%global _qt4_plugindir %(pkg-config --variable=plugindir Qt 2> /dev/null || echo %{_qt4_plugindir} )
 
-Name: kdelibs
+%if 0%{?fedora} > 7
+Name:          kdelibs
+Epoch:         6
+
+Obsoletes:     kdelibs4 < %{version}-%{release}
+Provides:      kdelibs4 = %{version}-%{release}
 
-%if "%{name}" != "kdelibs4"
-Obsoletes: kdelibs4 < %{version}-%{release}
-Provides: kdelibs4 = %{version}-%{release}
 %else
-%define _prefix /opt/kde4
+Name:          kdelibs4
+%define        _prefix /opt/kde4
 %endif
 
-Epoch: 6
-
-Version: 3.91.0
-Release: 4%{?dist}%{?kde}
-Summary: K Desktop Environment 4 - Libraries
-
-License: LGPL
-URL: http://www.kde.org/
-Group: System Environment/Libraries
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Version:       3.91.0
+Release:       6%{?dist}%{?kde}
+Summary:       K Desktop Environment 4 - Libraries
+
+License:       LGPL
+URL:           http://www.kde.org/
+Group:         System Environment/Libraries
+Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{_prefix}" != "/usr"
-  # macros sensitive to _prefix mods
-  %define _sysconfdir %{_prefix}/etc
+# macros sensitive to _prefix mods
+%define __cmake cmake
+%global _qt4_plugindir %(qmake-qt4 -query QT_INSTALL_PLUGINS 2> /dev/null || echo %{_qt4_plugindir} )
+%define _sysconfdir %{_prefix}/etc
+%else
+Requires: hicolor-icon-theme
+Requires: kde-filesystem
+#Requires: kde4-settings
 %endif
 
 # use ~/.kde4 instead of ~/.kde
-Patch0: kdelibs-%{version}-kde4home.diff
-
-# FIXME/TODO
-Source1: kde.sh
-Source2: kde.csh
-
-BuildRequires: qt-devel >= 4.3.0
-Requires: qt >= 4.3.0
-Requires: hicolor-icon-theme
+Patch0:        kdelibs-%{version}-kde4home.diff
+# upstream patch by Mirko Stocker to fix KatePart syntax highlighting (rev 684047)
+# http://bugs.kde.org/145571
+Patch1:        kdelibs-3.91.0-fix-katehighlight.patch
+
+Source1:       kde4.sh
+Source2:       kde4.csh
+
+BuildRequires: qt4-devel >= 4.3.0
+%global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
+Requires: qt4 >= %{qt4_ver} 
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
-## When/if these get created 
-#Requires: kde4-settings
-#Requires: kde4-filesystem
 
-BuildRequires: cmake >= 2.4.5
+BuildRequires: cmake
 BuildRequires: shared-mime-info
 BuildRequires: libxslt-devel aspell-devel giflib-devel
 BuildRequires: libpng-devel bzip2-devel openssl-devel libacl-devel gettext-devel
 BuildRequires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
 BuildRequires: zlib-devel krb5-devel libattr-devel gamin-devel strigi-devel
 BuildRequires: alsa-lib-devel avahi-devel
-# FIXME/TODO
-#BuildRequires: soprano-devel
+BuildRequires: soprano-devel
 
 %description
 Libraries for the K Desktop Environment 4.
@@ -59,21 +63,20 @@
 Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
 %package devel
-Group: Development/Libraries
-Summary: Header files for compiling KDE 4 applications
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Group:    Development/Libraries
+Summary:  Header files for compiling KDE 4 applications
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
-Provides: kdelibs4-devel = %{version}-%{release}
+Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
-Requires: qt-devel
+Requires: qt4-devel
 # FIXME/TODO: trim these down  -- Rex
 Requires: libxslt-devel aspell-devel giflib-devel
 Requires: libpng-devel bzip2-devel openssl-devel libacl-devel gettext-devel
 Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
 Requires: zlib-devel krb5-devel libattr-devel gamin-devel strigi-devel
 Requires: alsa-lib-devel avahi-devel
-
 %description devel
 This package includes the header files you will need to compile
 applications for KDE 4.
@@ -87,10 +90,10 @@
 %if "%{_prefix}" != "/usr"
 %patch0 -p1 -b .kde4home
 %endif
+%patch1 -p3 -b .kde#145571
 
 
 %build
-unset QMAKESPEC && source /etc/profile.d/qt.sh
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
@@ -110,17 +113,12 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if "%{_prefix}" != "/usr"
-  mkdir -p %{buildroot}/usr/bin
-  cd %{buildroot}/usr/bin
-  ln -s ../..%{_prefix}/bin/kde4-config .
-%endif
-
 # A symlink doesn't seem to work for this purpose.
 install -D -p \
   %{buildroot}%{_libdir}/kde4/plugins/designer/kdewidgets.so \
   %{buildroot}%{_qt4_plugindir}/designer/kdewidgets.so
 
+%if "%{_prefix}" == "/usr"
 # see also use-of/patching of XDG_MENU_PREFIX in kdebase
 mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_sysconfdir}/xdg/menus/kde4-applications.menu
@@ -128,6 +126,14 @@
 # Unpackaged files
 rm -rf %{buildroot}%{_datadir}/icons/hicolor
 
+%else
+
+mkdir -p %{buildroot}/usr/bin
+cd %{buildroot}/usr/bin
+ln -s ../..%{_prefix}/bin/kde4-config .
+
+%endif
+
 
 %post
 /sbin/ldconfig ||:
@@ -163,6 +169,7 @@
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/xdg
 %dir %{_sysconfdir}/xdg/menus
+%{_datadir}/icons/hicolor/
 %endif
 %{_qt4_plugindir}/designer/kdewidgets.so
 %{_bindir}/*
@@ -192,8 +199,15 @@
 
 
 %changelog
-* Sat Jul 07 2007 Than Ngo <than at redhat.com> 3.91.0-4
-- rename to kdelibs
+* Thu Jul 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-6
+- add missing epoch to main package Requires for -devel if name is kdelibs
+
+* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
+- BR: soprano-devel
+- prefix=/usr cleanups
+
+* Wed Jul 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-4
+- apply upstream bugfix for KatePart syntax highlighting (kde #145571)
 
 * Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
 - fix %%_sysconfdir for %%_prefix != /usr case.


