rpms/sunbird/F-11 sunbird.spec,1.32,1.33

Jan Horak xhorak at fedoraproject.org
Tue Sep 22 20:06:39 UTC 2009


Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3941

Modified Files:
	sunbird.spec 
Log Message:
Fix build


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sunbird.spec	22 Sep 2009 14:04:16 -0000	1.32
+++ sunbird.spec	22 Sep 2009 20:06:38 -0000	1.33
@@ -11,14 +11,6 @@
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100} %{buildroot}
 
-# The tarball is pretty inconsistent with directory structure.
-# Sometimes there is a top level directory.  That goes here.
-#
-# IMPORTANT: If there is no top level directory, this should be 
-# set to the cwd, ie: '.'
-#%define tarballdir .
-%define tarballdir comm-central
-
 Name:           sunbird
 Version:        1.0
 Release:        0.7.20090715hg%{?dist}
@@ -113,8 +105,7 @@ calendaring tasks.
 
 
 %prep
-%setup -c -q -a 2
-cd %{tarballdir}
+%setup -n comm-central -q -a 2
 %patch0 -p0 -b .jemalloc
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
@@ -157,7 +148,6 @@ make -f client.mk build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{tarballdir}
 
 # make install is bogus
 # copy tree, break symlinks




More information about the scm-commits mailing list