[packages] kdevelop plus okolice

Sat, 10 Apr 2010 04:28:42 -0700 

Witam,

Załączam patche z podbitymi wersjami:
kde4-kdevelop: 3.9.99->3.10.0
kde4-kdevelop-plugin-php: 1.0.0-beta4->1.0.0-rc1
kde4-kdevplatform: 0.9.99-> 0.10.0

Projekt się stabilizuję (RC1), dlatego usunąłem części związane z SVN
(svnrev i komentarze odnoszące się do repozytorium). Podbite qtver i
_kdever.
Dodatkowo kde4-kdevelop sekcja files oczyszczona z plików przeniesionych
wcześniej do kdevplatform lub przeniesiona do oddzielnych pluginów w
http://websvn.kde.org/trunk/playground/devtools/kdevelop4-extra-plugins/. 
Wydzielony
do -devel plik %{_datadir}/apps/cmake/modules/FindKDevelop.cmake, który
wymaga /usr/share/apps/cmake/modules dostarczanego przez
kde4-kdelibs-devel (~60MB z zależnościami dla stacji roboczej, nie
zmieniającego funkcjonalności samego programu).

th+ready+test-i686: wszystko się zbudowało i działa (pracuję na co dzień
stabilnie z quantą i wtyczką php).

Prosiłbym o wrzucenie zmian do repozytorium (i może puszczenie na
builder - kiedyś już był w th-test, ale poza niego nie wyszedł - w maju
pewnie wersja finalna).


Dzięki i pozdrawiam

-- 
Andrzej Augustyński

Index: kde4-kdevelop/kde4-kdevelop.spec
===================================================================
RCS file: /cvsroot/packages/kde4-kdevelop/kde4-kdevelop.spec,v
retrieving revision 1.23
diff -u -r1.23 kde4-kdevelop.spec
--- kde4-kdevelop/kde4-kdevelop.spec	18 Mar 2010 22:00:45 -0000	1.23
+++ kde4-kdevelop/kde4-kdevelop.spec	10 Apr 2010 10:05:19 -0000
@@ -3,9 +3,8 @@
 # Conditional build:
 #
 %define		_state		unstable
-%define		_kdever		4.3.5
-%define		qtver		4.6.1
-%define		svnrev		1027000
+%define		_kdever		4.4.2
+%define		qtver		4.6.2
 %define		orgname		kdevelop
 
 Summary:	KDE Integrated Development Environment
@@ -14,14 +13,12 @@
 Summary(pt_BR.UTF-8):	Ambiente Integrado de Desenvolvimento para o KDE
 Summary(zh_CN.UTF-8):	KDE C/C++集成开发环境
 Name:		kde4-kdevelop
-Version:	3.9.99
+Version:	3.10.0
 Release:	0.1
 License:	GPL
 Group:		X11/Development/Tools
-# get it via: svn co svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevelop
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	4b0b9bb343da46ead3ae9632a0bd9ce9
-#Source0:	%{orgname}-%{version}-%{svnrev}.tar.bz2
+# Source0-md5:	e1176595b4396672d666c8a76ea2fb5c
 URL:		http://www.kdevelop.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtCore-devel >= %{qtver}
@@ -109,6 +106,20 @@
 potrzebnych do programowania przez dodanie ich do menu Tools według
 własnych potrzeb.
 
+%package devel
+Summary:	kdevelop - header files and development documentation
+Summary(pl.UTF-8):	kdevelop - pliki nagłówkowe i dokumentacja
+Group:		X11/Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+This package contains header files and development documentation for
+kdevelop.
+
+%description devel -l pl.UTF-8
+Pakiet ten zawiera pliki nagłówkowe i dokumentację potrzebną przy
+pisaniu własnych programów wykorzystujących kdevelop.
+
 %prep
 %setup -q -n %{orgname}-%{version}
 
