SPECS (DEVEL): kdevelop.spec - 3.2.90

arekm arekm at pld-linux.org
Thu Sep 1 22:20:50 CEST 2005


Author: arekm                        Date: Thu Sep  1 20:20:50 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 3.2.90

---- Files affected:
SPECS:
   kdevelop.spec (1.61.2.4 -> 1.61.2.5) 

---- Diffs:

================================================================
Index: SPECS/kdevelop.spec
diff -u SPECS/kdevelop.spec:1.61.2.4 SPECS/kdevelop.spec:1.61.2.5
--- SPECS/kdevelop.spec:1.61.2.4	Mon Jul  5 11:01:12 2004
+++ SPECS/kdevelop.spec	Thu Sep  1 22:20:45 2005
@@ -1,38 +1,51 @@
 # $Revision$, $Date$
-
-%define		_state		snapshots
-%define		_ver		3.0.91
-%define 	_snap 		040704
+#
+# Conditional build:
+%bcond_without	ada	# don't build with ada
+#
+%define		_state		unstable
+%define		_kdever		3.5-alpha1
 
 Summary:	KDE Integrated Development Environment
 Summary(pl):	Zintegrowane środowisko programisty dla KDE
 Summary(pt_BR):	Ambiente Integrado de Desenvolvimento para o KDE
 Summary(zh_CN):	KDE C/C++źŻłÉżŞˇ˘ťˇžł
+Summary(de):	KDevelop ist eine grafische Entwicklungsumgebung für KDE
 Name:		kdevelop
-Version:	%{_ver}.%{_snap}
+Version:	3.2.90
 Release:	1
 Epoch:		7
 License:	GPL
 Group:		X11/Development/Tools
-Source0:	ftp://ftp.pld-linux.org/software/kde/%{name}-%{_snap}.tar.bz2
+Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	0f383174fcf8089bbd9303de2111f3ef
+#Source0:	http://ep09.pld-linux.org/~djurban/kde/%{name}-%{version}.tar.bz2
 Patch0:		kde-common-PLD.patch
+Patch1:		%{name}-am.patch
 URL:		http://www.kdevelop.org/
-#BuildRequires:	antlr >= 2.7.3
+# disabled, breaks with this new antlr
+# BuildRequires:	antlr >= 2.7.3
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	db-devel
+BuildRequires:	doxygen
 BuildRequires:	flex
+%{?with_ada:BuildRequires:gcc-ada}
 BuildRequires:	gettext-devel
-BuildRequires:	kdelibs-devel >= 9:3.2.90
+BuildRequires:	kdelibs-devel
+#BuildRequires:	kdelibs-devel >= 9:%{_kdever}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
-BuildRequires:	openssl-devel
+BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel
 BuildRequires:	rpmbuild(macros) >= 1.129
-BuildRequires:	unsermake >= 040511
+BuildRequires:	subversion-devel >= 1.2.0-4
+#BuildRequires:	unsermake >= 040511
 BuildRequires:	zlib-devel
-Requires:	kdesdk-cervisia >= 3:3.2.90
+BuildConflicts:	star
+Requires:	kdebase-core >= 9:%{_kdever}
+Requires:	kdesdk-libcvsservice >= 3:%{_kdever}
 Requires:	kdoc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -73,8 +86,9 @@
 dokumentacją itp.; tworzenie podręczników użytkownika pisanych w SGML
 i automatyczne generowanie wyjścia HTML pasującego do KDE;
 automatyczne tworzenie dokumentacji API w HTML do klas projektu z
-odniesieniami do używanych bibliotek; wsparcie dla internacjonalizacji,
- pozwalające tłumaczom łatwo dodawać pliki z tłumaczeniami do projektu.
+odniesieniami do używanych bibliotek; wsparcie dla
+internacjonalizacji, pozwalające tłumaczom łatwo dodawać pliki z
+tłumaczeniami do projektu.
 
 KDevelop ma także tworzenie interfejsów użytkownika przy użyciu
 edytora dialogów WYSIWYG; odpluskwianie aplikacji poprzez integrację z
