diff --git a/.cvsignore b/.cvsignore index 41d3c90..75966c3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdevelop-3.9.97.tar.bz2 +kdevelop-3.9.98.tar.bz2 diff --git a/kdevelop.spec b/kdevelop.spec index f51dd2e..8c52a0d 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,27 +1,27 @@ + +%define kdevplatform_ver 0.9.98 + Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 3.9.97 -Release: 3%{?dist} +Version: 3.9.98 +Release: 1%{?dist} License: GPLv2 -URL: http://www.kdevelop.org/ -Group: Development/Tools +URL: http://www.kdevelop.org/ +Group: Development/Tools +Source0: ftp://ftp.kde.org/pub/kde/unstable/kdevelop/%{version}/src/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.kde.org/pub/kde/unstable/kdevelop/%{version}/src/%{name}-%{version}.tar.bz2 - -Requires: kdevplatform -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} - -BuildRequires: kdevplatform-devel >= 0.9.97 -BuildRequires: kdelibs4-devel >= 4.2.0 -BuildRequires: pcre-devel -BuildRequires: giflib-devel -BuildRequires: boost-devel >= 1.35.0 -BuildRequires: valgrind-devel +BuildRequires: desktop-file-utils BuildRequires: kdebase-workspace-devel +BuildRequires: kdevplatform-devel >= %{kdevplatform_ver} +BuildRequires: kdelibs4-devel +BuildRequires: valgrind-devel + +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: kdevplatform >= %{kdevplatform_ver} %description The KDevelop Integrated Development Environment provides many features @@ -51,21 +51,17 @@ individual needs. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} - +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description devel %{summary}. - %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}} # helps multilib upgrades -Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release} -# include to be paranoid, installing libs-only is still mostly untested -- Rex -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - +Obsoletes: kdevelop < 9:3.9.95 +Requires: %{name} = %{epoch}:%{version}-%{release} +%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}} %description libs %{summary}. @@ -87,7 +83,11 @@ make %{?_smp_mflags} -C %{_target_platform} rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -rm -f %{buildroot}/%{_kde4_datadir}/kde4/apps/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2 +rm -vf %{buildroot}%{_kde4_datadir}/kde4/apps/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2 + + +%check +desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kdevelop.deskto %clean @@ -115,23 +115,28 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog TODO NEWS %{_kde4_bindir}/kdevelop +%{_kde4_bindir}/kdevelop.bin %{_kde4_configdir}/kdeveloprc -%{_kde4_appsdir}/* -%{_kde4_datadir}/kde4/services/* +%{_kde4_appsdir}/kdev*/ +%{_kde4_datadir}/kde4/services/*.desktop %{_kde4_datadir}/applications/kde4/kdevelop.desktop %{_kde4_iconsdir}/hicolor/*/*/* %files libs %defattr(-,root,root,-) %{_kde4_libdir}/lib*.so -%{_kde4_libdir}/kde4/* +%{_kde4_libdir}/kde4/*.so %files devel %defattr(-,root,root,-) +%{_kde4_appsdir}/cmake/modules/FindKDevelop.cmake %{_kde4_includedir}/kdevelop/ %changelog +* Mon Feb 22 2010 Rex Dieter 9:3.9.98-1 +- kdevelop-3.9.98 + * Thu Jan 28 2010 Rex Dieter 9:3.9.97-3 - -libs: fix Requires: kdelibs4 ... diff --git a/sources b/sources index bd72ada..50d2c63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -260b4eae5962c1e57941ebbb64b42bb8 kdevelop-3.9.97.tar.bz2 +335fa118aa57c25a1793d2c45526a89f kdevelop-3.9.98.tar.bz2