packages (DEVEL): psi/psi.spec - re-enable patches - dropped obsolete -desk...

[lisu]

Author: lisu                         Date: Fri Mar  4 09:09:18 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- re-enable patches
- dropped obsolete -desktop.patch and machekku-avatars_in_tooltip.patch

---- Files affected:
packages/psi:
   psi.spec (1.184.2.11 -> 1.184.2.12) 

---- Diffs:

================================================================
Index: packages/psi/psi.spec
diff -u packages/psi/psi.spec:1.184.2.11 packages/psi/psi.spec:1.184.2.12
--- packages/psi/psi.spec:1.184.2.11	Fri Mar  4 09:45:02 2011
+++ packages/psi/psi.spec	Fri Mar  4 10:09:12 2011
@@ -26,14 +26,11 @@
 # Source1-md5:	cf6d82f53f1f1600a49bb61ba81151bf
 Source2:	generate-tarball.sh
 Patch0:		%{name}-fix_configure_for_ksh.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-home_etc.patch
-Patch3:		%{name}-customos.patch
-Patch4:		%{name}-no_online_offline_status.patch
-Patch5:		%{name}-icon_buttons_big_return-mod.patch
-Patch6:		%{name}-empty_group-fix.patch
-# http://machekku.uaznia.net/xmpp/psi/patches/
-Patch7:		%{name}-machekku-avatars_in_tooltip.patch
+Patch1:		%{name}-home_etc.patch
+Patch2:		%{name}-customos.patch
+Patch3:		%{name}-no_online_offline_status.patch
+Patch4:		%{name}-icon_buttons_big_return-mod.patch
+Patch5:		%{name}-empty_group-fix.patch
 URL:		http://code.google.com/p/psi-dev/
 BuildRequires:	Qt3Support-devel
 BuildRequires:	QtCore-devel
@@ -84,14 +81,12 @@
 
 %prep
 %setup -q -a 1
-#%%patch0 -p0
-#%%patch1 -p1
-#%%{?with_home_etc:%patch2 -p1}
+%patch0 -p0
+#%%{?with_home_etc:%patch1 -p1}
+%patch2 -p1
 #%%patch3 -p1
-#%%patch4 -p1
-#%%patch5 -p1
-#%%patch6 -p1
-#%%patch7 -p1
+%patch4 -p1
+%patch5 -p1
 
 rm -rf third-party
 
@@ -164,6 +159,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184.2.12  2011/03/04 09:09:12  lisu
+- re-enable patches
+- dropped obsolete -desktop.patch and machekku-avatars_in_tooltip.patch
+
 Revision 1.184.2.11  2011/03/04 08:45:02  lisu
 - cp -a
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psi/psi.spec?r1=1.184.2.11&r2=1.184.2.12&f=u