Author: hawk                         Date: Fri Jan 25 11:23:36 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- started backporting patches from psi 0.10
- dropped configure_fix.patch, replaced by backported
  fix_configure_for_ksh.patch
- release 1.1, NFY

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

---- Diffs:

================================================================
Index: SPECS/psi.spec
diff -u SPECS/psi.spec:1.145 SPECS/psi.spec:1.146
--- SPECS/psi.spec:1.145        Fri Jan  4 20:14:43 2008
+++ SPECS/psi.spec      Fri Jan 25 12:23:31 2008
@@ -4,13 +4,34 @@
 Summary(pl.UTF-8):     PSI - klient Jabbera
 Name:          psi
 Version:       0.11
-Release:       1
+Release:       1.1
 License:       GPL v2
 Group:         Applications/Communications
 Source0:       http://dl.sourceforge.net/psi/%{name}-%{version}.tar.bz2
 # Source0-md5: 6ccc81783eece7959140951289cf5310
-Patch0:                %{name}-configure_fix.patch
+
+#      from PLD
+Patch0:                %{name}-certs.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
+Patch20:       %{name}-status_indicator-add.patch
+Patch21:       %{name}-no_online_status-mod.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
+#      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
@@ -46,7 +67,27 @@
 
 %prep
 %setup -q
-%patch0 -p1
+
+#      PLD
+#%patch0 -p1
+%patch1 -p1
+%{?with_home_etc:%patch2 -p1}
+#%patch3 -p1
+%patch4 -p0
+#      jpc
+%patch10 -p1
+#      SKaZi
+%patch20 -p1
+%patch21 -p1
+#%patch22 -p1
+#%patch23 -p1 #
+#%patch24 -p1
+%patch25 -p1
+#%patch26 -p1 #
+%patch27 -p1
+#      Hawk
+#%patch30 -p1
+
 rm -rf third-party
 
 %build
@@ -85,6 +126,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.146  2008-01-25 11:23:31  hawk
+- started backporting patches from psi 0.10
+- dropped configure_fix.patch, replaced by backported
+  fix_configure_for_ksh.patch
+- release 1.1, NFY
+
 Revision 1.145  2008-01-04 19:14:43  qboosh
 - qt4-qmake -> qmake-qt4
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to