rpms/kdevplatform/F-11 .cvsignore, 1.2, 1.3 kdevplatform.spec, 1.1, 1.2 sources, 1.2, 1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdevplatform/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22751/F-11

Modified Files:
	.cvsignore kdevplatform.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Sep 2009 22:40:37 -0000	1.2
+++ .cvsignore	26 Feb 2010 21:28:13 -0000	1.3
@@ -1 +1 @@
-kdevplatform-0.9.95.tar.bz2
+kdevplatform-0.9.98.tar.bz2


Index: kdevplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-11/kdevplatform.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdevplatform.spec	29 Sep 2009 22:40:37 -0000	1.1
+++ kdevplatform.spec	26 Feb 2010 21:28:13 -0000	1.2
@@ -1,51 +1,62 @@
+
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
-Version:        0.9.95
-Release:        0.3.beta5%{?alphatag}%{?dist}
+Version:        0.9.98
+Release:        1%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/kdevelop/3.9.95/src/kdevplatform-%{version}.tar.bz2
+### SNAPSHOT
+#Source0:VAR svnrel echo $(date +%Y%m%d)svn$(svn info svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform | grep 'Rev:' | cut -d" " -f4)
+#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform kdevplatform-%{version}.%{svnrel}
+#Source0:CMD tar cjf %{_sourcedir}/kdevplatform-%{version}.%{svnrel}.tar.bz2 kdevplatform-%{version}.%{svnrel}
+#Source0:CMD rm -rf kdevplatform-%{version}.%{svnrel}
+### TAG
+#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
+### ORIGINAL
+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}
-
-BuildRequires:  kdelibs-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}
+%setup -q -n kdevplatform-%{version}%{?alphatag}
 
 
 %build
@@ -53,11 +64,13 @@ 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}
 
 
@@ -85,26 +98,44 @@ 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_datadir}/kde4/apps/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
+
+* 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)
+
+* Thu Oct 15 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.5.20091015svn1035382
+- New snapshot
+
+* Sun Oct 11 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.4.beta5
+- Fix finding Kompare includes
+
 * Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.3.beta5
 - Use official release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Sep 2009 22:40:38 -0000	1.2
+++ sources	26 Feb 2010 21:28:13 -0000	1.3
@@ -1 +1 @@
-e38fd54ea9c16b41222e893c06ca3946  kdevplatform-0.9.95.tar.bz2
+dcdc427d8be4d8fa721f7354ac4406ed  kdevplatform-0.9.98.tar.bz2