From 1eaff19a7f3af73710c26991ec29a45dfd4ace6a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:57:28 +0000 Subject: auto-import changelog data from kdevelop-2.1-0.beta2.1.src.rpm Fri Mar 08 2002 Than Ngo 2.1beta2-1 - update to 2.1beta2 --- diff --git a/.cvsignore b/.cvsignore index 97c0721..bcea340 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -c_cpp_reference-2.0.tar.bz2 -kdevelop-2.0.2.tar.bz2 +c_cpp_reference-2.0.1.tar.bz2 +kdevelop-2.1beta2.tar.bz2 diff --git a/kdevelop.spec b/kdevelop.spec index 9a0fe9e..5879911 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,17 +1,17 @@ %define kdeprefix /usr %define DATE 20010805 %define sourcedir unstable/%{version}/distribution/tar/generic/source -Version: 2.0.2 -%define rel 3 +Version: 2.1 +%define rel 1 %define is_release 1 -%define beta %{nil} +%define beta beta2 Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 7 %if %{is_release} %if "%{beta}" != "" -Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{version}-%{beta}.tar.bz2 +Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{version}%{beta}.tar.bz2 Release: 0.%{beta}.%{rel} %else Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{version}.tar.bz2 @@ -21,19 +21,18 @@ Release: %{rel} Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{DATE}.tar.bz2 Release: 0.cvs%{DATE}.%{rel} %endif -Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.tar.bz2 +Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.1.tar.bz2 Source2: kdevelop Source3: kdevelop-htdig.conf -Patch: kdevelop-2.0-kdedoc.patch -Patch1: http://www.kde.gr.jp/patch/kdevelop-2.0.1-font-i18n-20010922.diff -Patch2: kdevelop-2.0.2-fonts.patch +Patch0: kdevelop-2.1beta1-gettext.patch +Patch1: kdevelop-2.1beta1-kde3.patch URL: http://www.kdevelop.org/ Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-buildroot License: GPL Requires: kdelibs-devel, make, perl >= 5.004, autoconf >= 2.13 Requires: automake >= 1.4 flex >= 2.5.4, qt-designer -BuildPrereq: autoconf, automake, libtool, kdelibs-devel +BuildPrereq: autoconf, automake, libtool, kdelibs-devel >= 3.0.0 Obsoletes: kdevelop-c_c++_ref %description @@ -62,13 +61,16 @@ individual needs. %prep %if %{is_release} +%if "%{beta}" != "" +%setup -q -n %{name}-%{version}%{beta} -a1 +%else %setup -q -n %{name}-%{version} -a1 -%patch -p1 -b .kdedoc -%patch1 -p1 -b .i18n-font -%patch2 -p1 -b .font +%endif %else %setup -q -n %{name} -a1 %endif +%patch0 -p1 -b .gettext +%patch1 -p1 -b .config rm -rf parts/javasupport %build @@ -82,13 +84,13 @@ CXXFLAGS="$FLAGS" CFLAGS="$FLAGS" \ ./configure --prefix=$KDEDIR \ --enable-kdoc2 \ --with-qtdoc-dir=$QTDIR/doc/html/ \ - --with-kdelibsdoc-dir=%{_docdir}/kdelibs-devel-2/ \ + --with-kdelibsdoc-dir=%{_docdir}/kdelibs-devel-3/ \ --enable-debug make # c references -cd c_cpp_reference-2.0 +cd c_cpp_reference-2.0.1 cp -f /usr/share/libtool/config* . mkdir -p admin && cp ../admin/am_edit admin/ autoconf @@ -99,7 +101,7 @@ cd - rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install-strip -make -C c_cpp_reference-2.0 DESTDIR=$RPM_BUILD_ROOT install +make -C c_cpp_reference-2.0.1 DESTDIR=$RPM_BUILD_ROOT install mv $RPM_BUILD_ROOT%{kdeprefix}/bin/kdevelop $RPM_BUILD_ROOT%{kdeprefix}/bin/kdevelop-%{version} install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{kdeprefix}/bin/ @@ -118,19 +120,25 @@ perl -pi -e "s/\@VERSION\@/%{version}/g" $RPM_BUILD_ROOT%{kdeprefix}/bin/kdevelo %doc %{kdeprefix}/share/doc/HTML/en/%{name} %changelog -* Wed Feb 21 2002 Than Ngo 2.0.2-3 -- fixed Strange characters appear in the output window (bug #59217) -- fixed return-line feed sign in Kdevelop setup tool (bug #55032) +* Wed Mar 8 2002 Than Ngo 2.1beta2-1 +- update to 2.1beta2 -* Thu Nov 15 2001 Than Ngo 2.0.2-1 -- add patch to show non lattin1 font in build-in editor correct (bug #54457) -- fix a bug in creating documentation index when running KDevelop Setup (bug #52760) +* Wed Jan 16 2002 Than Ngo 2.1beta1-2 +- rebuild against new kdelibs + +* Wed Jan 9 2002 Than Ngo 2.1beta1-1 +- update to 2.1 beta1 +- fix build against gcc 3 +- fix some typo bugs +- get rid of libkfile +- update c_cpp_reference to 2.0.1 -* Thu Nov 15 2001 Bernhard Rosenkraenzer 2.0.2-1 -- 2.0.2 +* Mon Oct 22 2001 Than Ngo 2.0-1 +- add patch to show non lattin1 font in build-in editor correct (bug #54457) -* Sat Sep 15 2001 Bernhard Rosenkraenzer 2.0.1-1 -- 2.0.1 +* Sat Sep 22 2001 Than Ngo 2.0-2 +- fix a bug in creating documentation index when running KDevelop Setup (bug #52760) +- backport some major bugfixes from 2.0.1 * Mon Jul 30 2001 Bernhard Rosenkraenzer 2.0-0.cvs20010730.1 - Don't crash on startup diff --git a/sources b/sources index 19015ae..d498af4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2c2b27541e790188b255b506399cb2ff c_cpp_reference-2.0.tar.bz2 -ba97e043cd6819c8bd77e342ee0af6fc kdevelop-2.0.2.tar.bz2 +4e889aed26017489741f56cca9973025 c_cpp_reference-2.0.1.tar.bz2 +03572fde1919b68d0acf4749eca2d88c kdevelop-2.1beta2.tar.bz2