SPECS: suspend2-userui.spec - PPC build fix - remove patch1 - rel 2

[shadzik]

Author: shadzik                      Date: Thu Aug 23 15:43:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- PPC build fix
- remove patch1
- rel 2

---- Files affected:
SPECS:
   suspend2-userui.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/suspend2-userui.spec
diff -u SPECS/suspend2-userui.spec:1.26 SPECS/suspend2-userui.spec:1.27
--- SPECS/suspend2-userui.spec:1.26	Thu Aug 23 17:32:20 2007
+++ SPECS/suspend2-userui.spec	Thu Aug 23 17:43:26 2007
@@ -9,13 +9,12 @@
 Summary(pl.UTF-8):	Interfejs użytkownika dla Suspend2
 Name:		suspend2-userui
 Version:	0.7.2
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://www.suspend2.net/downloads/all/%{name}-%{version}.tar.gz
 # Source0-md5:	7403ebf48a598ba13d5155b2660a06df
 Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-ppc.patch
 URL:		http://www.suspend2.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -91,10 +90,6 @@
 %setup -q
 %patch0 -p1
 
-%ifarch ppc
-%patch1 -p1
-%endif
-
 %build
 %{__make} clean
 %{__make} tuxoniceui_text \
@@ -102,6 +97,7 @@
 	CFLAGS="%{rpmcflags}" \
 	%{?with_static:LDFLAGS="-static"}
 
+%ifarch !ppc
 %if %{with fbsplash}
 %{__make} -C fbsplash
 	CC="%{__cc}"
@@ -125,18 +121,21 @@
 	CFLAGS="%{rpmcflags}" \
 	%{?with_static:LDFLAGS="-static"}
 %endif
+%endif # arch
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sbindir}
 
 install tuxoniceui_text $RPM_BUILD_ROOT%{_sbindir}
+%ifarhc !ppc
 %if %{with fbsplash}
 install tuxoniceui_fbsplash $RPM_BUILD_ROOT%{_sbindir}
 %endif
 %if %{with usplash}
 install tuxoniceui_usplash $RPM_BUILD_ROOT%{_sbindir}
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -146,6 +145,7 @@
 %doc AUTHORS ChangeLog README USERUI_API KERNEL_API
 %attr(755,root,root) %{_sbindir}/tuxoniceui_text
 
+%ifarch !ppc
 %if %{with fbsplash}
 %files fbsplash
 %defattr(644,root,root,755)
@@ -157,6 +157,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/tuxoniceui_usplash
 %endif
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -164,6 +165,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2007/08/23 15:43:26  shadzik
+- PPC build fix
+- remove patch1
+- rel 2
+
 Revision 1.26  2007/08/23 15:32:20  shadzik
 - reverse usplash bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/suspend2-userui.spec?r1=1.26&r2=1.27&f=u