diff --git a/.cvsignore b/.cvsignore index 92bcdbf..2b2d6be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ +admin-1.0.tar.gz c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 kdevelop-2.1.5_for_KDE_3.1.tar.bz2 diff --git a/kdevelop-2.1.5_for_KDE_3.1-doc.patch b/kdevelop-2.1.5_for_KDE_3.1-doc.patch new file mode 100644 index 0000000..c977cb7 --- /dev/null +++ b/kdevelop-2.1.5_for_KDE_3.1-doc.patch @@ -0,0 +1,19 @@ +--- kdevelop-2.1.5_for_KDE_3.1/configure.doc 2003-10-21 15:08:22.000000000 +0200 ++++ kdevelop-2.1.5_for_KDE_3.1/configure 2003-10-21 15:14:18.000000000 +0200 +@@ -23794,14 +23794,14 @@ + + kdelibs_docdirs="/usr/doc/kdelibs-doc/html" + if test "$ac_kde_htmldir" != ""; then +- kdelibs_docdirs="$kdelibs_docdirs $ac_kde_htmldir/default/kdelibs $ac_kde_htmldir/en/kdelibs" ++ kdelibs_docdirs="$kdelibs_docdirs $ac_kde_htmldir/default/kdelibs $ac_kde_htmldir/en/kdelibs $ac_kde_htmldir/en/kdelibs-apidocs" + fi + kdelibs_docdirs="$ac_kdelibs_docdirs $kdelibs_docdirs" + + kdelibs_docdir=NO + for i in $kdelibs_docdirs; + do +- for j in kdecore/index.html; ++ for j in index.html; + do + echo "configure: 23806: $i/$j" >&5 + if test -r "$i/$j"; then diff --git a/kdevelop.spec b/kdevelop.spec index d83afbb..bff592a 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -21,7 +21,7 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Version: 2.1.5 -Release: 6 +Release: 13 Epoch: 8 URL: http://www.kdevelop.org/ Group: Development/Tools @@ -32,6 +32,7 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}_for_K Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 Source2: kdevelop Source3: kdevelop-htdig.conf +Source4: admin-1.0.tar.gz Patch0: kdevelop-2.1beta1-gettext.patch Patch1: kdevelop-2.0.3-newline.patch @@ -42,10 +43,12 @@ Patch5: kdevelop-2.1.4-ansi.patch Patch6: kdevelop-2.1.5_for_KDE_3.1-combobox.patch Patch7: c_cpp_reference-2.0.2-config.patch Patch8: kde-libtool.patch +Patch9: kdevelop-2.1.5_for_KDE_3.1-gcc33.patch +Patch10: kdevelop-2.1.5_for_KDE_3.1-doc.patch Requires: kdelibs-devel >= 6:%{kde_version} Requires: make -Requires: perl >= 5.004 +Requires: perl >= 0:5.004 Requires: autoconf >= 2.13 Requires: automake >= 1.4 Requires: flex >= 2.5.4 @@ -102,10 +105,13 @@ individual needs. %patch6 -p1 -b .combo %patch7 -p0 -b .config %patch8 -p1 -b .libtool +%patch9 -p1 -b .gcc33 +%patch10 -p1 -b .doc %build export KDEDIR=%{_prefix} QTDIR="" && source /etc/profile.d/qt.sh +cp %{SOURCE4} kdevelop/templates/admin.tar.gz # Workaround for legacy auto* tools %if %{libtool} @@ -121,7 +127,7 @@ export FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE" %configure \ --with-qtdoc-dir=$QTDIR/doc/html/ \ - --with-kdelibsdoc-dir=%{_docdir}/kdelibs-devel-3 \ + --with-kdelibsdoc-dir=%{_docdir}/HTML/en/kdelibs-apidocs/ \ --with-qt-libraries=$QTDIR/lib \ --with-extra-libs=%{_libdir} @@ -213,6 +219,27 @@ desktop-file-install --vendor kde \ %lang(zu) %{_datadir}/locale/zu/LC_MESSAGES/kdevelop.mo %changelog +* Mon Oct 13 2003 Than Ngo 8:2.1.5-13 +- fix documention localtion + +* Wed Aug 20 2003 Than Ngo 8:2.1.5-12 +- fix build problem with gcc 3.3 + +* Wed Jun 25 2003 2.1.5-11 +- rebuilt + +* Tue Jun 10 2003 2.1.5-10 +- fix templates bug (bug #88718) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + +* Tue May 27 2003 2.1.5-7 +- rebuild + * Mon Feb 24 2003 Elliot Lee - rebuilt diff --git a/sources b/sources index 5d16ea6..a64b69e 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ +cfebc75d845eb7a0b68bdd7b35986e45 admin-1.0.tar.gz 5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 8953caa03c22aabe6707ca494a0d4a41 kdevelop-2.1.5_for_KDE_3.1.tar.bz2