rpms/kdelibs/F-7 .cvsignore, 1.40, 1.41 kde.csh, 1.4, 1.5 kde.sh, 1.6, 1.7 kdelibs-3.5.6-utempter.patch, 1.2, 1.3 kdelibs.spec, 1.221, 1.222 sources, 1.51, 1.52 kdelibs-3.1-ssl-krb5.patch, 1.1, NONE kdelibs-3.5.7-ICEauthority.patch, 1.1, NONE kdelibs-3.5.7-cups13.patch, 1.1, NONE kdelibs-3.5.7-kde#115219.patch, 1.1, NONE kdelibs-3.5.7-kde#146105.patch, 1.1, NONE kdelibs-3.5.7-rh#244065.patch, 1.1, NONE post-3.5.7-kdelibs-kdecore.diff, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Oct 24 16:26:41 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16335
Modified Files:
.cvsignore kde.csh kde.sh kdelibs-3.5.6-utempter.patch
kdelibs.spec sources
Removed Files:
kdelibs-3.1-ssl-krb5.patch kdelibs-3.5.7-ICEauthority.patch
kdelibs-3.5.7-cups13.patch kdelibs-3.5.7-kde#115219.patch
kdelibs-3.5.7-kde#146105.patch kdelibs-3.5.7-rh#244065.patch
post-3.5.7-kdelibs-kdecore.diff
Log Message:
sync w/devel
kde-3.5.8
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 17 Aug 2007 13:02:03 -0000 1.40
+++ .cvsignore 24 Oct 2007 16:26:03 -0000 1.41
@@ -1,3 +1,4 @@
clog
kdelibs-3.5.6.tar.bz2
kdelibs-3.5.7.tar.bz2
+kdelibs-3.5.8.tar.bz2
Index: kde.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kde.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde.csh 15 May 2007 18:58:25 -0000 1.4
+++ kde.csh 24 Oct 2007 16:26:03 -0000 1.5
@@ -1,17 +1,17 @@
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here
-# When/if using prelinking, avoids (some) use of kdeinit
+## Make sure KDEDIRS is set
+if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
+
+## When/if using prelinking, avoids (some) use of kdeinit
if ( -f /etc/sysconfig/prelink ) then
set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
if ( "$PRELINKING" == "yes" ) then
- if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+ if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
endif
endif
-# if not using IP6, speeds DNS operations
+## if not using IPv6, speeds DNS operations
# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
-# Make sure KDEDIRS is set
-if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
-
Index: kde.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kde.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kde.sh 15 May 2007 19:06:16 -0000 1.6
+++ kde.sh 24 Oct 2007 16:26:03 -0000 1.7
@@ -1,15 +1,12 @@
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here
+## Make sure KDEDIRS is set
+[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
+
## 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
fi
-
-## 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-utempter.patch:
Index: kdelibs-3.5.6-utempter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kdelibs-3.5.6-utempter.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-3.5.6-utempter.patch 5 Feb 2007 22:30:07 -0000 1.2
+++ kdelibs-3.5.6-utempter.patch 24 Oct 2007 16:26:03 -0000 1.3
@@ -1,15 +1,3 @@
-diff -Nur kdelibs-3.5.6.orig/configure.in kdelibs-3.5.6/configure.in
---- kdelibs-3.5.6.orig/configure.in 2007-01-24 09:52:48.000000000 +0100
-+++ kdelibs-3.5.6/configure.in 2007-02-05 23:01:44.000000000 +0100
-@@ -399,7 +399,7 @@
- [], with_utempter=check)
- if test "x$with_utempter" != xno; then
- kde_have_utempter=yes
-- AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
-+ AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
- AC_SUBST(LIBUTEMPTER)
- if test "$kde_have_utempter" = "yes"; then
- AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
diff -Nur kdelibs-3.5.6.orig/configure.in.in kdelibs-3.5.6/configure.in.in
--- kdelibs-3.5.6.orig/configure.in.in 2006-05-22 20:14:23.000000000 +0200
+++ kdelibs-3.5.6/configure.in.in 2007-02-05 23:01:44.000000000 +0100
@@ -96,18 +84,3 @@
libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
-diff -Nur kdelibs-3.5.6.orig/kdecore/Makefile.in kdelibs-3.5.6/kdecore/Makefile.in
---- kdelibs-3.5.6.orig/kdecore/Makefile.in 2007-01-24 09:54:07.000000000 +0100
-+++ kdelibs-3.5.6/kdecore/Makefile.in 2007-02-05 23:04:12.000000000 +0100
-@@ -787,9 +787,9 @@
- kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
- kqiodevicegzip_p.cpp ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.cpp
-
--#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
-+#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
- #>+ 1
--libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
-+libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
- libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
- libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
- libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- kdelibs.spec 25 Sep 2007 12:54:55 -0000 1.221
+++ kdelibs.spec 24 Oct 2007 16:26:03 -0000 1.222
@@ -6,7 +6,7 @@
%define arts 1
%define arts_epoch 8
-%define arts_version 1.5.7
+%define arts_version 1.5.8
%define qt_epoch 1
%define qt_version 3.3.8
@@ -20,8 +20,8 @@
%define apidocs 1
Summary: K Desktop Environment - Libraries
-Version: 3.5.7
-Release: 22.1%{?dist}
+Version: 3.5.8
+Release: 5%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs3
@@ -59,8 +59,8 @@
Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
Patch41: kdelibs-3.5.6-utempter.patch
Patch43: kdelibs-3.5.6-lang.patch
-Patch44: kdelibs-3.5.7-cups13.patch
Patch45: kdelibs-3.5.7-autostart.patch
+Patch46: kdelibs-3.5.8-kate-vhdl.patch
# use /etc/kde in addition to /usr/share/config, borrowed from debian
Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -72,14 +72,8 @@
Patch103: kdelibs-3.5.0-101956.patch
## upstream patches
-Patch500: kdelibs-3.5.7-kde#146105.patch
-# http://bugzilla.redhat.com/244065
-# http://websvn.kde.org/branches/KDE/3.5/kdelibs/kinit/setproctitle.cpp?r1=438982&r2=698691
-Patch501: kdelibs-3.5.7-rh#244065.patch
-# http://www.kde.org/info/security/advisory-20070815-1.txt
-Patch502: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore.diff
-# vcard30 patch, http://bugs.kde.org/115219
-Patch503: kdelibs-3.5.7-kde#115219.patch
+Patch200: kdelibs-3.5.8-http-regression.patch
+
%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -177,9 +171,8 @@
Requires: openssl-devel
%{?arts:Requires: arts-devel}
%{?libkdnssd:Requires: libkdnssd-devel}
-%if 0%{?fedora} > 7
-## those below can/should be omitted from future builds -- Rex
-%else
+## those below can/should be omitted from future(f8?) builds -- Rex
+%if 0
Requires: bzip2-devel
Requires: libacl-devel
Requires: libart_lgpl-devel
@@ -229,18 +222,15 @@
%patch40 -p1 -b .kdeprint-utf8
%{?_with_libutempter:%patch41 -p1 -b .utempter}
%patch43 -p1 -b .lang
-%patch44 -p1 -b .cups13
%patch45 -p1 -b .xdg-autostart
+%patch46 -p1 -b .kate-vhdl
%patch100 -p1 -b .kstandarddirs
%patch101 -p1 -b .libtool-shlibext
%patch102 -p0 -b .kde#137675
# upstream patches
-%patch500 -p0 -b .kde#146105
-%patch501 -p4 -b .rh#244065
-%patch502 -p0 -b .advisory-20070815-1
-%patch503 -p1 -b .kde#115219
+%patch200 -p0 -b .http-regression
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
@@ -469,6 +459,7 @@
%{_bindir}/meinproc
%{_bindir}/preparetips
%{_bindir}/start_kdeinit
+%{_bindir}/start_kdeinit_wrapper
%attr(4755,root,root) %{_bindir}/kgrantpty
%{_libdir}/lib*.so.*
%{_libdir}/libkdeinit_*.so
@@ -523,7 +514,19 @@
%changelog
-* Tue Sep 25 2007 Than Ngo <than at redhat.com> - 6:3.5.7-22.1
+* Thu Oct 18 2007 Than Ngo <than at redhat.com> - 3.5.8-5
+- bz273681, add vhdl syntax for kate, thanks to Chitlesh GOORAH
+
+* Wed Oct 17 2007 Than Ngo <than at redhat.com> 3.5.8-4
+- apply upstream patch to fix http-regression
+
+* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3
+- respin (for openexr-1.6.0)
+
+* Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-2
+- kde-3.5.8
+
+* Tue Sep 25 2007 Than Ngo <than at redhat.com> - 6:3.5.7-23
- fix rh#243611, autostart from XDG_CONFIG_DIRS
* Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources 6 Jun 2007 13:26:23 -0000 1.51
+++ sources 24 Oct 2007 16:26:03 -0000 1.52
@@ -1 +1 @@
-50ed644f2ec91963570fe2b155652957 kdelibs-3.5.7.tar.bz2
+acaa37e79e840d10dca326277a20863c kdelibs-3.5.8.tar.bz2
--- kdelibs-3.1-ssl-krb5.patch DELETED ---
--- kdelibs-3.5.7-ICEauthority.patch DELETED ---
--- kdelibs-3.5.7-cups13.patch DELETED ---
--- kdelibs-3.5.7-kde#115219.patch DELETED ---
--- kdelibs-3.5.7-kde#146105.patch DELETED ---
--- kdelibs-3.5.7-rh#244065.patch DELETED ---
--- post-3.5.7-kdelibs-kdecore.diff DELETED ---
More information about the fedora-extras-commits
mailing list