@@ -82,21 +96,45 @@
 potrzebnych do programowania przez dodanie ich do menu Tools według
 własnych potrzeb.
 
+%description -l de
+KDevelop ist eine grafische Entwicklungsumgebung für KDE.
+
+Das KDevelop-Projekt wurde 1998 begonnen, um eine einfach zu
+bedienende grafische (integrierte Entwicklungsumgebung) für C++ und C
+auf Unix-basierten Betriebssystemen bereitzustellen. Seit damals ist
+die KDevelop-IDE öffentlich unter der GPL erhältlich und unterstützt
+u. a. Qt-, KDE-, GNOME-, C++- und C-Projekte.
+
 %prep
-%setup -q -n %{name}-%{_snap}
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
-%build
-cp /usr/share/automake/config.sub admin
-
-#export UNSERMAKE=/usr/share/unsermake/unsermake
+%{__sed} -i -e 's/Terminal=0/Terminal=false/' \
+	-e 's/\(^Categories=.*$\)/\1;/' \
+	kdevelop.desktop
 
+%build
+cp -f /usr/share/automake/config.sub admin
+#export UNSERMAKE=%{_datadir}/unsermake/unsermake
 %{__make} -f admin/Makefile.common cvs
 
 %configure \
 	--disable-rpath \
+	--with-qt-libraries=%{_libdir} \
+	%{!?with_ada:--disable-ada} \
 	--enable-final \
-	--with-qt-libraries=%{_libdir}
+%if "%{_lib}" == "lib64"
+	--enable-libsuffix=64 \
+%endif
+	--with-apr-config=%{_bindir}/apr-1-config \
+	--with-apu-config=%{_bindir}/apu-1-config \
+	--with-svn-include=%{_includedir}/subversion \
+	--with-svn-lib=%{_libdir} \
+	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full}
+
+# disabled, breaks with new antlr
+# %{?with_ada:%{__make} -C languages/ada genparser}
 
 %{__make}
 
@@ -105,20 +143,15 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	kde_libs_htmldir=%{_kdedocdir} \
 	kde_htmldir=%{_kdedocdir}
 
