rpms/kdeartwork/FC-5 kdeartwork.spec,1.47,1.48 sources,1.31,1.32

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Jun 10 13:38:04 UTC 2006


Author: than

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

Modified Files:
	kdeartwork.spec sources 
Log Message:
3.5.3



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/kdeartwork.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdeartwork.spec	5 Apr 2006 15:14:09 -0000	1.47
+++ kdeartwork.spec	10 Jun 2006 13:37:59 -0000	1.48
@@ -4,7 +4,7 @@
 %define make_cvs 1
 
 %define qt_version 3.3.5
-%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,35 +13,25 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch: kde-libtool.patch
 
-BuildRequires: perl
-BuildRequires: kdebase-devel
-BuildRequires: arts-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: glibc-devel
-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
+Requires: xscreensaver-gl-extras
+Requires: xscreensaver-base
+
+BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: xscreensaver-extras
+BuildRequires: xscreensaver-gl-extras
+BuildRequires: xscreensaver-base
 
 %description
 Additional artwork (themes, sound themes, screensavers ...) for KDE
@@ -62,10 +52,6 @@
 %build
 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"
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -92,27 +78,23 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR="$RPM_BUILD_ROOT"
+rm -rf %{buildroot}
 
-mv $RPM_BUILD_ROOT%{_datadir}/icons/Locolor $RPM_BUILD_ROOT%{_datadir}/icons/locolor
+make install DESTDIR=%{buildroot}
 
-#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*
+mv %{buildroot}%{_datadir}/icons/Locolor %{buildroot}%{_datadir}/icons/locolor
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+# 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 icons
 for i in locolor ikons kdeclassic kids slick ; do
@@ -156,6 +138,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	5 Apr 2006 15:14:09 -0000	1.31
+++ sources	10 Jun 2006 13:37:59 -0000	1.32
@@ -1 +1 @@
-211801e7ab7a5e113821625b931f338c  kdeartwork-3.5.2.tar.bz2
+e0fc78bee18d81b4595c98964227a06c  kdeartwork-3.5.3.tar.bz2




More information about the fedora-cvs-commits mailing list