diff --git a/.cvsignore b/.cvsignore index 872d917..92bcdbf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -c_cpp_reference-2.0.1.tar.bz2 -kdevelop-2.1.3_for_KDE_3.0.tar.bz2 +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/c_cpp_reference-2.0.2-config.patch b/c_cpp_reference-2.0.2-config.patch new file mode 100644 index 0000000..3d534df --- /dev/null +++ b/c_cpp_reference-2.0.2-config.patch @@ -0,0 +1,11 @@ +--- c_cpp_reference-2.0.2_for_KDE_3.0/configure.orig Mon Dec 9 18:35:50 2002 ++++ c_cpp_reference-2.0.2_for_KDE_3.0/configure Mon Dec 9 18:41:16 2002 +@@ -5868,7 +5868,7 @@ + So, check this please and use another prefix!" 1>&2; exit 1; } + fi + +-kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib" ++kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib64 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib" + test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs" + kde_libdirs="$ac_kde_libraries $kde_libdirs" + diff --git a/kdevelop.spec b/kdevelop.spec index 10ea8e0..d83afbb 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,49 +1,69 @@ +%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 kdeprefix /usr -%define DATE 20020326 -%define rel 3 -%define is_release 1 + +%define kde_version 3.1 +%define qt_version 3.1.1 + +%define libtool 0 + +%define debug_package %{nil} Name: kdevelop Summary: Integrated Development Environment for C++/C +Version: 2.1.5 +Release: 6 Epoch: 8 -Version: 2.1.3 -%define sourcedir unstable/%{version}/distribution/tar/generic/source -%if %{is_release} -Source: ftp://ftp.kde.org/pub/kde/{sourcedir}/%{name}-%{version}_for_KDE_3.0.tar.bz2 -Release: %{rel} -%else -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.1.tar.bz2 -Source2: kdevelop -Source3: kdevelop-htdig.conf -Patch0: kdevelop-2.1beta1-gettext.patch -Patch1: kdevelop-2.1beta1-kde3.patch -Patch2: kdevelop-2.0.3-newline.patch -Patch3: kdevelop-2.0.1-font-i18n-20010922.diff -Patch4: kdevelop-2.1-gcc31.patch -Patch5: kdevelop-2.1.3_for_KDE_3.0-redhat.patch URL: http://www.kdevelop.org/ Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-buildroot License: GPL -Requires: kdelibs-devel + +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}_for_KDE_3.1.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 + +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 + +Requires: kdelibs-devel >= 6:%{kde_version} Requires: make Requires: perl >= 5.004 Requires: autoconf >= 2.13 Requires: automake >= 1.4 Requires: flex >= 2.5.4 -Requires: qt-designer +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 >= 3.0.3 +BuildPrereq: kdelibs-devel >= %{kde_version} + Obsoletes: kdevelop-c_c++_ref %description @@ -71,91 +91,177 @@ development by adding it to the "Tools"-menu according to your individual needs. %prep -%if %{is_release} -%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 -%patch2 -p1 -b .newline -%patch3 -p1 -b .fonts -%patch4 -p1 -b .gcc31 -%patch5 -p1 -b .redhat +%setup -q -n %{name}-%{version}_for_KDE_3.1 -a1 -rm -rf parts/javasupport +%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 %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} +export KDEDIR=%{_prefix} QTDIR="" && source /etc/profile.d/qt.sh -FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE" -test -f Makefile.cvs && make -f Makefile.cvs +# Workaround for legacy auto* tools +%if %{libtool} +[ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf +[ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5? autoheader +[ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal +[ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake +export PATH=`pwd`:$PATH +make -f Makefile.cvs +%endif + +export FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE" -CXXFLAGS="$FLAGS" CFLAGS="$FLAGS" \ -./configure --prefix=$KDEDIR \ - --enable-kdoc2 \ +%configure \ --with-qtdoc-dir=$QTDIR/doc/html/ \ - --with-kdelibsdoc-dir=%{_docdir}/kdelibs-devel-3/ \ - --enable-debug + --with-kdelibsdoc-dir=%{_docdir}/kdelibs-devel-3 \ + --with-qt-libraries=$QTDIR/lib \ + --with-extra-libs=%{_libdir} -make +make %{?smp_mflags} # c references -cd c_cpp_reference-2.0.1 -cp -f /usr/share/libtool/config* . -mkdir -p admin && cp ../admin/am_edit admin/ -autoconf -./configure --prefix=$KDEDIR -cd - +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} +popd %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -make -C c_cpp_reference-2.0.1 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} -mv $RPM_BUILD_ROOT%{kdeprefix}/bin/kdevelop \ - $RPM_BUILD_ROOT%{kdeprefix}/bin/kdevelop-%{version} +install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ +install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/apps/kdevelop/tools/htdig.conf -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 +perl -pi -e "s/\@VERSION\@/%{version}/g" $RPM_BUILD_ROOT%{_bindir}/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 \ + --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 %files %defattr(-,root,root) -%{kdeprefix}/bin/* -%{kdeprefix}/lib/* -%{kdeprefix}/share/apps/%{name} -%{kdeprefix}/share/mimelnk/application/* +%doc %{_docdir}/HTML/en/%{name} +%{_bindir}/* +%{_libdir}/libkdevel* +%{_datadir}/apps/%{name} +%{_datadir}/apps/kconf_update/kdevelop2.upd +%{_datadir}/mimelnk/application/* %if %{desktop_file} %{_datadir}/applications/* %else %{_datadir}/applnk/Development/* %endif -%{kdeprefix}/share/icons/*/*/apps/* -%doc %{kdeprefix}/share/doc/HTML/en/%{name} +%{_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 %changelog +* Mon Feb 24 2003 Elliot Lee +- rebuilt + +* Mon Feb 24 2003 Elliot Lee +- rebuilt + +* Mon Feb 24 2003 Elliot Lee +- rebuilt + +* Mon Feb 24 2003 Elliot Lee +- rebuilt + +* Fri Feb 21 2003 2.1.5-2 +- get rid of gcc path from dependency_libs + +* Fri Jan 24 2003 2.1.5-1 +- 2.1.5 release +- update c_cpp_reference +- cleanup sepcfile +- remove templates, which is now in new upstream +- remove unneeded c_cpp_reference-2.0.1-config.patch +- add missing mo files +- fixed #75084, #73128, #70656, #77767, #74425 + +* Wed Jan 22 2003 Tim Powers 2.1.4-6 +- rebuilt + +* Wed Jan 8 2003 Jeff Johnson 2.1.4-5 +- don't include -debuginfo files in package. + +* Tue Dec 31 2002 Than Ngo 2.1.4-4 +- fix templates (bug #80745) + +* Tue Dec 17 2002 Than Ngo 2.1.4-3 +- enable kdoc + +* Mon Dec 9 2002 Than Ngo 2.1.4-2 +- fix build problem on s390/s390x +- fix bug #78866 + +* Sun Nov 10 2002 Than Ngo 2.1.4-1 +- update to 2.1.4 + +* Mon Oct 07 2002 Phil Knirsch 2.1.3-3.2 +- Fixed build for s390x. + +* Thu Sep 12 2002 Than Ngo 2.1.3-3.1 +- clean up specfile for x86_64/ppc (bug #73862) + * Sun Sep 1 2002 Than Ngo 2.1.3-3 - Add fix to show/hide KaboutKDE and Report Bug menu item over KDE Action Restrictions in kdeglobals diff --git a/sources b/sources index b83af53..5d16ea6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4e889aed26017489741f56cca9973025 c_cpp_reference-2.0.1.tar.bz2 -f71ad2aa07522f99ef62bc46d2e3e8bf kdevelop-2.1.3_for_KDE_3.0.tar.bz2 +5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 +8953caa03c22aabe6707ca494a0d4a41 kdevelop-2.1.5_for_KDE_3.1.tar.bz2