diff --git a/.cvsignore b/.cvsignore index 54183b8..6c2588d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,15 +1,3 @@ c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -kdevelop-3.1.0.tar.bz2 -kdevelop-3.1.1.tar.bz2 -kdevelop-3.1.2.tar.bz2 -kdevelop-3.2.0-rc1.tar.bz2 -kdevelop-3.2.0.tar.bz2 -kdevelop-3.2.1.tar.bz2 -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 -kdevelop-3.3.2.tar.bz2 -kdevelop-3.3.3.tar.bz2 kdevelop-3.3.4.tar.bz2 +kdevelop-3.4.1.tar.bz2 diff --git a/kdevelop.spec b/kdevelop.spec index 1159d71..2986119 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,22 +1,23 @@ %define debug 0 %define final 0 -%define kde_version 3.5.6 -%define qt_version 3.3.7 +%define kde_version 3.5.7 +%define qt_version 3.3.8 %define qt_epoch 1 %define kdelibs_epoch 6 %define make_cvs 1 -Name: kdevelop +Name: kdevelop Summary: Integrated Development Environment for C++/C -Version: 3.3.6 +Epoch: 9 +Version: 3.4.1 Release: 1%{?dist} -Epoch: 9 + +License: GPL URL: http://www.kdevelop.org/ Group: Development/Tools 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 Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 @@ -26,8 +27,6 @@ Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version} Requires: make Requires: perl @@ -35,14 +34,14 @@ Requires: libtool Requires: automake Requires: autoconf Requires: flex >= 2.5.4 -Requires: qt-designer >= %{qt_epoch}:%{qt_version} +Requires: qt-designer Requires: gettext Requires: ctags -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: kdelibs-devel >= %{kde_version} +%if %{make_cvs} +BuildRequires: automake libtool +%endif +BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version} BuildRequires: db4-devel BuildRequires: flex @@ -78,9 +77,6 @@ individual needs. %patch1 -p0 -b .config %patch2 -p1 -b .doc -%build -QTDIR="" && source /etc/profile.d/qt.sh - %if %{make_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/ @@ -88,6 +84,10 @@ QTDIR="" && source /etc/profile.d/qt.sh make -f admin/Makefile.common cvs %endif + +%build +QTDIR="" && source /etc/profile.d/qt.sh + # c references pushd c_cpp_reference-2.0.2_for_KDE_3.0 %configure \ @@ -99,7 +99,6 @@ popd %configure \ --enable-new-ldflags \ --disable-dependency-tracking \ - --disable-gcc-hidden-visibility \ --disable-rpath \ %if %{debug} == 0 --disable-debug \ @@ -110,12 +109,12 @@ popd %endif --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_version}/html/ \ --with-kdelibsdoc-dir=%{_docdir}/HTML/en/kdelibs-apidocs/ \ - --with-qt-libraries=$QTDIR/lib \ --with-extra-libs=%{_libdir} make %{?_smp_mflags} make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0 + %install rm -rf %{buildroot} @@ -125,6 +124,7 @@ make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=%{buildroot} install # remove useless files rm -rf %{buildroot}%{_prefix}/kdevbdb + %post for f in hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: @@ -139,9 +139,11 @@ for f in hicolor locolor ; do done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + %clean rm -rf %{buildroot} + %files %defattr(-,root,root) %doc %{_docdir}/HTML/en/* @@ -160,7 +162,14 @@ rm -rf %{buildroot} %{_datadir}/services/* %{_datadir}/servicetypes/* + %changelog +* Sun Jun 17 2007 Rex Dieter 9:3.4.1-1 +- cleanup + +* Thu Jun 14 2007 Than Ngo - 9:3.4.1-1.fc7 +- 3.4.1 + * Thu Feb 08 2007 Than Ngo 9:3.3.6-1.fc7 - 3.3.6 diff --git a/sources b/sources index df9c455..b565c66 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -0de7c7d82c176456f2adff48981f5d40 kdevelop-3.3.6.tar.bz2 +abc6cc2831ad4c0f4da9fba9e38edce1 kdevelop-3.4.1.tar.bz2