packages: google-chromium/google-chromium.spec - unpack fix, but the source...

glen glen at pld-linux.org
Thu Jun 11 11:13:42 CEST 2009


Author: glen                         Date: Thu Jun 11 09:13:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unpack fix, but the source seems corrupted

---- Files affected:
packages/google-chromium:
   google-chromium.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/google-chromium/google-chromium.spec
diff -u packages/google-chromium/google-chromium.spec:1.3 packages/google-chromium/google-chromium.spec:1.4
--- packages/google-chromium/google-chromium.spec:1.3	Thu Jun 11 09:13:41 2009
+++ packages/google-chromium/google-chromium.spec	Thu Jun 11 11:13:36 2009
@@ -5,19 +5,9 @@
 # to update sources just run in: gclient update --force
 #
 # TODO:
-# - + tar -xf /home/users/uzsolt/rpm/packages/google-chromium/chromium-r17844.tar.lzma
-#	lzma: (stdin): File format not recognized
-#	tar: Child returned status 1
-#	tar: Exiting with failure status due to previous errors
-#	error: Bad exit status from /home/users/uzsolt/tmp/rpm-tmp.43870 (%prep)
-#
-#	chromium-r17844.tar.lzma: data
 # - use shared libs to build
 # - does not build on x86_64 ??
-#
-
 %define		rev	r17844
-
 Summary:	Google browser
 Summary(pl.UTF-8):	przegladarka Google
 Name:		google-chromium
@@ -31,6 +21,7 @@
 URL:		http://chromium.org/
 BuildRequires:	GConf2-devel
 BuildRequires:	gperf
+BuildRequires:	lzma
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.356
 Requires:	browser-plugins >= 2.0
@@ -46,13 +37,13 @@
 Google Chromium.
 
 %prep
-%setup -q -T -b 0 -n %{name}
+%setup -q -c -T
+lzma -dc %{SOURCE0} | tar xf - -C ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_sysconfdir}}
 
-
 #sh install.sh \
 #	DESTDIR=$RPM_BUILD_ROOT \
 #	--prefix=%{_prefix} \
@@ -78,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2009/06/11 09:13:36  glen
+- unpack fix, but the source seems corrupted
+
 Revision 1.3  2009/06/11 07:13:41  uzsolt
 - problem with source0
 
@@ -86,4 +80,3 @@
 
 Revision 1.1  2009/06/10 21:56:41  cactus
 - initial release, NFY
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/google-chromium/google-chromium.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list