packages: kde4-kdesdk/kde4-kdesdk.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Sun Feb 21 21:29:45 CET 2010 

Author: shadzik                      Date: Sun Feb 21 20:29:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdesdk:
   kde4-kdesdk.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: packages/kde4-kdesdk/kde4-kdesdk.spec
diff -u packages/kde4-kdesdk/kde4-kdesdk.spec:1.53 packages/kde4-kdesdk/kde4-kdesdk.spec:1.54
--- packages/kde4-kdesdk/kde4-kdesdk.spec:1.53	Fri Jan 29 00:01:06 2010
+++ packages/kde4-kdesdk/kde4-kdesdk.spec	Sun Feb 21 21:29:40 2010
@@ -3,19 +3,19 @@
 # TODO:
 # - add man files
 #
-%define		_state		stable
 %define		orgname		kdesdk
-%define		qtver		4.5.3
+%define		_state		stable
+%define		qtver		4.6.1
 
 Summary:	KDESDK - Software Development Kit for KDE
 Summary(pl.UTF-8):	KDESDK - Wsparcie programistyczne dla KDE
 Name:		kde4-kdesdk
-Version:	4.3.5
+Version:	4.4.0
 Release:	1
 License:	GPL
 Group:		X11/Development/Tools
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	aed5437f8af67a758cd57a4e2b7d50b0
+# Source0-md5:	3c256aaffbbf9f91b2b284b4b734a7f2
 #Patch100:	%{name}-branch.diff
 Patch0:		%{name}-kiosvn.patch
 URL:		http://www.kde.org/
@@ -35,16 +35,18 @@
 BuildRequires:	bison
 BuildRequires:	boost-devel >= 1.35.0
 BuildRequires:	bzip2-devel
-BuildRequires:	cmake >= 2.6.3
+BuildRequires:	cmake >= 2.8.0
 BuildRequires:	db-devel
 BuildRequires:	emacs-common
 BuildRequires:	flex
-BuildRequires:	giflib-devel
-BuildRequires:	kde4-kdepim-devel >= %{version}
+BuildRequires:	hunspell-devel
+#BuildRequires:	kde4-kdepim-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
-BuildRequires:	libjpeg-devel
+BuildRequires:	giflib-devel
 BuildRequires:	libltdl-devel
-BuildRequires:	libxslt-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	perl-tools-pod
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
@@ -53,8 +55,6 @@
 BuildRequires:	strigi-devel >= 0.6.3
 BuildRequires:	subversion-devel >= 0.37.0
 BuildRequires:	utempter-devel
-BuildRequires:	xorg-lib-libXpm-devel
-BuildRequires:	xorg-lib-libXtst-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_gimpdir	%{_datadir}/gimp/2.0
@@ -377,8 +377,8 @@
 Summary:	Package which adds the KDE Default palette to GIMP
 Summary(pl.UTF-8):	Pakiet dodający domyślną paletę kolorów KDE do GIMP-a
 Group:		X11/Applications/Graphics
-Requires:	gimp
 Obsoletes:	kde4-kdesdk-palette-gimp
+Requires:	gimp
 
 %description palettes-gimp
 This package adds the KDE Default palette to GIMP.
@@ -390,9 +390,9 @@
 Summary:	Package which adds the KDE Default palette to XPaint
 Summary(pl.UTF-8):	Pakiet dodający domyślną paletę kolorów KDE do XPainta
 Group:		X11/Applications/Graphics
+Obsoletes:	kde4-kdesdk-palatte-xpaint
 Requires:	xorg-lib-libXt >= 1.0
 Requires:	xpaint
-Obsoletes:	kde4-kdesdk-palatte-xpaint
 
 %description palettes-xpaint
 This package adds the KDE Default palette to XPaint.
@@ -639,9 +639,9 @@
 install -d build
 cd build
 %cmake \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DLIB_INSTALL_DIR=%{_libdir} \
+	-DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -735,11 +735,15 @@
 %{_iconsdir}/*/*/actions/diff.png
 %{_iconsdir}/*/*/actions/preverror.png
 %{_iconsdir}/*/*/actions/prevfuzzyuntrans.png
