rpms/icecream/devel icecream-build-env-as-root.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 icecream.spec, 1.10, 1.11 sources, 1.3, 1.4 icecream-compile-fix.patch, 1.1, NONE

Michal Schmidt michich at fedoraproject.org
Thu Nov 13 14:59:29 UTC 2008 

Author: michich

Update of /cvs/pkgs/rpms/icecream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9664

Modified Files:
	.cvsignore icecream.spec sources 
Added Files:
	icecream-build-env-as-root.patch 
Removed Files:
	icecream-compile-fix.patch 
Log Message:
* Thu Nov 13 2008 Michal Schmidt <mschmidt at redhat.com> - 0.9.2-1
- Update to upstream release 0.9.2.
- The license is GPLv2+.
- Add manpages from SUSE src package.
- Add patch to run icecc --build-native as root.


icecream-build-env-as-root.patch:

--- NEW FILE icecream-build-env-as-root.patch ---
icecc --build-native fails if run as non-root, it needs to chroot.
This needs to be discussed upstream.

diff -up icecc-0.9.2/daemon/environment.cpp.build-env-as-root icecc-0.9.2/daemon/environment.cpp
--- icecc-0.9.2/daemon/environment.cpp.build-env-as-root	2008-11-13 15:11:28.000000000 +0100
+++ icecc-0.9.2/daemon/environment.cpp	2008-11-13 15:12:26.000000000 +0100
@@ -239,6 +239,7 @@ size_t setup_env_cache(const string &bas
         }
     }
     // else
+    /* icecc --build-native wants to ldconfig -r ... which uses chroot 
     if ( setgid( nobody_gid ) < 0) {
       log_perror("setgid failed");
       _exit(143);
@@ -246,7 +247,7 @@ size_t setup_env_cache(const string &bas
     if (!geteuid() && setuid( nobody_uid ) < 0) {
       log_perror("setuid failed");
       _exit (142);
-    }
+    }*/
 
     if ( chdir( nativedir.c_str() ) ) {
          log_perror( "chdir" );


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2008 12:45:44 -0000	1.3
+++ .cvsignore	13 Nov 2008 14:58:57 -0000	1.4
@@ -1,2 +1,2 @@
-icecream-0.8.0.tar.bz2
-icecream-make-it-cool.patch.bz2
+icecc-0.9.2.tar.bz2
+icecream-manpages.tar.bz2


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- icecream.spec	2 Sep 2008 12:29:29 -0000	1.10
+++ icecream.spec	13 Nov 2008 14:58:58 -0000	1.11
@@ -1,5 +1,3 @@
-%bcond_without	doc
-
 %if 0%{?fedora}
 %bcond_without  fedora
 %bcond_without	selinux
@@ -12,17 +10,14 @@
 
 
 Name:		icecream
-Version:	0.8.0
-Release:	12.20080117svn%{?dist}
+Version:	0.9.2
+Release:	1%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
-License:	GPLv2
+License:	GPLv2+
 URL:		http://en.opensuse.org/Icecream
-# 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
+Source0:	ftp://ftp.suse.com/pub/projects/icecream/icecc-%{version}.tar.bz2
 Source1:	icecream.sh.in
 Source2:	icecream.csh.in
 Source3:	icecream.fc
@@ -30,20 +25,15 @@
 Source5:	icecream.if
 Source6:	initscript-iceccd
 Source7:	initscript-scheduler
-# 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
-Patch3:		icecream-compile-fix.patch
+# manpages from http://ftp5.gwdg.de/pub/opensuse/repositories/home:/coolo/openSUSE_11.0/src/icecream-0.9.2-2.1.src.rpm
+Source8:	%{name}-manpages.tar.bz2
+Patch0:		icecream-rename-scheduler.patch
+Patch1:		icecream-cleanup-conffile.patch
+Patch2:		icecream-build-env-as-root.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	automake autoconf libtool symlinks
-# To build manpages from KDE-style Docbook sources:
-%{?with_doc:BuildRequires:	%{!?el5:kdelibs3 kdelibs3-devel} %{?el5:kdelibs kdelibs-devel}}
+BuildRequires:	symlinks
 
 %if %{with selinux}
 # For SELinux protection:
@@ -84,12 +74,10 @@
 This package contains development files for %{name}.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -a 8 -n icecc-%{version}
+%patch0 -p0
 %patch1 -p0
-%patch2 -p0
-%patch3 -p1
-make -f Makefile.cvs
+%patch2 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -98,19 +86,12 @@
 cp -p %{SOURCE6} %{SOURCE7} fedora
 
 %build
-%configure --disable-static --enable-shared
-make %{?_smp_mflags}
+%configure --disable-static --enable-shared --disable-rpath
+# Remove rpath from local libtool copy
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-%if %{with doc}
-pushd doc
-for i in man-*.docbook; do
-	meinproc --stylesheet %{_datadir}/apps/ksgmltools2/customization/kde-man.xsl $i
-	manfile=${i#man-}
-	manfile=${manfile%.docbook}
-	mv manpage.troff $manfile
-done
-popd
-%endif
+make %{?_smp_mflags}
 
 %if %{with selinux}
 pushd SELinux
@@ -137,14 +118,12 @@
 # relativize the symlinks
 symlinks -cs %{buildroot}/%{_libdir}/icecc/bin
 
-%if %{with doc}
 # install manpages
 mkdir -p %{buildroot}/%{_mandir}/man{1,7,8}
-mv doc/scheduler.1 doc/icecc-scheduler.1
-for i in doc/*.1 doc/*.7; do
+mv mans/scheduler.1 mans/icecc-scheduler.1
+for i in mans/*.1 mans/*.7; do
 	install -m 644 $i %{buildroot}/%{_mandir}/man${i##*.}
 done
-%endif
 
 # install config file and initscripts
 install -D -m 644 suse/sysconfig.icecream %{buildroot}/%{_sysconfdir}/sysconfig/icecream
@@ -226,7 +205,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog README BENCH NEWS TODO
+%doc COPYING README NEWS TODO
 %{_bindir}/icecc
 %dir %{_libdir}/icecc/
 %dir %{_libdir}/icecc/bin/
@@ -243,7 +222,7 @@
 %{_sysconfdir}/rc.d/init.d/iceccd
 %{_sysconfdir}/rc.d/init.d/icecc-scheduler
 %{_localstatedir}/cache/icecream
-%{?with_doc:%{_mandir}/man*/*}
+%{_mandir}/man*/*
 %{?with_selinux:%{_datadir}/selinux/*/icecream.pp}
 
 %files devel
@@ -254,6 +233,12 @@
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Thu Nov 13 2008 Michal Schmidt <mschmidt at redhat.com> - 0.9.2-1
+- Update to upstream release 0.9.2.
+- The license is GPLv2+.
+- Add manpages from SUSE src package.
+- Add patch to run icecc --build-native as root.
+
 * Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.0-12.20080117svn
 - Include unowned icecc directories.
 - Add defattr in devel pkg.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2008 12:45:44 -0000	1.3
+++ sources	13 Nov 2008 14:58:58 -0000	1.4
@@ -1,2 +1,2 @@
-5dd4718f52626924a665c1f56b90d403  icecream-0.8.0.tar.bz2
-209f885bd595fc9a203ce4115872250e  icecream-make-it-cool.patch.bz2
+2765f37805b5a3e86a77aefae64a150c  icecc-0.9.2.tar.bz2
+a3829775870d5b2b60b750a88ee835b7  icecream-manpages.tar.bz2


--- icecream-compile-fix.patch DELETED ---

More information about the scm-commits mailing list