diff --git a/kdevelop.spec b/kdevelop.spec index e6d38f1..5a17c2e 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -4,7 +4,7 @@ %define kde_version 3.4.0 %define qt_version 3.3.3 -%define libtool 1 +%define make_cvs 1 Name: kdevelop Summary: Integrated Development Environment for C++/C @@ -24,6 +24,7 @@ Patch1: c_cpp_reference-2.0.2-config.patch Patch2: kde-libtool.patch Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch Patch4: kdevelop-3.1.92-fpic.patch +Patch5: admin-visibility.patch Prereq: /sbin/ldconfig @@ -71,13 +72,14 @@ individual needs. %patch2 -p1 -b .libtool %patch3 -p1 -b .doc %patch4 -p1 +%patch5 -p1 -b .gcc %build export KDEDIR=%{_prefix} QTDIR="" && source /etc/profile.d/qt.sh # Workaround for legacy auto* tools -%if %{libtool} +%if %{make_cvs} [ -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 @@ -146,7 +148,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/servicetypes/* %changelog -* Mon Feb 28 2005 Than Ngo 9:3.2.0-0.rc1.1 +* Tue Mar 01 2005 Than Ngo 9:3.2.0-0.rc1.1 - KDE 3.4.0 rc1 * Mon Feb 21 2005 Than Ngo 9:3.1.92-0.1