rpms/kdesdk/FC-4 kdesdk-3.4.92-misc.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 kdesdk.spec, 1.38, 1.39 sources, 1.25, 1.26 admin-visibility.patch, 1.3, NONE kdesdk-3.4.0-cast.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Feb 1 22:09:57 UTC 2006


Author: than

Update of /cvs/dist/rpms/kdesdk/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv15875

Modified Files:
	.cvsignore kdesdk.spec sources 
Added Files:
	kdesdk-3.4.92-misc.patch 
Removed Files:
	admin-visibility.patch kdesdk-3.4.0-cast.patch 
Log Message:
3.5.1


kdesdk-3.4.92-misc.patch:
 ktrace.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdesdk-3.4.92-misc.patch ---
--- kdesdk-3.4.92/kmtrace/ktrace.c.orig	2005-11-11 09:33:56.000000000 +0100
+++ kdesdk-3.4.92/kmtrace/ktrace.c	2005-11-11 10:47:38.000000000 +0100
@@ -344,7 +344,7 @@
 		tr_cache[i].bt = (void**) malloc(TR_BT_SIZE * sizeof(void*));
 		tr_cache[i].bt_size = backtrace(
 			tr_cache[i].bt, TR_BT_SIZE);
-		realloc(tr_cache[i].bt, tr_cache[i].bt_size * sizeof(void*));
+		tr_cache[i].bt= (void**) realloc(tr_cache[i].bt, tr_cache[i].bt_size * sizeof(void*));
 		tr_cache_level++;
 
 		return;
@@ -469,6 +469,9 @@
 	__malloc_hook = tr_mallochook;
 	__realloc_hook = tr_reallochook;
 
+	if (hdr == NULL)
+    return NULL;
+
 #ifdef PROFILE
 	/* If ptr is 0 there was no previos malloc of this location */
 	if (ptr == NULL)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	16 Jun 2005 13:31:58 -0000	1.25
+++ .cvsignore	1 Feb 2006 22:09:53 -0000	1.26
@@ -4,3 +4,4 @@
 kdesdk-3.4.0-rc1.tar.bz2
 kdesdk-3.4.0.tar.bz2
 kdesdk-3.4.1.tar.bz2
+kdesdk-3.5.1.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/kdesdk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdesdk.spec	16 Jun 2005 13:31:58 -0000	1.38
+++ kdesdk.spec	1 Feb 2006 22:09:53 -0000	1.39
@@ -8,20 +8,21 @@
 
 %define appdir %{_datadir}/applications/kde
 
+%define disable_gcc_check_and_hidden_visibility 1
+
 Name: kdesdk
-Version: 3.4.1
-Release: 0.fc4.1
+Version: 3.5.1
+Release: 0.1.fc4
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdesdk-3.4.0-db4.patch
-Patch3: admin-visibility.patch
+Patch3: kdesdk-3.4.92-misc.patch
 
 Prereq: /sbin/ldconfig
 
@@ -40,7 +41,7 @@
 Summary: Development files for kdesdk
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs-devel => %{version}
+Requires: kdelibs-devel => 6:%{version}
 Requires: xorg-x11-devel
 
 %description devel
@@ -85,7 +86,12 @@
 Group: Applications/Multimedia
 
 %description gimp
-The standard KDE palette in GIMP format. This allows you to create/edit
+The standard K
+
+
+
+
+DE palette in GIMP format. This allows you to create/edit
 low-color KDE icons using the GIMP.
 
 %package kapptemplate
@@ -131,7 +137,7 @@
 %setup -q
 %patch1 -p1 -b .libtool
 %patch2 -p1 -b .db4
-%patch3 -p1 -b .gcc
+%patch3 -p1 -b .misc
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
@@ -146,7 +152,16 @@
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -206,6 +221,7 @@
 %{_libdir}/kde3/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
+%{_libdir}/*.a
 %{_datadir}/apps/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
@@ -223,6 +239,15 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 2:3.5.1-0.1.fc4
+- 3.5.1
+
+* Thu Dec 08 2005 Than Ngo <than at redhat.com> 2:3.5.0-0.1.fc4
+- 3.5
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 3.4.2-0.fc4.1
+- update to 3.4.2
+
 * Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	16 Jun 2005 13:31:58 -0000	1.25
+++ sources	1 Feb 2006 22:09:53 -0000	1.26
@@ -1 +1 @@
-b7073f0f4ac7efe4d6ff33c1ba527668  kdesdk-3.4.1.tar.bz2
+93199b8bf5793681fdb2e5cbcfcfbd93  kdesdk-3.5.1.tar.bz2


--- admin-visibility.patch DELETED ---


--- kdesdk-3.4.0-cast.patch DELETED ---




More information about the fedora-cvs-commits mailing list