rpms/kdeartwork/devel .cvsignore, 1.30, 1.31 kdeartwork.spec, 1.47, 1.48 sources, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdeartwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2119

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
update to 3.5.3




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	5 Apr 2006 15:12:50 -0000	1.30
+++ .cvsignore	1 Jun 2006 17:21:24 -0000	1.31
@@ -10,3 +10,4 @@
 kdeartwork-3.5.0.tar.bz2
 kdeartwork-3.5.1.tar.bz2
 kdeartwork-3.5.2.tar.bz2
+kdeartwork-3.5.3.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdeartwork.spec	5 Apr 2006 15:12:50 -0000	1.47
+++ kdeartwork.spec	1 Jun 2006 17:21:28 -0000	1.48
@@ -4,7 +4,7 @@
 %define make_cvs 1
 
 %define qt_version 3.3.6
-%define arts_version 1.5.2
+%define arts_version 1.5.3
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.2
+Version: 3.5.3
 Release: 1
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
@@ -34,14 +34,12 @@
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-devel
-BuildRequires: xscreensaver-base
 
 Prereq: /sbin/ldconfig
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: qt >= %{qt_epoch}:%{qt_version}
-Requires: xscreensaver-extras
 
 %description
 Additional artwork (themes, sound themes, screensavers ...) for KDE
@@ -63,15 +61,17 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export PATH=`pwd`:$PATH
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit"
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+%if 0
    --enable-new-ldflags \
+%endif
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
 %if %{disable_gcc_check_and_hidden_visibility}
@@ -92,23 +92,23 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR="$RPM_BUILD_ROOT"
+make install DESTDIR="%{buildroot}"
 
-mv $RPM_BUILD_ROOT%{_datadir}/icons/Locolor $RPM_BUILD_ROOT%{_datadir}/icons/locolor
+mv %{buildroot}%{_datadir}/icons/Locolor %{buildroot}%{_datadir}/icons/locolor
 
-#fix file conflict with other kde packages
-rm -f $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kig.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/lskat.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/ktux.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/ktimemon.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/gvim* \
-      $RPM_BUILD_ROOT%{_datadir}/icons/locolor/*/apps/kbabel.png \
-      $RPM_BUILD_ROOT%{_datadir}/wallpapers/gear-flowers* \
-      $RPM_BUILD_ROOT%{_datadir}/wallpapers/fulmine.jpg*
+# fix file conflict with other kde packages
+rm -f %{buildroot}%{_datadir}/icons/locolor/*/apps/kig.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspaceduel.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/lskat.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktux.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/ktimemon.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kspreadcalc.png \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/gvim* \
+      %{buildroot}%{_datadir}/icons/locolor/*/apps/kbabel.png \
+      %{buildroot}%{_datadir}/wallpapers/gear-flowers* \
+      %{buildroot}%{_datadir}/wallpapers/fulmine.jpg*
 
 %post -p /sbin/ldconfig
 
@@ -131,7 +131,7 @@
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -156,6 +156,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Thu Jun 01 2006 Than Ngo <than at redhat.com> 3.5.3-1
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-1
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	5 Apr 2006 15:12:50 -0000	1.31
+++ sources	1 Jun 2006 17:21:28 -0000	1.32
@@ -1 +1 @@
-211801e7ab7a5e113821625b931f338c  kdeartwork-3.5.2.tar.bz2
+e0fc78bee18d81b4595c98964227a06c  kdeartwork-3.5.3.tar.bz2