diff --git a/.cvsignore b/.cvsignore index ca2dd85..b28d69d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -icecream-0.8.0.tar.gz +icecream-0.8.0.tar.bz2 +icecream-make-it-cool.patch.bz2 diff --git a/icecream.spec b/icecream.spec index fc1b971..6693768 100644 --- a/icecream.spec +++ b/icecream.spec @@ -1,15 +1,15 @@ Name: icecream Version: 0.8.0 -Release: 7.20071101svn%{?dist} +Release: 8.20080117svn%{?dist} Summary: Distributed compiler Group: Development/Tools License: GPLv2 URL: http://en.opensuse.org/Icecream -# The source was pulled from upstream's SVN repository: -# svn export -r 731514 svn://anonsvn.kde.org/home/kde/trunk/icecream icecream-0.8.0 -# tar -czvf icecream-0.8.0.tar.gz icecream-0.8.0 -Source0: icecream-0.8.0.tar.gz +# The source was pulled from SVN repository: +# svn export -r 657903 svn://anonsvn.kde.org/home/kde/trunk/icecream icecream-0.8.0 +# tar -cjvf icecream-0.8.0.tar.bz2 icecream-0.8.0/ +Source0: icecream-0.8.0.tar.bz2 Source1: icecream.sh.in Source2: icecream.csh.in Source3: icecream.fc @@ -17,8 +17,14 @@ Source4: icecream.te Source5: icecream.if Source6: initscript-iceccd Source7: initscript-scheduler -Patch0: icecream-rename-scheduler.patch -Patch1: icecream-cleanup-conffile.patch +# This patch was generated with: +# svn export -r 761849 svn://anonsvn.kde.org/home/kde/branches/work/icecream-make-it-cool icecream-mic +# diff -Nurp icecream-0.8.0 icecream-mic > icecream-make-it-cool.patch +# bzip2 icecream-make-it-cool.patch +Patch0: icecream-make-it-cool.patch.bz2 +Patch1: icecream-rename-scheduler.patch +Patch2: icecream-cleanup-conffile.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf libtool symlinks @@ -63,8 +69,9 @@ This package contains development files for %{name}. %prep %setup -q -%patch0 -p0 +%patch0 -p1 %patch1 -p0 +%patch2 -p0 make -f Makefile.cvs sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh @@ -210,6 +217,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/icecc.pc %changelog +* Thu Jan 17 2008 Michal Schmidt - 0.8.0-8.20080117svn +- Update to current icecream-make-it-cool branch. + * Tue Jan 8 2008 Michal Schmidt - 0.8.0-7.20071101svn - Build fix. meinproc is now in kdelibs3. BuildRequire that instead of kdelibs. diff --git a/sources b/sources index ab43331..d255e5c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -1f2cd40b8efb646df7cd4bbd5f411308 icecream-0.8.0.tar.gz +5dd4718f52626924a665c1f56b90d403 icecream-0.8.0.tar.bz2 +209f885bd595fc9a203ce4115872250e icecream-make-it-cool.patch.bz2