diff --git a/.cvsignore b/.cvsignore index 03f200c..1e1c014 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ kdeutils-3.3.2.tar.bz2 kdeutils-3.4.0-rc1.tar.bz2 kdeutils-3.4.0.tar.bz2 kdeutils-3.4.1.tar.bz2 +kdeutils-3.4.2.tar.bz2 diff --git a/kdeutils.spec b/kdeutils.spec index 8626aa5..ba664f4 100644 --- a/kdeutils.spec +++ b/kdeutils.spec @@ -6,7 +6,9 @@ %define qt_version 3.3.4 -Version: 3.4.1 +%define disable_gcc_check_and_hidden_visibility 1 + +Version: 3.4.2 Release: 1 Name: kdeutils Prefix: /usr @@ -20,7 +22,6 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.b Patch1: kdf-3.0.2-label.patch Patch2: kde-libtool.patch -Patch3: admin-visibility.patch Requires: kdelibs >= 6:%{version} Requires: kdebase >= 6:%{version} @@ -237,7 +238,6 @@ A timer (stop watch). %setup -q %patch1 -p1 -b .label %patch2 -p1 -b .libtool -%patch3 -p1 -b .gcc %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -246,6 +246,13 @@ export KDEDIR=%{prefix} export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -fno-use-cxa-atexit -fno-check-new" export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG" +%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 @@ -269,7 +276,9 @@ make install DESTDIR=$RPM_BUILD_ROOT for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \ KCharSelect ark kwalletmanager kwalletconfig \ irkick kcmlirc laptop pcmcia kvaio thinkpad ; do - echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop + if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then + echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop + fi done # Make symlinks relative @@ -307,6 +316,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/kde/* %changelog +* Thu Aug 11 2005 Than Ngo 6:3.4.2-1 +- update to 3.4.2 + * Thu Jun 16 2005 Than Ngo 6:3.4.1-1 - 3.4.1 diff --git a/sources b/sources index 11e4b18..ea1fc3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 +62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2