From 01b54f597d7274349b7d8232c8f4479606df622b Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Feb 05 2006 21:21:57 +0000
Subject: 3.3.1


---

diff --git a/.cvsignore b/.cvsignore
index aeaa413..5207917 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ kdevelop-3.2.2.tar.bz2
 kdevelop-3.2.91.tar.bz2
 kdevelop-3.2.92.tar.bz2
 kdevelop-3.3.0.tar.bz2
+kdevelop-3.3.1.tar.bz2
diff --git a/kdevelop.spec b/kdevelop.spec
index 900a0c0..167de39 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -1,8 +1,10 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.0
+%define kde_version 3.5.1
 %define qt_version 3.3.5
+%define qt_epoch 1
+%define kdelibs_epoch 6
 
 %define make_cvs 1
 
@@ -10,8 +12,8 @@
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.3.0
-Release: 1.1
+Version: 3.3.1
+Release: 1
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -25,14 +27,13 @@ Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 
-Prereq: /sbin/ldconfig
-
-Requires: kdelibs-devel >= 6:%{kde_version}
+Requires(post,postun): /sbin/ldconfig
+Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
 Requires: make
 Requires: perl >= 0:5.004
 Requires: libtool
 Requires: flex >= 2.5.4
-Requires: qt-designer >= 1:%{qt_version}
+Requires: qt-designer >= %{qt_epoch}:%{qt_version}
 
 BuildPrereq: autoconf
 BuildPrereq: automake
@@ -75,13 +76,6 @@ individual needs.
 export KDEDIR=%{_prefix}
 QTDIR="" && source /etc/profile.d/qt.sh
 
-%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
-
 # Workaround for legacy auto* tools
 %if %{make_cvs}
   [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
@@ -93,7 +87,7 @@ QTDIR="" && source /etc/profile.d/qt.sh
   make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
 %endif
 
-export FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE"
+export FLAGS="$RPM_OPT_FLAGS"
 
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
@@ -104,7 +98,16 @@ pushd c_cpp_reference-2.0.2_for_KDE_3.0
 popd
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
    --disable-rpath \
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
   --enable-final \
 %endif
@@ -122,9 +125,6 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=$RPM_BUILD_ROOT install
 
-# remove duplicat, konflict with kdelibs
-rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/text/x-pascal.desktop
-
 # remove useless files
 rm -rf $RPM_BUILD_ROOT%{_prefix}/kdevbdb
 
@@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/servicetypes/*
 
 %changelog
+* Sun Feb 05 2006 Than Ngo <than@redhat.com> 9:3.3.1-1 
+- 3.3.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 994a21b..5178437 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-1048c89c1aad0daf6581bb04e15206c4  kdevelop-3.3.0.tar.bz2
+e5e3d3ce60a0dcafb99721f6304f87ef  kdevelop-3.3.1.tar.bz2