From e5a8164257a44c539188603fac8e4f07db28bfc7 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:57:57 +0000 Subject: auto-import changelog data from kdevelop-2.1.2-3.src.rpm Mon Aug 05 2002 Than Ngo 2.1.2-3 - fixed desktop file issue Tue Jul 23 2002 Tim Powers - build using gcc-3.2-0.1 Tue Jul 09 2002 Than Ngo 2.1.2-1 - 2.1.2 for kde 3.0.2 - use desktop-file-install Fri Jun 21 2002 Tim Powers - automated rebuild Wed Jun 19 2002 Than Ngo 2.1.1-2 - don't forcibly strip binaries Sun Jun 02 2002 Than Ngo 2.1.1-1 - 2.1.1 Sun May 26 2002 Tim Powers - automated rebuild Thu May 23 2002 Bernhard Rosenkraenzer 2.1-3 - Use automake15 --- diff --git a/.cvsignore b/.cvsignore index 16e46a8..3624a7f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ c_cpp_reference-2.0.1.tar.bz2 -kdevelop-2.1.tar.bz2 +kdevelop-2.1.2_for_KDE_3.0.tar.bz2 diff --git a/kdevelop.spec b/kdevelop.spec index 43cf9f7..1666ef6 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,25 +1,21 @@ +%define desktop_file 1 +%define desktop_file_utils_version 0.2.93 %define kdeprefix /usr %define DATE 20020326 %define sourcedir unstable/%{version}/distribution/tar/generic/source -Version: 2.1 -%define rel 2 +Version: 2.1.2 +%define rel 3 %define is_release 1 -%define beta %{nil} Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 8 -%if %{is_release} -%if "%{beta}" -Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{version}%{beta}_for_KDE_3.0.tar.bz2 -Release: 0.%{beta}.%{rel} -%else -Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{version}.tar.bz2 +%if %{is_release} +Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{version}_for_KDE_3.0.tar.bz2 Release: %{rel} -%endif %else Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{DATE}.tar.bz2 -Release: 0.cvs%{DATE}.%{rel} +Release: 2.cvs%{DATE}.%{rel} %endif Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.1.tar.bz2 Source2: kdevelop @@ -28,15 +24,19 @@ Patch0: kdevelop-2.1beta1-gettext.patch Patch1: kdevelop-2.1beta1-kde3.patch Patch2: kdevelop-2.0.2-newline.patch Patch3: kdevelop-2.0.1-font-i18n-20010922.diff +Patch4: kdevelop-2.1-gcc31.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 +%if %{desktop_file} +BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} +%endif BuildPrereq: autoconf, automake, libtool, kdelibs-devel >= 3.0.0 +BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} Obsoletes: kdevelop-c_c++_ref -Source900: gccver.c %description The KDevelop Integrated Development Environment provides many features @@ -64,22 +64,24 @@ individual needs. %prep %if %{is_release} -%if "%{beta}" -%setup -q -n %{name}-%{version}%{beta}_for_KDE_3.0 -a1 -%else -%setup -q -n %{name}-%{version} -a1 -%endif +%setup -q -n %{name}-%{version}_for_KDE_3.0 -a1 %else %setup -q -n %{name} -a1 %endif %patch0 -p1 -b .gettext -%patch1 -p1 -b .config +#%patch1 -p1 -b .config %patch2 -p1 -b .newline %patch3 -p1 -b .fonts +%patch4 -p1 -b .gcc31 rm -rf parts/javasupport %build +# We need automake 1.5... +ln -s /usr/bin/automake-1.5 automake +ln -s /usr/bin/aclocal-1.5 aclocal +export PATH=`pwd`:$PATH + export KDEDIR=%{kdeprefix} QTDIR="" && source /etc/profile.d/qt.sh FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE" @@ -92,10 +94,6 @@ CXXFLAGS="$FLAGS" CFLAGS="$FLAGS" \ --with-qtdoc-dir=$QTDIR/doc/html/ \ --with-kdelibsdoc-dir=%{_docdir}/kdelibs-devel-3/ \ --enable-debug -gcc -o gccver %{SOURCE900} -if [ "0`./gccver`" -lt 3001 ]; then - find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g" -fi make @@ -110,7 +108,7 @@ cd - %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install-strip +make 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} @@ -118,18 +116,55 @@ install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{kdeprefix}/bin/ install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{kdeprefix}/share/apps/kdevelop/tools/htdig.conf perl -pi -e "s/\@VERSION\@/%{version}/g" $RPM_BUILD_ROOT%{kdeprefix}/bin/kdevelop +# start desktop-file-install +%if %{desktop_file} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +desktop-file-install --vendor kde \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;Development;X-Red-Hat-Extra" \ + $RPM_BUILD_ROOT%{_datadir}/applnk/*/* +%endif + %files %defattr(-,root,root) %{kdeprefix}/bin/* %{kdeprefix}/lib/* %{kdeprefix}/share/apps/%{name} %{kdeprefix}/share/mimelnk/application/* -%{kdeprefix}/share/applnk/Development/kdevelop.desktop -%{kdeprefix}/share/applnk/Development/kdevelop-setup.desktop +%if %{desktop_file} +%{_datadir}/applications/* +%else +%{_datadir}/applnk/*/* +%endif %{kdeprefix}/share/icons/*/*/apps/* %doc %{kdeprefix}/share/doc/HTML/en/%{name} %changelog +* Sun Aug 5 2002 Than Ngo 2.1.2-3 +- fixed desktop file issue + +* Tue Jul 23 2002 Tim Powers +- build using gcc-3.2-0.1 + +* Tue Jul 09 2002 Than Ngo 2.1.2-1 +- 2.1.2 for kde 3.0.2 +- use desktop-file-install + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 19 2002 Than Ngo 2.1.1-2 +- don't forcibly strip binaries + +* Sun Jun 2 2002 Than Ngo 2.1.1-1 +- 2.1.1 + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Bernhard Rosenkraenzer 2.1-3 +- Use automake15 + * Tue Apr 16 2002 Bernhard Rosenkraenzer 2.1-2 - Change sonames diff --git a/sources b/sources index 3277db9..8718b94 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 4e889aed26017489741f56cca9973025 c_cpp_reference-2.0.1.tar.bz2 -5f566235433f6285896b1537f1055f71 kdevelop-2.1.tar.bz2 +b644aec61fedd8af5ef2305a09d1e2df kdevelop-2.1.2_for_KDE_3.0.tar.bz2