rpms/kdevelop/F-8 kdevelop-3.5.2-kde4template.patch, NONE, 1.1 kdevelop.spec, 1.67, 1.68

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdevelop/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9261/F-8

Modified Files:
	kdevelop.spec 
Added Files:
	kdevelop-3.5.2-kde4template.patch 
Log Message:
Sync from devel:
* Fri Jun 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.2-2
- improve integration of the KDE 4 app template

kdevelop-3.5.2-kde4template.patch:

--- NEW FILE kdevelop-3.5.2-kde4template.patch ---
diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate	2008-02-11 12:22:37.000000000 +0100
+++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate	2008-06-06 23:55:22.000000000 +0200
@@ -43,7 +43,7 @@
 Comment[sv]=Skapar ett enkelt KDE 4-program med ett toppnivåfönster, menyer och verktygsrader.
 Comment[zh_TW]=產生一個簡單的 KDE4 æ‡‰ç”¨ç¨‹å¼ï¼Œå…§å«é ‚å±¤è¦–çª—ã€é¸å–®èˆ‡å·¥å…·åˆ—ã€‚
 FileTemplates=h,CStyle,cpp,CStyle
-ShowFilesAfterGeneration=%{dest}/README
+ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}.cpp
 Archive=kde4app.tar.gz
 
 [FILE1]
@@ -112,25 +112,16 @@
 Source=%{src}/settings.kcfgc
 Dest=%{dest}/settings.kcfgc
 
-[FILE13]
-Type=install
-Source=%{src}/README
-Dest=%{dest}/README
-
-[FILE14]
-Type=install
-Source=%{src}/kde4app.kdevelop
-Dest=%{dest}/%{APPNAMELC}.kdevelop
-
-[FILE15]
-Type=install
-Source=%{src}/kde4app.kdevelop.filelist
-Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
-
 [MKDIR1]
 Type=mkdir
 Dir=%{dest}/build
 
+[CMAKE]
+Type=finishcmd
+Command=cmake ./ -GKDevelop3
+Directory=%{dest}
+
+
 [MSG]
 Type=message
 Comment=A KDE4 Application was created at %{dest}
diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.am kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.am
--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.am	2007-09-26 11:42:09.000000000 +0200
+++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.am	2008-06-06 23:46:15.000000000 +0200
@@ -1,6 +1,6 @@
 dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \
 	main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \
-	kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist
+	kde4app.png
 
 templateName = kde4app
 
diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.in kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.in
--- kdevelop-3.5.2/languages/cpp/app_templates/kde4app/Makefile.in	2008-05-13 16:23:40.000000000 +0200
+++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kde4app/Makefile.in	2008-06-06 23:46:26.000000000 +0200
@@ -373,7 +373,7 @@
 xdg_menudir = @xdg_menudir@
 dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \
 	main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \
-	kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist
+	kde4app.png
 
 templateName = kde4app
 
diff -ur kdevelop-3.5.2/languages/cpp/app_templates/kdecpp.appwizard kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kdecpp.appwizard
--- kdevelop-3.5.2/languages/cpp/app_templates/kdecpp.appwizard	2007-04-10 01:44:25.000000000 +0200
+++ kdevelop-3.5.2-kde4template/languages/cpp/app_templates/kdecpp.appwizard	2008-06-06 23:52:16.000000000 +0200
@@ -1,2 +1,2 @@
 [General]
-List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,kcmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi
+List=kde4app,kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,kcmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi


Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-8/kdevelop.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdevelop.spec	19 May 2008 09:47:05 -0000	1.67
+++ kdevelop.spec	6 Jun 2008 22:12:19 -0000	1.68
@@ -19,7 +19,7 @@
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
 Version: 3.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
@@ -32,6 +32,8 @@
 Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 Patch3: kdevelop-3.5.0-svn.patch
+# improved integration for the KDE 4 template - no special KDE 4 build environment needed in Fedora
+Patch4: kdevelop-3.5.2-kde4template.patch
 
 #upstream patches
 
@@ -142,6 +144,7 @@
 %patch1 -p0 -b .config
 %patch2 -p1 -b .doc
 %patch3 -p1 -b .svn
+%patch4 -p1 -b .kde4template
 
 %if %{make_cvs}
   rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
@@ -251,6 +254,9 @@
 
 
 %changelog
+* Fri Jun 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.2-2
+- improve integration of the KDE 4 app template
+
 * Mon May 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.2-1
 - update to 3.5.2
 - F9+: BR qt3-devel-docs instead of qt-devel-docs