diff --git a/.cvsignore b/.cvsignore index 446e32f..b4d36a1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,3 +8,4 @@ kdeartwork-3.4.2.tar.bz2 kdeartwork-3.4.91.tar.bz2 kdeartwork-3.4.92.tar.bz2 kdeartwork-3.5.0.tar.bz2 +kdeartwork-3.5.1.tar.bz2 diff --git a/kdeartwork.spec b/kdeartwork.spec index b223f45..05c0b54 100644 --- a/kdeartwork.spec +++ b/kdeartwork.spec @@ -4,14 +4,17 @@ %define make_cvs 1 %define qt_version 3.3.5 -%define arts_version 1.5.0 +%define arts_version 1.5.1 +%define kdelibs_epoch 6 +%define kdebase_epoch 6 +%define qt_epoch 1 %define arts 1 %define disable_gcc_check_and_hidden_visibility 1 Name: kdeartwork -Version: 3.5.0 -Release: 2 +Version: 3.5.1 +Release: 1 Summary: Additional artwork (themes, sound themes, ...) for KDE URL: http://www.kde.org/ License: GPL @@ -35,9 +38,9 @@ BuildRequires: xscreensaver-base Prereq: /sbin/ldconfig -Requires: kdelibs >= 6:%{version} -Requires: kdebase >= 6:%{version} -Requires: qt >= 1:%{qt_version} +Requires: kdelibs >= %{kdelibs_epoch}:%{version} +Requires: kdebase >= %{kdebase_epoch}:%{version} +Requires: qt >= %{qt_epoch}:%{qt_version} Requires: xscreensaver-extras %description @@ -63,22 +66,24 @@ export PATH=`pwd`:$PATH export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit" -%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 \ --with-qt-libraries=$QTDIR/lib \ +%if %{disable_gcc_check_and_hidden_visibility} + --enable-gcc-hidden-visibility \ +%endif %if %{arts} == 0 --without-arts \ %endif +%if %{debug} == 0 + --disable-debug \ + --disable-warnings \ +%endif %if %{final} --enable-final \ %endif @@ -109,6 +114,22 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kig.png \ %postun -p /sbin/ldconfig +%post icons +for i in locolor ikons kdeclassic kids slick ; do + touch --no-create %{_datadir}/icons/$i || : + if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || : + fi +done + +%postun icons +for i in locolor ikons kdeclassic kids slick ; do + touch --no-create %{_datadir}/icons/$i || : + if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || : + fi +done + %clean rm -rf $RPM_BUILD_ROOT @@ -135,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/* %changelog +* Fri Feb 03 2006 Than Ngo 3.5.1-1 +- 3.5.1 + * Sat Dec 17 2005 Than Ngo 3.5.0-2 - requires on xscreensaver-extras diff --git a/sources b/sources index 1eb1fe0..c7ee2f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -052c736c9c12defbb2e7de04ff0b2ae6 kdeartwork-3.5.0.tar.bz2 +8053bb1a1b2a5844b29f5f96328b1d96 kdeartwork-3.5.1.tar.bz2