rpms/kdevelop/devel .cvsignore, 1.37, 1.38 kdevelop.spec, 1.96, 1.97 sources, 1.41, 1.42

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9706

Modified Files:
	.cvsignore kdevelop.spec sources 
Log Message:
* Mon Feb 22 2010 Rex Dieter <rdieter at fedoraproject.org> 9:3.9.98-1
- kdevelop-3.9.98



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	8 Jan 2010 01:21:30 -0000	1.37
+++ .cvsignore	22 Feb 2010 15:15:11 -0000	1.38
@@ -1 +1 @@
-kdevelop-3.9.97.tar.bz2
+kdevelop-3.9.98.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kdevelop.spec	28 Jan 2010 15:41:47 -0000	1.96
+++ kdevelop.spec	22 Feb 2010 15:15:11 -0000	1.97
@@ -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_platfo
 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/
 %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 <rdieter at fedoraproject.org> 9:3.9.98-1
+- kdevelop-3.9.98
+
 * Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> 9:3.9.97-3
 - -libs: fix Requires: kdelibs4 ...
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	8 Jan 2010 01:21:30 -0000	1.41
+++ sources	22 Feb 2010 15:15:11 -0000	1.42
@@ -1 +1 @@
-260b4eae5962c1e57941ebbb64b42bb8  kdevelop-3.9.97.tar.bz2
+335fa118aa57c25a1793d2c45526a89f  kdevelop-3.9.98.tar.bz2