From 5ee5683b8f08b7fcbdb3a23eaeccab0fb3fa0f82 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Jul 14 2006 11:16:07 +0000
Subject: cleanup specfile


---

diff --git a/kdevelop.spec b/kdevelop.spec
index fbdc477..731c595 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -8,16 +8,14 @@
 
 %define make_cvs 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
 Version: 3.3.3
-Release: 1.1
+Release: 2
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -27,19 +25,24 @@ Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
 Requires: make
-Requires: perl >= 0:5.004
+Requires: perl
 Requires: libtool
+Requires: automake
+Requires: autoconf
 Requires: flex >= 2.5.4
 Requires: qt-designer >= %{qt_epoch}:%{qt_version}
 
-BuildPrereq: autoconf
-BuildPrereq: automake
-BuildPrereq: libtool
-BuildPrereq: kdelibs-devel >= %{kde_version}
-Buildprereq: db4-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: kdelibs-devel >= %{kde_version}
+BuildRequires: db4-devel
+BuildRequires: flex
+
 Obsoletes: kdevelop-c_c++_ref
 
 %description
@@ -74,22 +77,15 @@ individual needs.
 %patch3 -p1 -b .doc
 
 %build
-export KDEDIR=%{_prefix}
 QTDIR="" && source /etc/profile.d/qt.sh
 
-# Workaround for legacy auto* tools
 %if %{make_cvs}
-  [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
-  [ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5? autoheader
-  [ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal
-  [ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake
-  export PATH=`pwd`:$PATH
-  make -f admin/Makefile.common cvs
+  rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
+  cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/
   make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
+  make -f admin/Makefile.common cvs
 %endif
 
-export FLAGS="%{optflags}"
-
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
 %configure \
@@ -99,13 +95,9 @@ pushd c_cpp_reference-2.0.2_for_KDE_3.0
 popd
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
    --disable-rpath \
 %if %{debug} == 0
    --disable-debug \
@@ -119,8 +111,8 @@ popd
   --with-qt-libraries=$QTDIR/lib \
   --with-extra-libs=%{_libdir}
 
-make %{?_smp_mflags} -C lib/util
 make %{?_smp_mflags}
+make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
 %install
 rm -rf %{buildroot}
@@ -131,9 +123,19 @@ make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=%{buildroot} install
 # remove useless files
 rm -rf %{buildroot}%{_prefix}/kdevbdb
 
-%post -p /sbin/ldconfig
+%post
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
 rm -rf %{buildroot}
@@ -157,6 +159,9 @@ rm -rf %{buildroot}
 %{_datadir}/servicetypes/*
 
 %changelog
+* Fri Jul 14 2006 Than Ngo <than@redhat.com> 9:3.3.3-2
+- cleanup specfile
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 9:3.3.3-1.1
 - rebuild