+%{_iconsdir}/*/*/actions/prevpo.png
+%{_iconsdir}/*/*/actions/prevtemplate.png
 %{_iconsdir}/*/*/actions/search2msgstr.png
 %{_iconsdir}/*/*/apps/lokalize.png
 %{_iconsdir}/*/*/actions/nexterror.png
 %{_iconsdir}/*/*/actions/nextfuzzy.png
 %{_iconsdir}/*/*/actions/nextfuzzyuntrans.png
+%{_iconsdir}/*/*/actions/nextpo.png
+%{_iconsdir}/*/*/actions/nexttemplate.png
 %{_iconsdir}/*/*/actions/nextuntranslated.png
 %{_iconsdir}/*/*/actions/prevuntranslated.png
 %{_iconsdir}/*/*/actions/transsearch.png
@@ -750,8 +754,12 @@
 %files kate -f kate.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kate
+%attr(755,root,root) %{_bindir}/katesnippetstng_editor
+%attr(755,root,root) %{_libdir}/libktexteditor_codesnippets_core.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libktexteditor_codesnippets_core.so.?
+%attr(755,root,root) %{_libdir}/libktexteditor_codesnippets_core.so
 %attr(755,root,root) %{_libdir}/libkateinterfaces.so.*.*.*
-%attr(755,root,root) %{_libdir}/libkateinterfaces.so.?
+%attr(755,root,root) %ghost %{_libdir}/libkateinterfaces.so.?
 %attr(755,root,root) %{_libdir}/libkateinterfaces.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_kate.so
 %attr(755,root,root) %{_libdir}/kde4/kate_kttsd.so
@@ -761,6 +769,7 @@
 %attr(755,root,root) %{_libdir}/kde4/katebuildplugin.so
 %attr(755,root,root) %{_libdir}/kde4/katectagsplugin.so
 %attr(755,root,root) %{_libdir}/kde4/katesnippetsplugin.so
+%attr(755,root,root) %{_libdir}/kde4/katesnippets_tngplugin.so
 %attr(755,root,root) %{_libdir}/kde4/kateopenheaderplugin.so
 %attr(755,root,root) %{_libdir}/kde4/katetextfilterplugin.so
 %attr(755,root,root) %{_libdir}/kde4/katefindinfilesplugin.so
@@ -778,14 +787,19 @@
 %{_datadir}/apps/kconf_update/kate-2.4.upd
 %{_datadir}/config/katefiletemplates.knsrc
 %{_datadir}/config/katerc
+%{_datadir}/config/ktexteditor_codesnippets_core.knsrc
 %{_datadir}/kde4/services/kate*.desktop
 %{_datadir}/kde4/services/plasma-applet-katesession.desktop
 %{_datadir}/kde4/servicetypes/kateplugin.desktop
+%{_datadir}/mime/packages/kateplugin_katesnippets_tng.xml
 %{_desktopdir}/kde4/kate.desktop
+%{_desktopdir}/kde4/katesnippetstng_editor.desktop
 %dir %{_includedir}/kate
 %{_includedir}/kate/*.h
 %{_includedir}/kate_export.h
+%{_includedir}/ktexteditor_codesnippets_core
 %{_iconsdir}/*/*/apps/kate.*
+%{_mandir}/man1/kate.1*
 
 %files kapptemplate -f kapptemplate.lang
 %defattr(644,root,root,755)
@@ -835,6 +849,7 @@
 %attr(755,root,root) %{_libdir}/libktrace*.so*
 %{_datadir}/apps/kmtrace
 %{_includedir}/ktrace.h
+%{_mandir}/man1/demangle.1*
 
 %files kompare -f kompare.lang
 %defattr(644,root,root,755)
@@ -872,9 +887,7 @@
 %files kstartperf
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kstartperf
-%{_libdir}/libkstartperf.so
-%attr(755,root,root) %{_libdir}/libkstartperf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkstartperf.so.?
+%attr(755,root,root) %{_libdir}/kde4/kstartperf.so
 
 %files kuiviewer
 %defattr(644,root,root,755)
