rpms/kdeutils/devel .cvsignore, 1.31, 1.32 kdeutils.spec, 1.51, 1.52 sources, 1.31, 1.32 kdeutils-3.5.0-kcalc.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdeutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1252

Modified Files:
	.cvsignore kdeutils.spec sources 
Removed Files:
	kdeutils-3.5.0-kcalc.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	30 Nov 2005 14:47:12 -0000	1.31
+++ .cvsignore	5 Feb 2006 20:45:17 -0000	1.32
@@ -8,3 +8,4 @@
 kdeutils-3.4.91.tar.bz2
 kdeutils-3.4.92.tar.bz2
 kdeutils-3.5.0.tar.bz2
+kdeutils-3.5.1.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdeutils.spec	16 Jan 2006 18:58:06 -0000	1.51
+++ kdeutils.spec	5 Feb 2006 20:45:17 -0000	1.52
@@ -1,15 +1,17 @@
 %define debug 0
 %define final 0
 %define make_cvs 1
-
+%define arts 1
 %define redhatify 1
 
 %define qt_version 3.3.5
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 4
+Version: 3.5.1
+Release: 1
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -23,13 +25,9 @@
 Patch1: kdf-3.0.2-label.patch
 Patch2: kde-libtool.patch
 
-# upstream fixes
-Patch50: kdeutils-3.5.0-kcalc.patch
-
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-
-Prereq: /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post,postun): /sbin/ldconfig
 
 BuildRequires: kdebase-devel
 BuildRequires: automake
@@ -243,32 +241,36 @@
 %setup -q
 %patch1 -p1 -b .label
 %patch2 -p1 -b .libtool
-%patch50 -p1 -b .kcalc
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -fno-use-cxa-atexit -fno-check-new"
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG"
-
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
- # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
+export CXXFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
+%if %{arts} == 0
+   --without-arts \
+%endif
    --includedir=%{_includedir}/kde
 
 make %{?_smp_mflags}
@@ -324,6 +326,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
+- 3.5.1
+
 * Mon Jan 16 2006 Than Ngo <than at redhat.com> 6:3.5.0-4
 - apply patch to fix #176463
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	30 Nov 2005 14:47:12 -0000	1.31
+++ sources	5 Feb 2006 20:45:17 -0000	1.32
@@ -1 +1 @@
-d6b2cbe8b7d15166eff261f20ece2718  kdeutils-3.5.0.tar.bz2
+1286c6a09b04452adfe492de2fad79bd  kdeutils-3.5.1.tar.bz2


--- kdeutils-3.5.0-kcalc.patch DELETED ---