diff --git a/.cvsignore b/.cvsignore index a587bd0..6b9713a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,3 +8,4 @@ kdesdk-3.4.2.tar.bz2 kdesdk-3.4.91.tar.bz2 kdesdk-3.4.92.tar.bz2 kdesdk-3.5.0.tar.bz2 +kdesdk-3.5.1.tar.bz2 diff --git a/kdesdk.spec b/kdesdk.spec index 4651a58..efa3467 100644 --- a/kdesdk.spec +++ b/kdesdk.spec @@ -2,6 +2,9 @@ %define final 0 %define qt_version 3.3.5 +%define qt_epoch 1 +%define kdelibs_epoch 6 +%define kdebase_epoch 6 %define arts 1 %define make_cvs 1 @@ -11,8 +14,8 @@ %define disable_gcc_check_and_hidden_visibility 1 Name: kdesdk -Version: 3.5.0 -Release: 1.1 +Version: 3.5.1 +Release: 1 Summary: The KDE Software Development Kit (SDK) URL: http://www.kde.org/ License: GPL @@ -25,10 +28,10 @@ Patch1: kde-libtool.patch Patch2: kdesdk-3.4.0-db4.patch Patch3: kdesdk-3.4.92-misc.patch -Prereq: /sbin/ldconfig +Requires(post,postun): /sbin/ldconfig -BuildPrereq: qt-devel >= 1:%{qt_version} -BuildPrereq: kdelibs-devel >= %{version} +BuildPrereq: qt-devel >= %{qt_epoch}:%{qt_version} +BuildPrereq: kdelibs-devel >= %{kdelibs_epoch}:%{version} BuildPrereq: db4-devel BuildPrereq: /usr/bin/desktop-file-install @@ -41,7 +44,7 @@ repository. Summary: Development files for kdesdk Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: kdelibs-devel => 6:%{version} +Requires: kdelibs-devel => %{kdelibs_epoch}:%{version} %description devel Development files for kdesdk. Install kdesdk-devel if you wish @@ -141,22 +144,24 @@ export CXXFLAGS="$FLAGS" perl -pi -e "d/kbugbuster//g" subdirs && rm -rf kbugbuster -%if %{disable_gcc_check_and_hidden_visibility} - # disable gcc check - perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in - # disable hidden visibility - perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in -%endif - %if %{make_cvs} make -f admin/Makefile.common cvs %endif %configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ --disable-rpath \ +%if %{disable_gcc_check_and_hidden_visibility} + --disable-gcc-hidden-visibility \ +%endif %if %{arts} == 0 --without-arts \ %endif +%if %{debug} == 0 + --disable-debug \ + --disable-warnings \ +%endif %if %{final} --enable-final \ %endif @@ -231,6 +236,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Sun Feb 05 2006 Than Ngo 3.5.1-1 +- 3.5.1 + * Fri Dec 09 2005 Jesse Keating - rebuilt diff --git a/sources b/sources index e2ac491..ad2c16d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc91ffcfa8114cf4f9d40bc9ffe47d97 kdesdk-3.5.0.tar.bz2 +93199b8bf5793681fdb2e5cbcfcfbd93 kdesdk-3.5.1.tar.bz2