rpms/kdevplatform/devel .cvsignore, 1.4, 1.5 kdevplatform.spec, 1.6, 1.7 sources, 1.4, 1.5

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdevplatform.spec sources 
Log Message:
* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> 0.9.97-1
- kdevplatform-0.9.97
- kdevplatform: file conflict with kdelibs (FindKDevPlatform.cmake) (#541690)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Oct 2009 04:46:54 -0000	1.4
+++ .cvsignore	8 Jan 2010 01:20:52 -0000	1.5
@@ -1 +1 @@
-kdevplatform-0.9.95.20091015svn1035382.tar.bz2
+kdevplatform-0.9.97.tar.bz2


Index: kdevplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/kdevplatform.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kdevplatform.spec	22 Nov 2009 14:08:29 -0000	1.6
+++ kdevplatform.spec	8 Jan 2010 01:20:52 -0000	1.7
@@ -1,9 +1,8 @@
-%define alphatag .20091015svn1035382
 
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
-Version:        0.9.95
-Release:        0.6%{?alphatag}%{?dist}
+Version:        0.9.97
+Release:        1%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
@@ -17,9 +16,9 @@ URL:            http://www.kde.org/
 #Source0:DISABLECMD svn export svn://anonsvn.kde.org/home/kde/tags/kdevplatform/%{version} kdevplatform-%{version}
 #Source0:DISABLECMD tar cjf %{_sourcedir}/kdevplatform-%{version}.tar.bz2 kdevplatform-%{version}
 #Source0:DISABLECMD rm -rf kdevplatform-%{version}
-Source0:        kdevplatform-%{version}%{?alphatag}.tar.bz2
+#Source0:        kdevplatform-%{version}%{?alphatag}.tar.bz2
 ### ORIGINAL
-#Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdevplatform-%{version}.tar.bz2
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,19 +61,26 @@ Requires: commoncpp2-devel
 %setup -q -n kdevplatform-%{version}%{?alphatag}
 %patch0 -p1 -b .kompare
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 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}
 
@@ -112,13 +118,17 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_datadir}/kde4/apps/cmake/modules/FindKDevPlatform.cmake
+#{_kde4_appsdir}/cmake/modules/FindKDevPlatform.cmake
 %{_kde4_libdir}/lib*.so
 %{_kde4_includedir}/kdevplatform/
 %{_kde4_libdir}/cmake/kdevplatform/*.cmake
 
 
 %changelog
+* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> 0.9.97-1
+- kdevplatform-0.9.97
+- kdevplatform: file conflict with kdelibs (FindKDevPlatform.cmake) (#541690)
+
 * Sun Nov 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.95-0.6.20091015svn1035382
 - rebuild (fc13+, qt-4.6.0-rc1)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Oct 2009 04:46:54 -0000	1.4
+++ sources	8 Jan 2010 01:20:52 -0000	1.5
@@ -1 +1 @@
-f3ff600d7976bb0dfeb005e895675c35  kdevplatform-0.9.95.20091015svn1035382.tar.bz2
+bfe385bc471d4d9abf4e989ca203db86  kdevplatform-0.9.97.tar.bz2