packages: xv/xv.spec - rework setup

[arekm]

Author: arekm                        Date: Fri Jan 15 18:10:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rework setup

---- Files affected:
packages/xv:
   xv.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: packages/xv/xv.spec
diff -u packages/xv/xv.spec:1.41 packages/xv/xv.spec:1.42
--- packages/xv/xv.spec:1.41	Fri Jan 15 19:04:04 2010
+++ packages/xv/xv.spec	Fri Jan 15 19:10:21 2010
@@ -99,18 +99,16 @@
 просту обробку зображень - cropping, expanding, знімки экрану і т.і.
 
 %prep
-%setup -q
-tar xvfz %{SOURCE1}
-tar xvfz %{SOURCE6} -C ../
-patch -p1 < ../xv-3.10a-jumbo-fix-enh-patch-20070520.txt
+%setup -q -a1 -a6 -a2
+cp -a xv-%{version}/* .
+patch -p1 < ./xv-3.10a-jumbo-fix-enh-patch-20070520.txt || exit 1
 %patch0 -p1
 %patch1 -p1
-tar zxf %{SOURCE2}
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CCOPTS="%{rpmcflags} `pkg-config --cflags libpng12 2>/dev/null`" \
+	CCOPTS="%{rpmcppflags} %{rpmcflags} `pkg-config --cflags libpng12 2>/dev/null`" \
 	LDFLAGS="%{rpmldflags}"
 
 %install
@@ -131,7 +129,6 @@
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT/../xv-3.10a-jumbo-fix-enh-patch-20070520.txt
 
 %files
 %defattr(644,root,root,755)
@@ -152,6 +149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2010/01/15 18:10:21  arekm
+- rework setup
+
 Revision 1.41  2010/01/15 18:04:04  evil
 - removed all current patches
 - added one big jumbopatch (and patch for it)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xv/xv.spec?r1=1.41&r2=1.42&f=u