@@ -140,56 +151,28 @@
 
 %files
 %defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/kdev_includepathresolver
 %attr(755,root,root) %{_bindir}/kdevelop
 %attr(755,root,root) %{_bindir}/kdevelop.bin
-#%attr(755,root,root) %{_bindir}/lcov_geninfo
-#%attr(755,root,root) %{_bindir}/qmake-parser
-#%attr(755,root,root) %{_libdir}/kde4/kcm_kdev_cppdebugger.so
-#%attr(755,root,root) %{_libdir}/kde4/kcm_kdev_lcovsettings.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_kdev_makebuilder.so
-#%attr(755,root,root) %{_libdir}/kde4/kcm_kdev_qmakebuilder.so
-#%attr(755,root,root) %{_libdir}/kde4/kcm_kdev_valgrindsettings.so
-#%attr(755,root,root) %{_libdir}/kde4/kcm_kdev_veritassettings.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_kdevcmake_settings.so
 %attr(755,root,root) %{_libdir}/kde4/kdevastyle.so
 %attr(755,root,root) %{_libdir}/kde4/kdevcmakebuilder.so
 %attr(755,root,root) %{_libdir}/kde4/kdevcmakedocumentation.so
 %attr(755,root,root) %{_libdir}/kde4/kdevcmakemanager.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevcoverage.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevcppdebugger.so
 %attr(755,root,root) %{_libdir}/kde4/kdevcpplanguagesupport.so
 %attr(755,root,root) %{_libdir}/kde4/kdevcustommakemanager.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevdocumentview.so
 %attr(755,root,root) %{_libdir}/kde4/kdevgdb.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevgrepview.so
 %attr(755,root,root) %{_libdir}/kde4/kdevindent.so
 %attr(755,root,root) %{_libdir}/kde4/kdevmakebuilder.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevqmakebuilder.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevqmakemanager.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevqtdesigner.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevqtestview.so
 %attr(755,root,root) %{_libdir}/kde4/kdevqthelp.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevvalgrind.so
 %attr(755,root,root) %{_libdir}/libkdev4cmakecommon.so
 %attr(755,root,root) %{_libdir}/libkdev4cppduchain.so
 %attr(755,root,root) %{_libdir}/libkdev4cppparser.so
 %attr(755,root,root) %{_libdir}/libkdev4cpprpp.so
-#%attr(755,root,root) %{_libdir}/libkdev4qmakeparser.so
-#%attr(755,root,root) %{_libdir}/libkdev4qmakeduchain.so
-#%attr(755,root,root) %{_libdir}/libkdevqtest.so
-#%attr(755,root,root) %{_libdir}/libkdevveritascoverage.so
-#%attr(755,root,root) %{_libdir}/libveritascpp.so
-%{_desktopdir}/kdevelop.desktop
-
-%{_datadir}/apps/cmake/modules/FindKDevelop.cmake
-#%{_datadir}/apps/cmake/modules/KDevelopMacros.cmake
 %{_datadir}/apps/kdevappwizard
 %{_datadir}/apps/kdevcmakebuilder
 %{_datadir}/apps/kdevcmakemanager
-#%{_datadir}/apps/kdevcppdebugger
 %{_datadir}/apps/kdevcustommakemanager
-#%{_datadir}/apps/kdevdocumentview
 %{_datadir}/apps/kdevelop
 %dir %{_datadir}/apps/kdevgdb
 %{_datadir}/apps/kdevgdb/kdevgdbui.rc
@@ -198,48 +181,29 @@
 %{_datadir}/apps/kdevgdb/printers/qt4.py
 %{_datadir}/apps/kdevgdb/printers/kde4.py
 %{_datadir}/apps/kdevgdb/printers/libstdcxx.py
-#%{_datadir}/apps/kdevgrepview
-#%{_datadir}/apps/kdevqmakebuilder
-#%{_datadir}/apps/kdevqtdesigner
-#%{_datadir}/apps/kdevvalgrind
 %{_datadir}/config/kdeveloprc
 %dir %{_datadir}/apps/kdevcppsupport
 %{_datadir}/apps/kdevcppsupport/kdevcppsupport.rc
