diff --git a/.cvsignore b/.cvsignore index 1e6e58b..262d7dd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -kdevelop-3.0.0r1.tar.bz2 +kdevelop-3.0.2.tar.bz2 diff --git a/kdevelop.spec b/kdevelop.spec index 4c77075..b0ea98e 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -4,16 +4,16 @@ %define final 0 %define rpm_clean 1 -%define kde_version 3.1.95 -%define qt_version 3.2.2 +%define kde_version 3.2.1 +%define qt_version 3.3.1 -%define libtool 0 +%define libtool 1 Name: kdevelop Summary: Integrated Development Environment for C++/C -Version: 3.0.0r1 -Release: 0.1 -Epoch: 8 +Version: 3.0.2 +Release: 1 +Epoch: 9 URL: http://www.kdevelop.org/ Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-buildroot @@ -27,6 +27,8 @@ 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: make Requires: perl >= 0:5.004 @@ -79,12 +81,13 @@ QTDIR="" && source /etc/profile.d/qt.sh # Workaround for legacy auto* tools %if %{libtool} -[ -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 Makefile.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 + 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" @@ -99,7 +102,7 @@ export FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE" --with-qt-libraries=$QTDIR/lib \ --with-extra-libs=%{_libdir} -make %{?smp_mflags} +make %{?_smp_mflags} # c references pushd c_cpp_reference-2.0.2_for_KDE_3.0 @@ -118,6 +121,12 @@ 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 +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + %clean rm -rf $RPM_BUILD_ROOT @@ -138,8 +147,20 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/servicetypes/* %changelog +* Tue Mar 09 2004 Than Ngo 9:3.0.2-1 +- rebuild + +* Fri Mar 05 2004 Than Ngo 9:3.0.2-0.1 +- 3.0.2 release + +* Sun Feb 08 2004 Than Ngo 9:3.0.0-0.2 +- rebuilt against qt-3.3.0 + +* Mon Feb 02 2004 Than Ngo 9:3.0.0-0.1 +- 3.0.0 release + * Thu Jan 22 2004 Than Ngo 8:3.0.0r1-0.1 -- 3.2 RC1 +- 3.0.0 RC1 * Wed Dec 10 2003 Than Ngo 8:3.0.0b2-0.3 - included BuildRequires: db4-devel diff --git a/sources b/sources index 7c5aa8d..9e543ff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -c3d8e6ce937499f2432cd264b962f113 kdevelop-3.0.0r1.tar.bz2 +1c7df5b7abfc1981922f8a681ab93bb0 kdevelop-3.0.2.tar.bz2