rpms/kdelibs/devel .cvsignore, 1.40, 1.41 kdelibs-3.5.6-utempter.patch, 1.2, 1.3 kdelibs.spec, 1.234, 1.235 sources, 1.51, 1.52 kdelibs-3.5.7-cups13.patch, 1.3, 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
Fri Oct 12 19:38:25 UTC 2007


Author: rdieter

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

Modified Files:
	.cvsignore kdelibs-3.5.6-utempter.patch kdelibs.spec sources 
Removed Files:
	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:
* Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-1
- kde-3.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	19 Jul 2007 11:54:32 -0000	1.40
+++ .cvsignore	12 Oct 2007 19:37:53 -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

kdelibs-3.5.6-utempter.patch:

Index: kdelibs-3.5.6-utempter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/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	12 Oct 2007 19:37:53 -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/devel/kdelibs.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- kdelibs.spec	25 Sep 2007 12:39:34 -0000	1.234
+++ kdelibs.spec	12 Oct 2007 19:37:53 -0000	1.235
@@ -20,8 +20,8 @@
 %define apidocs 1
 
 Summary: K Desktop Environment - Libraries
-Version: 3.5.7
-Release: 23%{?dist}
+Version: 3.5.8
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -59,7 +59,6 @@
 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
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
@@ -72,14 +71,6 @@
 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
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -229,7 +220,6 @@
 %patch40 -p1 -b .kdeprint-utf8
 %{?_with_libutempter:%patch41 -p1 -b .utempter}
 %patch43 -p1 -b .lang
-%patch44 -p1 -b .cups13
 %patch45 -p1 -b .xdg-autostart
 
 %patch100 -p1 -b .kstandarddirs
@@ -237,10 +227,6 @@
 %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
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -523,6 +509,9 @@
 
 
 %changelog
+* Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-1
+- 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	15 Jun 2007 18:09:56 -0000	1.51
+++ sources	12 Oct 2007 19:37:53 -0000	1.52
@@ -1 +1 @@
-50ed644f2ec91963570fe2b155652957  kdelibs-3.5.7.tar.bz2
+acaa37e79e840d10dca326277a20863c  kdelibs-3.5.8.tar.bz2


--- 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