SPECS: psi.spec - dropped qca_nolink_fix.patch, obsolete - cleanup...

[hawk]

Author: hawk                         Date: Fri Jan 25 16:05:23 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped qca_nolink_fix.patch, obsolete
- cleanup, renumbered few patches

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

---- Diffs:

================================================================
Index: SPECS/psi.spec
diff -u SPECS/psi.spec:1.146 SPECS/psi.spec:1.147
--- SPECS/psi.spec:1.146	Fri Jan 25 12:23:31 2008
+++ SPECS/psi.spec	Fri Jan 25 17:05:18 2008
@@ -9,16 +9,11 @@
 Group:		Applications/Communications
 Source0:	http://dl.sourceforge.net/psi/%{name}-%{version}.tar.bz2
 # Source0-md5:	6ccc81783eece7959140951289cf5310
-
-#	from PLD
-Patch0:		%{name}-certs.patch
+Patch0:		%{name}-fix_configure_for_ksh.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-home_etc.patch
-Patch3:		%{name}-qca_nolink_fix.patch
-Patch4:		%{name}-fix_configure_for_ksh.patch
-#	from jpc
-Patch10:	%{name}-customos.patch
-#	from SKaZi
+Patch3:		%{name}-certs.patch
+Patch4:		%{name}-customos.patch
 Patch20:	%{name}-status_indicator-add.patch
 Patch21:	%{name}-no_online_status-mod.patch
 Patch22:	%{name}-status_history-add.patch
@@ -27,11 +22,8 @@
 Patch25:	%{name}-icondef.xml_status_indicator.patch
 Patch26:	%{name}-settoggles-fix.patch
 Patch27:	%{name}-empty_group-fix.patch
-#	from Hawk
 Patch30:	%{name}-appearance-mod.patch
-
 URL:		http://psi-im.org/
-#BuildRequires:	backport-patches-from-psi-0_10
 BuildRequires:	Qt3Support-devel
 BuildRequires:	QtCore-devel
 BuildRequires:	QtNetwork-devel
@@ -67,26 +59,20 @@
 
 %prep
 %setup -q
-
-#	PLD
-#%patch0 -p1
+%patch0 -p0
 %patch1 -p1
 %{?with_home_etc:%patch2 -p1}
-#%patch3 -p1
-%patch4 -p0
-#	jpc
-%patch10 -p1
-#	SKaZi
-%patch20 -p1
-%patch21 -p1
+%patch3 -p1
+%patch4 -p1
+#%patch20 -p1
+#%patch21 -p1
+#%patch25 -p1
+#%patch27 -p1
+#%patch30 -p1
 #%patch22 -p1
-#%patch23 -p1 #
+#%patch23 -p1
 #%patch24 -p1
-%patch25 -p1
-#%patch26 -p1 #
-%patch27 -p1
-#	Hawk
-#%patch30 -p1
+#%patch26 -p1
 
 rm -rf third-party
 
@@ -126,6 +112,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2008-01-25 16:05:18  hawk
+- dropped qca_nolink_fix.patch, obsolete
+- cleanup, renumbered few patches
+
 Revision 1.146  2008-01-25 11:23:31  hawk
 - started backporting patches from psi 0.10
 - dropped configure_fix.patch, replaced by backported
================================================================

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