From 553dcfec1ee654dc3279aeb38a5dffb6c2150656 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:45:08 +0000 Subject: auto-import changelog data from kdegames-2.2-2.src.rpm Thu Aug 23 2001 Bernhard Rosenkraenzer 2.2-2 - Remove CVS files (#52289) - Remove dupes from kdeartwork-locolor (part of #51582) - Merge fixes from KDE_2_2_BRANCH --- diff --git a/kdegames.spec b/kdegames.spec index 6a94bcd..b2f6c72 100644 --- a/kdegames.spec +++ b/kdegames.spec @@ -2,9 +2,9 @@ %define pkg kdegames %define is_release 1 %define beta %{nil} -%define DATE 20010805 +%define DATE 20010823 Version: 2.2 -%define rel 1 +%define rel 2 Name: %{pkg} BuildPrereq: qt-devel kdelibs-devel zlib-devel libjpeg-devel libpng-devel kdelibs-sound-devel fam-devel @@ -22,6 +22,7 @@ Release: 0.cvs%{DATE}.%{rel} Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{pkg}-%{DATE}.tar.bz2 %endif Patch: kdegames-2.1-kpatcards.patch +Patch1: kdegames-2.2-cvsfixes.patch Icon: kde-icon.xpm Summary: Games for KDE. Epoch: 6 @@ -43,11 +44,10 @@ rm -rf $RPM_BUILD_ROOT %else %setup -q -n %{pkg} %endif -%ifarch ia64 -rm -rf doc -perl -pi -e "s,doc,,g" Makefile.am -%endif +# Don't ship CVS files +find . -type d -name CVS |xargs rm -rf %patch -p1 -b .bug +%patch1 -p1 -b .cvs make -f Makefile.cvs %build @@ -61,6 +61,11 @@ make %install make install-strip DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT/usr/share/icons/locolor/32x32/apps/kspaceduel.png +rm -f $RPM_BUILD_ROOT/usr/share/icons/locolor/16x16/apps/kspaceduel.png +rm -f $RPM_BUILD_ROOT/usr/share/icons/locolor/32x32/apps/lskat.png +rm -f $RPM_BUILD_ROOT/usr/share/icons/locolor/16x16/apps/lskat.png + cd $RPM_BUILD_ROOT find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > \ $RPM_BUILD_DIR/file.list.%{pkg} @@ -72,7 +77,6 @@ find . -type f | sed -e 's,^\.,\%attr(-\,root\,root) ,' \ find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> \ $RPM_BUILD_DIR/file.list.%{pkg} -%ifnarch ia64 # Make symlinks relative cd $RPM_BUILD_ROOT/usr/share/doc/HTML/en for i in *; do @@ -81,7 +85,6 @@ for i in *; do ln -sf ../common $RPM_BUILD_ROOT/usr/share/doc/HTML/en/$i fi done -%endif %clean rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{pkg} @@ -93,6 +96,11 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{pkg} %postun -p /sbin/ldconfig %changelog +* Thu Aug 23 2001 Bernhard Rosenkraenzer 2.2-2 +- Remove CVS files (#52289) +- Remove dupes from kdeartwork-locolor (part of #51582) +- Merge fixes from KDE_2_2_BRANCH + * Mon Aug 6 2001 Bernhard Rosenkraenzer 2.2-1 - 2.2 final