From e8abf626618fda307e78be6ffce8da11dbd2060b Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:59:33 +0000 Subject: auto-import changelog data from kdevelop-3.0.0r1-0.1.src.rpm 3.0.0r1-0.1 - 3.2 RC1 3.0.0b2-0.3 - included BuildRequires: db4-devel 3.0.0b2-0.2 - 3.0.0 Beta 2 respin 3.0.0b2-0.1 - 3.0.0 Beta 2 - remove unneeded files: kdevelop-htdig.conf, admin-1.0.tar.gz 3.0.0b1-0.2 - get rid of rpath 3.0.0b1-0.1 - 3.0.0 Beta1 - po files moved in kde-i18n - cleanup Tue Oct 21 2003 Florian La Roche - add a %clean specfile target --- diff --git a/.cvsignore b/.cvsignore index 2b2d6be..1e6e58b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -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 +kdevelop-3.0.0r1.tar.bz2 diff --git a/kdevelop.spec b/kdevelop.spec index bff592a..4c77075 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,50 +1,31 @@ %define isClean 1 %define debug 0 - -%define build_for_ftp 0 - -%define strip_bin 0 %define final 0 %define rpm_clean 1 -%define desktop_file 1 -%define desktop_file_utils_version 0.2.93 - -%define kde_version 3.1 -%define qt_version 3.1.1 +%define kde_version 3.1.95 +%define qt_version 3.2.2 %define libtool 0 -%define debug_package %{nil} - Name: kdevelop Summary: Integrated Development Environment for C++/C -Version: 2.1.5 -Release: 13 +Version: 3.0.0r1 +Release: 0.1 Epoch: 8 URL: http://www.kdevelop.org/ Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-buildroot License: GPL -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}_for_KDE_3.1.tar.bz2 +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{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 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 -Patch2: kdevelop-2.0.1-font-i18n-20010922.diff -Patch3: kdevelop-2.1-gcc31.patch -Patch4: kdevelop-2.1.3_for_KDE_3.0-redhat.patch -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 + +Patch1: c_cpp_reference-2.0.2-config.patch +Patch2: kde-libtool.patch +Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch Requires: kdelibs-devel >= 6:%{kde_version} Requires: make @@ -54,19 +35,11 @@ Requires: automake >= 1.4 Requires: flex >= 2.5.4 Requires: qt-designer >= 1:%{qt_version} -%if %{desktop_file} -BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} -%endif - -%if %{build_for_ftp} -ExclusiveArch: %{ix86} -%endif - BuildPrereq: autoconf BuildPrereq: automake BuildPrereq: libtool BuildPrereq: kdelibs-devel >= %{kde_version} - +BuildRequires: db4-devel Obsoletes: kdevelop-c_c++_ref %description @@ -94,24 +67,15 @@ development by adding it to the "Tools"-menu according to your individual needs. %prep -%setup -q -n %{name}-%{version}_for_KDE_3.1 -a1 - -%patch0 -p1 -b .gettext -%patch1 -p1 -b .newline -%patch2 -p1 -b .fonts -%patch3 -p1 -b .gcc31 -%patch4 -p1 -b .redhat -%patch5 -p1 -b .ansi -%patch6 -p1 -b .combo -%patch7 -p0 -b .config -%patch8 -p1 -b .libtool -%patch9 -p1 -b .gcc33 -%patch10 -p1 -b .doc + +%setup -q -a1 +%patch1 -p0 -b .config +%patch2 -p1 -b .libtool +%patch3 -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} @@ -126,6 +90,10 @@ make -f Makefile.cvs export FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE" %configure \ + --disable-rpath \ +%if %{final} + --enable-final \ +%endif --with-qtdoc-dir=$QTDIR/doc/html/ \ --with-kdelibsdoc-dir=%{_docdir}/HTML/en/kdelibs-apidocs/ \ --with-qt-libraries=$QTDIR/lib \ @@ -147,78 +115,53 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=$RPM_BUILD_ROOT install -mv $RPM_BUILD_ROOT%{_bindir}/kdevelop \ - $RPM_BUILD_ROOT%{_bindir}/kdevelop-%{version} - -install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ -install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/apps/kdevelop/tools/htdig.conf - -perl -pi -e "s/\@VERSION\@/%{version}/g" $RPM_BUILD_ROOT%{_bindir}/kdevelop +# remove duplicat, konflict with kdelibs +rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/text/x-pascal.desktop -# 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 \ - --delete-original \ - --add-category "Application;Development;X-Red-Hat-Base" \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Development/kdevelop.desktop - -desktop-file-install --vendor kde \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --delete-original \ - --add-category "Application;Development;X-Red-Hat-Extra" \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Development/kdevelop-setup.desktop -%endif +%clean +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc %{_docdir}/HTML/en/%{name} +%doc %{_docdir}/HTML/en/* %{_bindir}/* -%{_libdir}/libkdevel* -%{_datadir}/apps/%{name} -%{_datadir}/apps/kconf_update/kdevelop2.upd -%{_datadir}/mimelnk/application/* -%if %{desktop_file} -%{_datadir}/applications/* -%else +%{_libdir}/kde3/* +%{_libdir}/lib* +%{_includedir}/* %{_datadir}/applnk/Development/* -%endif -%{_datadir}/icons/*/*/apps/* -%lang(af) %{_datadir}/locale/af/LC_MESSAGES/kdevelop.mo -%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/kdevelop.mo -%lang(az) %{_datadir}/locale/az/LC_MESSAGES/kdevelop.mo -%lang(da) %{_datadir}/locale/da/LC_MESSAGES/kdevelop.mo -%lang(de) %{_datadir}/locale/de/LC_MESSAGES/kdevelop.mo -%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/kdevelop.mo -%lang(es) %{_datadir}/locale/es/LC_MESSAGES/kdevelop.mo -%lang(et) %{_datadir}/locale/et/LC_MESSAGES/kdevelop.mo -%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/kdevelop.mo -%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/kdevelop.mo -%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/kdevelop.mo -%lang(id) %{_datadir}/locale/id/LC_MESSAGES/kdevelop.mo -%lang(is) %{_datadir}/locale/is/LC_MESSAGES/kdevelop.mo -%lang(it) %{_datadir}/locale/it/LC_MESSAGES/kdevelop.mo -%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/kdevelop.mo -%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/kdevelop.mo -%lang(no) %{_datadir}/locale/nb/LC_MESSAGES/kdevelop.mo -%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/kdevelop.mo -%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/kdevelop.mo -%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/kdevelop.mo -%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/kdevelop.mo -%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/kdevelop.mo -%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/kdevelop.mo -%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/kdevelop.mo -%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/kdevelop.mo -%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/kdevelop.mo -%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/kdevelop.mo -%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/kdevelop.mo -%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/kdevelop.mo -%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/kdevelop.mo -%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/kdevelop.mo -%lang(zu) %{_datadir}/locale/zu/LC_MESSAGES/kdevelop.mo +%{_datadir}/apps/* +%config %{_datadir}/config/* +%{_datadir}/icons/*/*/*/* +%{_datadir}/mimelnk/application/* +%{_datadir}/mimelnk/text/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* %changelog +* Thu Jan 22 2004 Than Ngo 8:3.0.0r1-0.1 +- 3.2 RC1 + +* Wed Dec 10 2003 Than Ngo 8:3.0.0b2-0.3 +- included BuildRequires: db4-devel + +* Tue Dec 02 2003 Than Ngo 8:3.0.0b2-0.2 +- 3.0.0 Beta 2 respin + +* Mon Dec 01 2003 Than Ngo 8:3.0.0b2-0.1 +- 3.0.0 Beta 2 +- remove unneeded files: kdevelop-htdig.conf, admin-1.0.tar.gz + +* Thu Nov 27 2003 Than Ngo 8:3.0.0b1-0.2 +- get rid of rpath + +* Thu Nov 13 2003 Than Ngo 8:3.0.0b1-0.1 +- 3.0.0 Beta1 +- po files moved in kde-i18n +- cleanup + +* Tue Oct 21 2003 Florian La Roche +- add a %%clean specfile target + * Mon Oct 13 2003 Than Ngo 8:2.1.5-13 - fix documention localtion diff --git a/sources b/sources index a64b69e..7c5aa8d 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -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 +c3d8e6ce937499f2432cd264b962f113 kdevelop-3.0.0r1.tar.bz2