SPECS: psi.spec - no_online_status-mod.patch replaced with no_onli...

[hawk]

Author: hawk                         Date: Fri Jan 25 20:17:35 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no_online_status-mod.patch replaced with no_online_offline_status.patch
- icondef.xml_status_indicator.patch merged into status_indicator-add.patch
- indicator.png is back

---- Files affected:
SPECS:
   psi.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: SPECS/psi.spec
diff -u SPECS/psi.spec:1.147 SPECS/psi.spec:1.148
--- SPECS/psi.spec:1.147	Fri Jan 25 17:05:18 2008
+++ SPECS/psi.spec	Fri Jan 25 21:17:30 2008
@@ -9,17 +9,17 @@
 Group:		Applications/Communications
 Source0:	http://dl.sourceforge.net/psi/%{name}-%{version}.tar.bz2
 # Source0-md5:	6ccc81783eece7959140951289cf5310
+Source1:	%{name}-indicator.png
 Patch0:		%{name}-fix_configure_for_ksh.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-home_etc.patch
 Patch3:		%{name}-certs.patch
 Patch4:		%{name}-customos.patch
-Patch20:	%{name}-status_indicator-add.patch
-Patch21:	%{name}-no_online_status-mod.patch
+Patch5:		%{name}-no_online_offline_status.patch
+Patch6:		%{name}-status_indicator-add.patch
 Patch22:	%{name}-status_history-add.patch
 Patch23:	%{name}-icon_buttons_big_return-mod.patch
 Patch24:	%{name}-roster-rich.patch
-Patch25:	%{name}-icondef.xml_status_indicator.patch
 Patch26:	%{name}-settoggles-fix.patch
 Patch27:	%{name}-empty_group-fix.patch
 Patch30:	%{name}-appearance-mod.patch
@@ -64,9 +64,8 @@
 %{?with_home_etc:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
-#%patch20 -p1
-#%patch21 -p1
-#%patch25 -p1
+%patch5 -p1
+%patch6 -p1
 #%patch27 -p1
 #%patch30 -p1
 #%patch22 -p1
@@ -74,6 +73,8 @@
 #%patch24 -p1
 #%patch26 -p1
 
+cp %{SOURCE1} indicator.png
+
 rm -rf third-party
 
 %build
@@ -92,6 +93,8 @@
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
+install indicator.png $RPM_BUILD_ROOT%{_datadir}/psi/iconsets/roster/default/indicator.png
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -112,6 +115,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2008-01-25 20:17:30  hawk
+- no_online_status-mod.patch replaced with no_online_offline_status.patch
+- icondef.xml_status_indicator.patch merged into status_indicator-add.patch
+- indicator.png is back
+
 Revision 1.147  2008-01-25 16:05:18  hawk
 - dropped qca_nolink_fix.patch, obsolete
 - cleanup, renumbered few patches
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/psi.spec?r1=1.147&r2=1.148&f=u