-install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
-
-mv $RPM_BUILD_ROOT{%{_datadir}/applnk/Development/*,%{_desktopdir}/kde}
-
 cd $RPM_BUILD_ROOT%{_iconsdir}
 mv {lo,hi}color/16x16/actions/kdevelop_tip.png
 mv {lo,hi}color/32x32/actions/kdevelop_tip.png
 cd -
 
-%find_lang	%{name}			--with-kde
-%find_lang	kde_app_devel		--with-kde
-cat kde_app_devel.lang >> %{name}.lang
+%find_lang %{name} --with-kde --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,32 +161,31 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc %{_libdir}/kdevbdb/docs/LICENSE
+%doc %{_libdir}/kdevbdb/docs/README
 %attr(755,root,root) %{_bindir}/*
 %{_libdir}/*.la
 %attr(755,root,root) %{_libdir}/*.so
 %attr(755,root,root) %{_libdir}/*.so.*.*.*
 %{_libdir}/kde3/*.la
 %attr(755,root,root) %{_libdir}/kde3/*.so*
-%dir %{_libdir}/kde3/plugins/kdevdesigner
-%{_libdir}/kde3/plugins/kdevdesigner/libkdevdesigner_lang.la
-%attr(755,root,root) %{_libdir}/kde3/plugins/kdevdesigner/libkdevdesigner_lang.so
-%{_includedir}/kdevelop
-%{_includedir}/kinterfacedesigner
 %{_datadir}/apps/*
 %{_datadir}/config/*
+%{_datadir}/desktop-directories/kde-development-kdevelop.directory
 %{_datadir}/mimelnk/application/*
 %{_datadir}/mimelnk/text/x-fortran.desktop
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_desktopdir}/kde/*
-%{_iconsdir}/*/*/*/*
-#TODO!
-%dir %{_prefix}/kdevbdb
-%dir %{_prefix}/kdevbdb/bin
-%attr(755,root,root) %{_prefix}/kdevbdb/bin/*
-%{_prefix}/kdevbdb/docs
-%{_prefix}/kdevbdb/include
-%{_prefix}/kdevbdb/lib
+%{_iconsdir}/hicolor/*/*/*
+%{_includedir}/kdevelop
+%{_includedir}/kinterfacedesigner
+%dir %{_libdir}/kdevbdb
+%dir %{_libdir}/kdevbdb/bin
+%dir %{_libdir}/kdevbdb/docs
+%attr(755,root,root) %{_libdir}/kdevbdb/bin/*
+%{_libdir}/kdevbdb/include
+%{_libdir}/kdevbdb/lib
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -161,234 +193,95 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.61.2.4  2004/07/05 09:01:12  adgor
-- 3.0.91.040704
-
-Revision 1.61.2.3  2004/05/26 16:35:28  adgor
-- 040526
-- Do not use unsermake
-
-Revision 1.61.2.2  2004/05/18 20:35:12  adgor
-- 3.0.90.040518
-
-Revision 1.61.2.1  2004/04/01 16:13:32  adgor
-- My last work, due to djurban's threats
-
-Revision 1.61  2004/02/16 19:48:41  mkierus
-- updated to 3.0.1
-
-Revision 1.60  2004/02/12 12:03:19  djurban
-- fix amd64 stupidity
-
-Revision 1.59  2004/02/12 11:55:22  djurban
-- rel++ to rebuild with new qt
-
-Revision 1.58  2004/02/06 18:06:45  djurban
-- close %%if
-
-Revision 1.57  2004/02/04 12:41:41  qboosh
-- typo, unifications, removed some redundant deps
-
-Revision 1.56  2004/02/03 23:40:25  djurban
-- fix again src0
-
-Revision 1.55  2004/02/03 23:37:57  djurban
-- fix src0
-
-Revision 1.54  2004/02/03 23:35:24  djurban
-- uncomment install before stbr
-
-Revision 1.53  2004/02/03 23:34:38  djurban
-- updated to 3.0.0 final
-- finished i18n
-- rel. 1
-- stbr
-
-Revision 1.52  2004/01/12 23:17:35  djurban
--updated to 040110
-
-Revision 1.51  2004/01/11 00:27:19  eothane
-- proper ep09 address
-
-Revision 1.50  2003/12/12 18:29:12  pascalek
-- BR: artsc-devel
-
-Revision 1.49  2003/12/09 00:35:30  adgor
-- Merged DEVEL
-
-Revision 1.29.2.44  2003/12/08 22:17:43  adgor
-- Release 1
-
-Revision 1.29.2.43  2003/12/08 22:01:08  adgor
-- Grr... i'm working at it already now
-- Switched to 031204 (do not look at number - it's kdelibs generating date)
-  My current snap is newer (with a few more updates included in)
-- Fixed R/BR
-- Cosmetics
-- Release 0.1 NFY
-
-Revision 1.29.2.42  2003/12/08 21:42:43  zytek
-- BR: pcre-devel
-
-Revision 1.29.2.41  2003/12/08 21:40:10  zytek
-- md5
-- it's 031208 not 031204.. commit message error ;]
-
-Revision 1.29.2.40  2003/12/08 21:38:43  zytek
-- 031204 (adgor you can move it to your ftp)
-- BR: db-devel, libart_lgpl-devel
-
-Revision 1.29.2.39  2003/11/16 13:25:02  adgor
-- 031114
-
-Revision 1.29.2.38  2003/11/15 00:26:41  ankry
-- cosmetics
-
-Revision 1.29.2.37  2003/11/12 18:07:18  qboosh
-- doesn't build with pccts-antlr, BR java version of antlr
-
-Revision 1.29.2.36  2003/11/11 22:21:51  matkor
-- BR: antlr -> BR: pccts-antlr
-
-Revision 1.29.2.35  2003/11/07 18:54:34  adgor
-- 031105
-
-Revision 1.29.2.34  2003/10/26 15:30:59  adgor
-- 031024
-
-Revision 1.29.2.33  2003/10/19 10:50:35  adgor
-- 031014
-
-Revision 1.29.2.32  2003/10/09 18:46:38  adgor
-- AdaParser.cpp problem fixed
-- BR: antlr >= 2.7.3
-- NFY
-
-Revision 1.29.2.31  2003/10/08 19:37:58  ankry
-- reversed
-
-Revision 1.29.2.30  2003/10/08 19:35:39  ankry
-- fixed md5
-
-Revision 1.29.2.29  2003/10/08 18:21:59  adgor
-- 031006
-- NFY
-
-Revision 1.29.2.28  2003/10/08 16:49:47  djurban
-- enabling final
-- disabling cvsservice, which was removed in head and
-  doesnt build with newest kdesdk-cervisia
-
-Revision 1.29.2.27  2003/10/02 09:23:00  adgor
-- Added install_gideon_kdevelop.patch
-- Proper md5 for src 0
-- Fixed %%files
-- Fixed prev changelog
-
-Revision 1.29.2.26  2003/10/01 23:48:40  adgor
-- 030930
-- Changes where needed
-
-Revision 1.29.2.25  2003/09/24 07:30:50  adgor
-- Fixed %%install
-- Release 0.%%{_snap}.2
-
-Revision 1.29.2.24  2003/09/20 13:03:28  adgor
-- 030918
-- Version 3.1.91
-- A lot of changes
+Revision 1.61.2.5  2005/09/01 20:20:45  arekm
+- 3.2.90
 
-Revision 1.29.2.23  2003/07/28 08:14:38  adgor
-- Fixed BR
+Revision 1.102  2005/08/26 16:34:36  twittner
+- added `BuildConflicts: star'. gnutar (which belongs to star pkg) breaks
+  builds:
+	gnutar -cf gnu.tar -C ./gnu AUTHORS  COPYING \
+		ChangeLog  INSTALL  NEWS  README  TODO
+	No such file or directory. Cannot stat 'ChangeLog'.
+	gnutar: No such file or directory. Cannot stat 'INSTALL'.
+	[...]
+   with gtar (tar pkg) everything goes OK.
 
-Revision 1.29.2.22  2003/07/27 19:35:23  adgor
-- 030726
+Revision 1.101  2005/07/28 18:45:06  arekm
+- rel 1
 
-Revision 1.29.2.21  2003/06/21 12:28:21  adgor
-- 030618
-- Version 3.0.0
-- Icon themes moved to %%{_datadir}/icons
-- Simplifications
+Revision 1.100  2005/07/22 06:01:51  arekm
+ up to 3.2.2
 
-Revision 1.29.2.20  2003/06/04 22:19:22  adgor
-- Source0-md5
-- pld-linux.org
+Revision 1.99  2005/07/03 16:39:17  arekm
+- rel 2; subversion support fixed
 
-Revision 1.29.2.19  2003/06/04 22:02:30  djurban
-- there is no need to include .la files that are in libdir
+Revision 1.98  2005/06/01 06:09:08  arekm
+- rel 1
 
-Revision 1.29.2.18  2003/06/04 21:54:55  adgor
-- 030602
-- Major changes
-- Sorry matkor - i'll make the apropriate RA-branch_general for You
+Revision 1.97  2005/05/26 12:58:57  arekm
+- up to 3.2.1
 
-Revision 1.29.2.17  2003/06/01 08:20:59  matkor
-- Snap 030530.
+Revision 1.96  2005/04/29 16:04:08  arekm
+- rel 2
 
-Revision 1.29.2.17  2003/05/29 11:27:17  matkor
-- Version 3.0 alpha 4a. Ra prefix and minor fixes for Ra.
+Revision 1.95  2005/04/29 07:20:03  arekm
+- other alpha test
 
-Revision 1.29.2.16  2003/04/04 07:44:04  qboosh
-- removed unnecessary default _prefix, fixed mandir
+Revision 1.94  2005/04/28 22:06:55  arekm
+- try without rebuilding antlr related files
 
-Revision 1.29.2.15  2003/04/03 22:17:14  zytek
-- call me mastah...
+Revision 1.93  2005/04/26 21:37:27  arekm
+- antlr segfaults on alpha, try a workaround
 
-Revision 1.29.2.14  2003/04/02 17:19:47  zytek
-- BR: fam-devel
+Revision 1.92  2005/04/18 08:18:25  charles
+- updated to 3.2.0
+- BR: doxygen
+- cleanups, sorted Brs and %%files
 
-Revision 1.29.2.13  2003/01/17 08:37:58  matkor
-- Version Alpha 3. Comparing to Alpha 2 now capable to run simple python program ;)
+Revision 1.91  2005/03/23 11:35:24  spider
+- added german description
 
-Revision 1.29.2.12  2002/11/27 23:54:24  adgor
-- Removed redundant br
+Revision 1.90  2005/01/17 01:20:39  charles
+- updated to 3.1.2
+- removed Source0-size
+- added %find_lang and %files fix
 
-Revision 1.29.2.11  2002/11/27 23:39:39  adgor
-- Fixed %files
-- Enhanced %find_lang
-- Fixed source URL
-- Release 2
+Revision 1.89  2004/12/25 17:55:31  qboosh
+- cleanups
 
-Revision 1.29.2.10  2002/11/27 21:44:44  djurban
-- Updated to 3.0a2
-- Removed conflicting icons
-- Requires kde and qt >= 3.1 from now on
-- Docs still arent installed (findlang need fixing)
+Revision 1.88  2004/11/01 14:47:01  djurban
+- rebuild for the sport of it rel. 2
 
-Revision 1.29.2.9  2002/11/07 17:51:13  mkochano
-- Uncommented %%clean section. This is WRONG way!
+Revision 1.87  2004/10/31 19:07:49  djurban
+- rel. 1 for ac, stbring
 
-Revision 1.29.2.8  2002/10/28 21:29:03  adgor
-- Commented lang stuff
+Revision 1.86  2004/10/31 09:35:11  qboosh
+- more universal libsuffix (to catch ppc64/sparc64/s390x too)
 
-Revision 1.29.2.7  2002/10/26 20:16:30  djurban
-- Updated to kdevelop 3.0alpha1
-- Compiles and work fine therefore release 1
-- Disabled --enable-final
+Revision 1.85  2004/10/30 22:38:20  djurban
+- fix what might cause kde not to work on amd64 (reported by undefine) PLEASE add it to all KDE specs
 
-Revision 1.39  2002/08/29 22:55:36  blues
-- cut changelog
+Revision 1.84  2004/10/30 22:34:22  djurban
+- svn support enabled by default
 
-Revision 1.38  2002/08/29 22:53:37  blues
-- merge with DEVEL
+Revision 1.83  2004/10/30 21:55:17  djurban
+- more work being done
 
-Revision 1.29.2.6  2002/08/22 18:32:22  adgor
-- Requires: kdesdk-extractrc
-- Moved extractrc to %doc
-- Release 2
+Revision 1.82  2004/10/03 10:12:54  adgor
+- Typo
 
-Revision 1.29.2.5  2002/08/19 22:54:20  blues
-- forgot to add i18n files...
+Revision 1.81  2004/09/21 02:45:34  ankry
+- merged from AC-branch
 
-Revision 1.29.2.4  2002/08/19 22:52:22  blues
-- release 1 - finished
+Revision 1.80  2004/09/20 05:57:33  ankry
+- desktop fix
 
-Revision 1.29.2.3  2002/08/19 18:27:48  blues
-- 2.1.3 - started update
+Revision 1.79  2004/09/09 18:16:06  pluto
+- %%setup fixed.
 
-Revision 1.29.2.2  2002/08/15 13:34:17  blues
-- fixed typo
+Revision 1.78  2004/08/19 22:23:13  qboosh
+- removed duplicated BR and cp
+- don't leave invalid entries in files - they MUST be fixed
 
-Revision 1.29.2.1  2002/07/24 16:06:34  blues
-- release 1
-- better BR
+Revision 1.77  2004/08/18 11:24:20  djurban
+- merged devel, updated to 3.1.0, clear changelog, includes violation of FHS, will check if fixable.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdevelop.spec?r1=1.61.2.4&r2=1.61.2.5&f=u




More information about the pld-cvs-commit mailing list