@@ -930,6 +943,10 @@
 %attr(755,root,root) %{_libdir}/libantlr.so.*.*.*
 %attr(755,root,root) %{_libdir}/libantlr.so.?
 %attr(755,root,root) %{_libdir}/libantlr.so
+%{_mandir}/man1/po2xml.1*
+%{_mandir}/man1/split2po.1*
+%{_mandir}/man1/xml2pot.1*
+%{_mandir}/man1/swappo.1*
 
 #%files scheck
 #%defattr(644,root,root,755)
@@ -968,6 +985,14 @@
 %attr(755,root,root) %{_bindir}/wcgrep
 %{_datadir}/apps/katepart/syntax/kdesvn-buildrc.xml
 %{_desktopdir}/kde4/kdesvn-build.desktop
+%{_mandir}/man1/adddebug.1*
+%{_mandir}/man1/cheatmake.1*
+%{_mandir}/man1/create*.1*
+%{_mandir}/man1/cxxmetric.1*
+%{_mandir}/man1/extend*.1*
+%{_mandir}/man1/extractrc.1*
+%{_mandir}/man1/zonetab2pot.py.1*
+
 
 %files scripts-cvs
 %defattr(644,root,root,755)
@@ -976,11 +1001,15 @@
 %exclude %{_bindir}/cvsservice
 %attr(755,root,root) %{_bindir}/noncvslist
 %attr(755,root,root) %{_bindir}/pruneemptydirs
+%{_mandir}/man1/cvs*.1*
+%{_mandir}/man1/pruneemptydirs.1*
+
 
 %files scripts-doc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kdedoc
 %attr(755,root,root) %{_bindir}/qtdoc
+%{_mandir}/man1/qtdoc.1*
 
 %files scripts-kdekillall
 %defattr(644,root,root,755)
@@ -1030,24 +1059,44 @@
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 $Log$
-Revision 1.53  2010/01/28 23:01:06  shadzik
-- 4.3.5
-- kill useless kde4.kdebase-devel BR
+Revision 1.54  2010/02/21 20:29:40  shadzik
+- merged from DEVEL
+
+Revision 1.47.2.12  2010/02/04 21:09:29  arekm
+- up to 4.4.0
+
+Revision 1.47.2.11  2010/02/02 20:56:26  shadzik
+- bump up qtver; it's not necessary but we make sure we link with the latest qtver
+
+Revision 1.47.2.10  2010/02/02 16:01:35  shadzik
+- minor clean up (removing old svn snap stuff)
+
+Revision 1.47.2.9  2010/02/02 13:12:46  shadzik
+- force cmake 2.8.0 BR
+
+Revision 1.47.2.8  2010/02/01 02:59:18  shadzik
+- 4.4 RC3
+
+Revision 1.47.2.7  2010/01/28 23:10:10  shadzik
+- kill useless kde4-kdebase-devel BR
+
+Revision 1.47.2.6  2010/01/17 21:11:28  arekm
+- up to 4.3.90
 
-Revision 1.52  2009/12/02 21:04:17  sparky
-- BR: libxslt-devel
+Revision 1.47.2.5  2009/12/24 02:21:05  shadzik
+- 4.4 Beta2
 
-Revision 1.51  2009/11/28 20:54:48  shadzik
-- 4.3.4
+Revision 1.47.2.4  2009/11/18 19:02:47  cactus
+- 4.3.75
 
-Revision 1.50  2009/10/31 14:37:42  shadzik
-- 4.3.3
+Revision 1.47.2.3  2009/11/04 01:44:12  cactus
+- up to 4.3.73
 
-Revision 1.49  2009/10/19 18:23:18  glen
-- CMAKE_BUILD_TYPE caps fixing
+Revision 1.47.2.2  2009/10/22 13:26:25  cactus
+- up to 4.3.72
 
-Revision 1.48  2009/10/03 11:59:00  shadzik
-- 4.3.2 try #1
+Revision 1.47.2.1  2009/10/07 18:39:52  cactus
+- up to 4.3.69
 
 Revision 1.47  2009/08/29 16:24:51  shadzik
 - 4.3.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdesdk/kde4-kdesdk.spec?r1=1.53&r2=1.54&f=u

More information about the pld-cvs-commit mailing list