rpms/kdevplatform/devel .cvsignore, 1.5, 1.6 kdevplatform.spec, 1.8, 1.9 sources, 1.5, 1.6

[Rex Dieter]

Author: rdieter

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Jan 2010 01:20:52 -0000	1.5
+++ .cvsignore	22 Feb 2010 15:14:34 -0000	1.6
@@ -1 +1 @@
-kdevplatform-0.9.97.tar.bz2
+kdevplatform-0.9.98.tar.bz2


Index: kdevplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/kdevplatform.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kdevplatform.spec	16 Jan 2010 21:10:21 -0000	1.8
+++ kdevplatform.spec	22 Feb 2010 15:14:34 -0000	1.9
@@ -1,8 +1,8 @@
 
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
-Version:        0.9.97
-Release:        2%{?dist}
+Version:        0.9.98
+Release:        1%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
@@ -18,48 +18,48 @@ URL:            http://www.kde.org/
 #Source0:DISABLECMD rm -rf kdevplatform-%{version}
 #Source0:        kdevplatform-%{version}%{?alphatag}.tar.bz2
 ### ORIGINAL
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/kdevelop/3.9.97/src/kdevplatform-%{version}.tar.bz2
-Patch0:         kdevplatform-0.9.95-find-kompare.patch
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/kdevelop/3.9.98/src/kdevplatform-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+# allow use of older libkompare (probably don't need this anymore)
+Patch0: kdevplatform-0.9.95-find-kompare.patch
 
-BuildRequires:  kdelibs4-devel >= 4.2.0
-BuildRequires:  pcre-devel
-BuildRequires:  giflib-devel
 BuildRequires:  boost-devel
+BuildRequires:  kdelibs4-devel
+# ?? kompare support seems disabled
+BuildRequires:  kdesdk-devel >= 4.4
+BuildRequires:  pcre-devel
 BuildRequires:  subversion-devel
-BuildRequires:  kdesdk-devel >= 4.2.85
 
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 %description
 KDE Development platform, the foundations upon which
 KDevelop and Quanta are built.
 
-
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-
+Requires: %{name} = %{version}-%{release}
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
 %description libs
 %{summary}.
 
-
 %package devel
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: boost-devel
-Requires: subversion-devel
 Requires: commoncpp2-devel
+Requires: kdelibs4-devel
+Requires: subversion-devel
 %description devel
 %{summary}.
 
 
 %prep
 %setup -q -n kdevplatform-%{version}%{?alphatag}
-%patch0 -p1 -b .kompare
 
 
 %build
@@ -77,10 +77,6 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
-# omit conflict here for now.
-rm -f %{buildroot}%{_kde4_appsdir}/cmake/modules/FindKDevPlatform.cmake
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -105,26 +101,27 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files
 %defattr(-,root,root,-)
 %doc COPYING.PLUGINS COPYING.SRC
-#{_kde4_bindir}/kdevteamwork_server
-%{_kde4_datadir}/kde4/apps/*
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_appsdir}/kdev*/
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/servicetypes/*.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/FindKDevPlatform.cmake
 %{_kde4_libdir}/lib*.so
 %{_kde4_includedir}/kdevplatform/
-%{_kde4_libdir}/cmake/kdevplatform/*.cmake
+%{_kde4_libdir}/cmake/kdevplatform/
 
 
 %changelog
+* Mon Feb 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.9.98-1
+- kdevplatform-0.9.98
+
 * Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.9.97-2 
 - rebuild (boost)
 - BR: kdelibs4-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Jan 2010 01:20:52 -0000	1.5
+++ sources	22 Feb 2010 15:14:35 -0000	1.6
@@ -1 +1 @@
-bfe385bc471d4d9abf4e989ca203db86  kdevplatform-0.9.97.tar.bz2
+dcdc427d8be4d8fa721f7354ac4406ed  kdevplatform-0.9.98.tar.bz2