rpms/kdevelop/devel .cvsignore, 1.35, 1.36 kdevelop.spec, 1.88, 1.89 sources, 1.39, 1.40 c_cpp_reference-2.0.2-config.patch, 1.1, NONE kdevelop-2.1.5_for_KDE_3.1-doc.patch, 1.1, NONE kdevelop-3.5.2-kde4template.patch, 1.2, NONE kdevelop-3.5.4-gcc-44.patch, 1.1, NONE
Ben Boeckel
mathstuf at fedoraproject.org
Tue Sep 29 23:32:35 UTC 2009
Author: mathstuf
Update of /cvs/pkgs/rpms/kdevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27473
Modified Files:
.cvsignore kdevelop.spec sources
Removed Files:
c_cpp_reference-2.0.2-config.patch
kdevelop-2.1.5_for_KDE_3.1-doc.patch
kdevelop-3.5.2-kde4template.patch kdevelop-3.5.4-gcc-44.patch
Log Message:
Update to KDevelop4 beta 5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore 30 Aug 2008 15:27:43 -0000 1.35
+++ .cvsignore 29 Sep 2009 23:32:34 -0000 1.36
@@ -1,2 +1 @@
-c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-kdevelop-3.5.3.tar.bz2
+kdevelop-3.9.95.tar.bz2
Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- kdevelop.spec 12 Sep 2009 23:53:23 -0000 1.88
+++ kdevelop.spec 29 Sep 2009 23:32:35 -0000 1.89
@@ -1,87 +1,26 @@
-%define _default_patch_fuzz 2
-
-%define debug 0
-%define final 1
-
-%define kde_version 3.5.9
-%define qt_version 3.3.8b
-# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
-#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
-%define qt_ver %{qt_version}
-
-%define make_cvs 1
-
Name: kdevelop
Summary: Integrated Development Environment for C++/C
Epoch: 9
-Version: 3.5.4
-Release: 6%{?dist}
+Version: 3.9.95
+Release: 0.1.beta5%{?dist}
License: GPLv2
URL: http://www.kdevelop.org/
Group: Development/Tools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/ide/%{name}-%{version}.tar.bz2
-Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/kdevelop/%{version}/src/%{name}-%{version}.tar.bz2
-Patch1: c_cpp_reference-2.0.2-config.patch
-Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch
-Patch3: kdevelop-3.5.4-gcc-44.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
-
-Provides: kdevelop3 = %{version}-%{release}
-
-Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: kdelibs3-devel >= %{kde_version}
-# embedded konsole (#507653)
-Requires: kdebase3
-Requires: make
-Requires: perl
-Requires: automake libtool
-Requires: flex >= 2.5.4
-%if 0%{?fedora} < 9
-Requires: qt-designer
-%else
-Requires: qt3-designer
-%endif
-Requires: gettext
-Requires: ctags
-## Skip these, for now -- Rex
-#Requires(hint): htdig
-#Source3: kdevelop-htdig.conf
-#Requires(hint): kdelibs3-apidocs
-#Requires(hint): ark
-
-%if %{make_cvs}
-BuildRequires: automake libtool
-%endif
-BuildRequires: kdelibs3-devel >= %{kde_version}
-BuildRequires: kdelibs3-apidocs
-%if 0%{?fedora} < 9
-BuildRequires: qt-devel-docs
-%else
-BuildRequires: qt3-devel-docs
-%endif
-BuildRequires: db4-devel
-BuildRequires: flex
-# FIXME: No CVS support in KDevelop? This is going to suck...
-# Requires kdesdk3.
-%if 0%{?fedora} < 9
-# for cvs plugin
-BuildRequires: kdesdk3-devel
-%endif
-BuildRequires: subversion-devel neon-devel
-# looks like this is dragged in by apr-devel (dep of subversion-devel), but not
-# a dependency
-BuildRequires: openldap-devel
+Requires: kdevplatform
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-## ancient, deprecated? -- Rex
-#Obsoletes: kdevelop-c_c++_ref
+BuildRequires: kdevplatform-devel >= 0.9.91
+BuildRequires: kdelibs4-devel >= 4.2.0
+BuildRequires: pcre-devel
+BuildRequires: giflib-devel
+BuildRequires: boost-devel >= 1.35.0
+BuildRequires: valgrind-devel
+BuildRequires: kdebase-workspace-devel
%description
The KDevelop Integrated Development Environment provides many features
@@ -107,140 +46,87 @@ with KIconEdit; The inclusion of any oth
development by adding it to the "Tools"-menu according to your
individual needs.
+
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Provides: kdevelop3-devel = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kdelibs3-devel
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
%description devel
%{summary}.
+
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-Requires: kdelibs3 >= %{version}
+Requires: kdelibs4 >= %{version}
# helps multilib upgrades
-Obsoletes: kdevelop < 9:3.5.4-6
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
%description libs
%{summary}.
-
%prep
-
-%setup -q -a1
-%patch1 -p0 -b .config
-%patch2 -p1 -b .doc
-%patch3 -p1 -b .gcc44
-%patch4 -p1 -b .kde4template
-
-%if %{make_cvs}
-# hack/fix for newer automake
- sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
- rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
- cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/
- make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
- make -f admin/Makefile.common cvs
-%endif
+%setup -q -n kdevelop-%{version}
%build
-QTDIR="" && source /etc/profile.d/qt.sh
-
-# c references
-pushd c_cpp_reference-2.0.2_for_KDE_3.0
-%configure \
- --with-qt-libraries=$QTDIR/lib \
- --with-qt-includes=$QTDIR/include \
- --with-extra-libs=%{_libdir}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
popd
-
-%configure \
- --enable-new-ldflags \
- --disable-dependency-tracking \
- --disable-rpath \
-%if %{debug} == 0
- --disable-debug \
- --disable-warnings \
-%endif
-%if %{final}
- --enable-final \
-%endif
- --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_ver}/html/ \
- --with-kdelibsdoc-dir=%{_docdir}/HTML/en/kdelibs-apidocs/ \
- --with-extra-libs=%{_libdir}
-
-# parallel make disabled because otherwise main.cpp can get built before
-# profileeditorbase.h is fully generated
-make
-make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
%install
rm -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+rm -f %{buildroot}/%{_kde4_datadir}/kde4/apps/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2
-make DESTDIR=%{buildroot} install
-make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=%{buildroot} install
-
-# remove useless files
-rm -rf %{buildroot}%{_prefix}/kdevbdb
+%clean
+rm -rf %{buildroot}
-%post
-for f in hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%clean
-rm -rf %{buildroot}
-
-
%files
%defattr(-,root,root,-)
-%{_docdir}/HTML/en/*
-%{_bindir}/*
-%{_libdir}/kde3/*
-%{_libdir}/kconf_update_bin/*
-%{_datadir}/applications/kde/*
-%{_datadir}/apps/*
-%{_datadir}/config/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/application/*
-%{_datadir}/mimelnk/text/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
+%doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog TODO NEWS
+%{_kde4_bindir}/kdevelop
+%{_kde4_datadir}/config/kdeveloprc
+%{_kde4_datadir}/kde4/apps/*
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/applications/kde4/kdevelop.desktop
%files libs
%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
+%{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/kde4/*
%files devel
%defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%{_includedir}/*
+%{_kde4_includedir}/kdevelop/
%changelog
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 9:3.9.95-0.1.beta5
+- Upgrade to 3.9.95
+
+* Sat Feb 21 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 9:3.9.91-0.2.20090221svn929503
+- Post KDevelop 4 Beta 1 snapshot
+
+* Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 9:3.9.85.1
+- 4.0 snapshot
+- BR cmake >= 2.6.2
+- make install/fast
+
* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> 9:3.5.4-6
- make -libs unconditional
- Requires: kdebase3 (#507653)
@@ -325,7 +211,7 @@ rm -rf %{buildroot}
- make qt-devel-doc/qt_ver detection more robust
* Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 9:3.4.1-1
-- cleanup
+- cleanup
* Thu Jun 14 2007 Than Ngo <than at redhat.com> - 9:3.4.1-1.fc7
- 3.4.1
@@ -360,7 +246,7 @@ rm -rf %{buildroot}
* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 9:3.3.1-1.1
- rebuilt for new gcc4.1 snapshot and glibc changes
-* Sun Feb 05 2006 Than Ngo <than at redhat.com> 9:3.3.1-1
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 9:3.3.1-1
- 3.3.1
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
@@ -420,7 +306,7 @@ rm -rf %{buildroot}
* Thu Sep 02 2004 Than Ngo <than at redhat.com> 3.1.0-2
- remove kdevelop-gdb_shared_library.patch, it's include in new upstream
-- cleanup specfile
+- cleanup specfile
* Wed Sep 01 2004 Than Ngo <than at redhat.com> 3.1.0-1
- update to 3.1.0
@@ -428,7 +314,7 @@ rm -rf %{buildroot}
* Tue Aug 10 2004 Than Ngo <than at redhat.com> 3.1.0-0.1.rc2
- update to 3.1.0 rc2
-* Sat Jun 19 2004 Than Ngo <than at redhat.com> 3.0.4-1
+* Sat Jun 19 2004 Than Ngo <than at redhat.com> 3.0.4-1
- update to 3.0.4
* Thu Apr 15 2004 Than Ngo <than at redhat.com> 3.0.3-2
@@ -680,79 +566,79 @@ rm -rf %{buildroot}
- updated to 1.4beta1 with KDE2 support
- fixed to build on s390
- fixed some broken codes
-
+
* Fri Dec 8 2000 Than Ngo <than at redhat.com>
- fixed for building on ia64
-
+
* Wed Nov 15 2000 Than Ngo <than at redhat.com>
- build snapshot 20001112, it works now with KDE2 and kde1-compat
- fix libtool to build on sparc and alpha
- don't use make -j
-
+
* Sun Aug 13 2000 Than Ngo <than at redhat.com>
- fix kdelibsdoc-dir to show kdelibs-1.1.2 html docu correct
-
+
* Tue Aug 01 2000 Than Ngo <than at redhat.de>
- add missing ldconfig in %post and %postun section (Bug #14924)
- add missing C references stuff to kdevelop
-
+
* Sun Jul 30 2000 Than Ngo <than at redhat.de>
- rebuilt against compat-egcs-c++, put KDE1 under /usr
- cleanup specfile
-
+
* Tue Jul 25 2000 Than Ngo <than at redhat.de>
- fix dependency problem
-
+
* Wed Jul 19 2000 Than Ngo <than at redhat.de>
- rebuilt against compat-libstdc++
-
+
* Mon Jul 17 2000 Than Ngo <than at redhat.de>
- install under /usr/share instead /usr/lib/kde1-compat/share,
fix dependency problem
-
+
* Sat Jul 15 2000 Than Ngo <than at redhat.de>
- rebuilt with egcs-c++-1.1.2
* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
-
+
* Mon Jul 03 2000 Than Ngo <than at redhat.de>
- fix docdir
- add requires kdebase
-
+
* Sun Jul 02 2000 Than Ngo <than at redhat.de>
- rebuilt with kde1-compat
-
+
* Sun Jun 18 2000 Than Ngo <than at redhat.de>
- rebuilt in the new build environment, fix docdir
- FHS packaging
-
+
* Thu Jun 08 2000 Than Ngo <than at redhat.de>
- update to 1.2
- move from powertools to main CD
- use %%configure
-
+
* Mon Apr 3 2000 Ngo Than <than at redhat.de>
- fix up reference (Bug #10368)
-
+
* Tue Feb 15 2000 Bernhard Rosenkränzer <bero at redhat.com>
- Fix up documentation path (Bug #7291)
- Update to current stable branch - this should fix up the debugger problem
- clean up spec file
-
+
* Fri Jan 6 2000 Bernhard Rosenkränzer <bero at redhat.com>
- Update to current stable branch
- Adapt to 6.2 Qt libraries
- Use BuildPrereq
-
+
* Wed Jan 05 2000 Ngo Than <than at redhat.de>
- added patch for alpha
-
+
* Tue Dec 21 1999 Ngo Than <than at redhat.de>
- updated kdevelop-1.0 release
-
+
* Tue Nov 16 1999 Preston Brown <pbrown at redhat.com>
- kdevelop 1.0beta4.1, docdir added, using DESTDIR env. variable.
-
+
* Thu Sep 09 1999 Preston Brown <pbrown at redhat.com>
- initial packaging for 6.1.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources 18 Dec 2008 11:48:20 -0000 1.39
+++ sources 29 Sep 2009 23:32:35 -0000 1.40
@@ -1,2 +1 @@
-5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-06aa12a89b2c09968a92e1d8b575819c kdevelop-3.5.4.tar.bz2
+70064ad0e285d29242a90af3f3c2283f kdevelop-3.9.95.tar.bz2
--- c_cpp_reference-2.0.2-config.patch DELETED ---
--- kdevelop-2.1.5_for_KDE_3.1-doc.patch DELETED ---
--- kdevelop-3.5.2-kde4template.patch DELETED ---
--- kdevelop-3.5.4-gcc-44.patch DELETED ---
More information about the fedora-extras-commits
mailing list