-#%dir %{_datadir}/apps/kdevcoverage
-#%{_datadir}/apps/kdevcoverage/kdevcoverage.rc
-#%dir %{_datadir}/apps/kdevqtest
-#%{_datadir}/apps/kdevqtest/kdevqtest.rc
-
-%{_iconsdir}/*/*x*/*/*.png
-#%{_datadir}/kde4/services/kcm_kdev_cppdebugger.desktop
-#%{_datadir}/kde4/services/kcm_kdev_lcovsettings.desktop
 %{_datadir}/kde4/services/kcm_kdev_makebuilder.desktop
-#%{_datadir}/kde4/services/kcm_kdev_qmakebuilder.desktop
-#%{_datadir}/kde4/services/kcm_kdev_valgrindsettings.desktop
-#%{_datadir}/kde4/services/kcm_kdev_veritassettings.desktop
 %{_datadir}/kde4/services/kcm_kdevcmake_settings.desktop
 %{_datadir}/kde4/services/kdevastyle.desktop
 %{_datadir}/kde4/services/kdevcmakebuilder.desktop
 %{_datadir}/kde4/services/kdevcmakedocumentation.desktop
 %{_datadir}/kde4/services/kdevcmakemanager.desktop
-#%{_datadir}/kde4/services/kdevcoverage.desktop
-#%{_datadir}/kde4/services/kdevcppdebugger.desktop
 %{_datadir}/kde4/services/kdevcppsupport.desktop
 %{_datadir}/kde4/services/kdevcustommakemanager.desktop
-#%{_datadir}/kde4/services/kdevdocumentview.desktop
 %{_datadir}/kde4/services/kdevgdb.desktop
-#%{_datadir}/kde4/services/kdevgrepview.desktop
 %{_datadir}/kde4/services/kdevindent.desktop
 %{_datadir}/kde4/services/kdevmakebuilder.desktop
-#%{_datadir}/kde4/services/kdevqmakebuilder.desktop
-#%{_datadir}/kde4/services/kdevqmakemanager.desktop
-#%{_datadir}/kde4/services/kdevqtdesigner.desktop
-#%{_datadir}/kde4/services/kdevqtest.desktop
 %{_datadir}/kde4/services/kdevqthelp.desktop
-#%{_datadir}/kde4/services/kdevvalgrind.desktop
+%{_desktopdir}/kdevelop.desktop
 %{_desktopdir}/kde4/kdevelop.desktop
-
+%{_iconsdir}/*/*x*/*/*.png
 %{_includedir}/kdevelop
+
+%files devel
+%defattr(644,root,root,755)
+%{_datadir}/apps/cmake/modules/FindKDevelop.cmake
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog

Index: kde4-kdevelop-plugin-php/kde4-kdevelop-plugin-php.spec
===================================================================
RCS file: /cvsroot/packages/kde4-kdevelop-plugin-php/kde4-kdevelop-plugin-php.spec,v
retrieving revision 1.1
diff -u -r1.1 kde4-kdevelop-plugin-php.spec
--- kde4-kdevelop-plugin-php/kde4-kdevelop-plugin-php.spec	29 Mar 2010 08:13:36 -0000	1.1
+++ kde4-kdevelop-plugin-php/kde4-kdevelop-plugin-php.spec	10 Apr 2010 10:07:22 -0000
@@ -1,7 +1,7 @@
 # $Revision: 1.1 $, $Date: 2010/03/29 08:13:36 $
-%define		orgname		php
-%define		_kdevelopver	3.9.99
-%define		_prever		beta4
+%define		orgname		kdev-php
+%define		_kdevelopver	3.10.0
+%define		_prever		rc1
 %define		_state		unstable
 
 Summary:	PHP plugins for kdevelop
@@ -11,10 +11,10 @@
 Release:	0.%{_prever}.1
 License:	GPL
 Group:		X11/Development/Tools
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{_kdevelopver}/src/%{orgname}-%{version}-%{_prever}.tar.bz2
-# Source0-md5:	9a647e689b262df9332d7fd366737a9c
-Source1:	ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{_kdevelopver}/src/%{orgname}-docs-%{version}-%{_prever}.tar.bz2
-# Source1-md5:	d86274cf7f0ad1821ac1426b0d95aa8e
+Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{_kdevelopver}/src/%{orgname}-%{_prever}.tar.bz2
+# Source0-md5:	5e1e80f417afa958525ea682a309f764
+Source1:	ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{_kdevelopver}/src/%{orgname}-docs-%{_prever}.tar.bz2
+# Source1-md5:	9aa5926ca68c618ee87603619547898b
 URL:		http://www.kdevelop.org/
 BuildRequires:	kde4-kdevplatform-devel >= 0.9.97
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -26,7 +26,7 @@
 Wtyczki PHP dla kdevelop.
 
 %prep
-%setup -q -n %{orgname}-%{version}-%{_prever} -a1
+%setup -q -n %{orgname}-%{_prever} -a1
 
 %build
 install -d build
@@ -39,7 +39,7 @@
 %{__make}
 cd ../
 
-cd %{orgname}-docs-%{version}-%{_prever}
+cd %{orgname}-docs-%{_prever}
 install -d build
 cd build
 %cmake \
@@ -57,7 +57,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 
-%{__make} -C %{orgname}-docs-%{version}-%{_prever}/build install \
+%{__make} -C %{orgname}-docs-%{_prever}/build install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 

Index: kde4-kdevplatform/kde4-kdevplatform.spec
===================================================================
RCS file: /cvsroot/packages/kde4-kdevplatform/kde4-kdevplatform.spec,v
retrieving revision 1.31
diff -u -r1.31 kde4-kdevplatform.spec
--- kde4-kdevplatform/kde4-kdevplatform.spec	29 Mar 2010 08:16:34 -0000	1.31
+++ kde4-kdevplatform/kde4-kdevplatform.spec	10 Apr 2010 10:06:10 -0000
@@ -1,24 +1,19 @@
 # $Revision: 1.31 $, $Date: 2010/03/29 08:16:34 $
 %define		_state		unstable
 %define		orgname		kdevplatform
-%define		svnrev		1082390
-%define		_kdevelopver	3.9.99
-%define		_kdever		4.3.5
-%define		_qtver		4.6.1
+%define		_kdevelopver	3.10.0
+%define		_kdever		4.4.2
+%define		_qtver		4.6.2
 
 Summary:	KDevelop Development Platform
 Summary(pl.UTF-8):	KDevelop Development Platform
 Name:		kde4-kdevplatform
-Version:	0.9.99
-#Release:	0.%{svnrev}.1
-Release:        0.2
+Version:	0.10.0
+Release:        0.1
 License:	GPL
 Group:		X11/Development/Tools
-# get it via: svn co svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{_kdevelopver}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	180ee3573bd3d5ba805acc17d44fcbab
-#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/snapshots/%{orgname}-%{svnrev}.tar.bz2
-#Patch0: %{name}-cmake.patch
+# Source0-md5:	e71de75821cdb5141e9e4a88c5bd6bf4
 URL:		http://www.kdevelop.org/
 BuildRequires:	Qt3Support-devel >= %{_qtver}
 BuildRequires:	QtCore-devel >= %{_qtver}
@@ -115,9 +110,6 @@
 
 %files
 %defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/kdevteamwork_server
-#%attr(755,root,root) %{_bindir}/lcov_geninfo
-
 %attr(755,root,root) %{_libdir}/libkdevplatformdebugger.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkdevplatformdebugger.so.?
 %attr(755,root,root) %{_libdir}/libkdevplatforminterfaces.so.*.*.*

_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl

Odpowiedź listem elektroniczym