Author: hawk Date: Fri Jan 25 12:07:45 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - reverted to psi 0.10, version 0.11 requires qca2 which is not available in Ac
---- Files affected: SPECS: psi.spec (1.140.2.4 -> 1.140.2.5) ---- Diffs: ================================================================ Index: SPECS/psi.spec diff -u SPECS/psi.spec:1.140.2.4 SPECS/psi.spec:1.140.2.5 --- SPECS/psi.spec:1.140.2.4 Sun Nov 25 20:25:18 2007 +++ SPECS/psi.spec Fri Jan 25 13:07:39 2008 @@ -1,29 +1,54 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without home_etc # Disable the HOME_ETC patch +# Summary: PSI - Jabber client -Summary(de.UTF-8): PSI - ein Instant Messaging Client-Programm für Jabber +Summary(de.UTF-8): PSI - ein Instant Messaging Client-Programm für das Jabber Summary(pl.UTF-8): PSI - klient Jabbera Name: psi -Version: 0.11 -Release: 0.1 +Version: 0.10 +Release: 3 License: GPL v2 Group: Applications/Communications Source0: http://dl.sourceforge.net/psi/%{name}-%{version}.tar.bz2 -# Source0-md5: 6ccc81783eece7959140951289cf5310 -Patch0: %{name}-configure_fix.patch +# Source0-md5: f0fd4ccf077f7b24e236f71c22649b7b +Source1: %{name}-richlistview.cpp +Source2: %{name}-richlistview.h +Source3: %{name}-roster-rich.README +Source4: %{name}-indicator.png +Source10: %{name}-lang-%{version}.tar.bz2 +# Source10-md5: cc949f271e204aec96b9cf90d3e88f0f + +# 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 -BuildRequires: QtXml-devel -BuildRequires: aspell-devel +BuildRequires: cyrus-sasl-devel BuildRequires: libstdc++-devel BuildRequires: openssl-devel >= 0.9.7c -BuildRequires: qca-devel >= 2.0.0 -BuildRequires: qt4-build -BuildRequires: qt4-qmake -BuildRequires: zlib-devel -Requires: qt4-plugin-qca-ossl +BuildRequires: qca-devel >= 1.0 +BuildRequires: qmake +BuildRequires: qt-devel >= 6:3.3.2-5 +BuildRequires: qt-linguist +Requires: qt-plugin-qca-tls >= 1:1.0 +Conflicts: qt-plugin-ssl = 1.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -33,50 +58,128 @@ certificates in $DATADIR/certs or in ~/.psi/certs. %description -l de.UTF-8 -Psi ist ein Instant Messaging (IM) Client-Programm für das -Jabber-Protokoll (XMPP), welches das Qt Toolkit nutzt. +Psi ist ein Instant Messaging (IM) Client-Programm für das Jabber +(XMPP) Protokoll, welches das Qt Toolkit nutzt. %description -l pl.UTF-8 -PSI jest komunikatorem dla otwartego systemu wiadomości Jabber. -Został stworzony w oparciu o bibliotekę Qt. PSI wspiera połączenia -szyfrowane SSL. W stosunku do domyślnego zachowania komunikatora -została wprowadzona zmiana, która powoduje że certyfikaty SSL są -poszukiwane w katalogu $DATADIR/certs lub ~/.psi/certs. +PSI jest komunikatorem dla otwartego systemu wiadomości Jabber. Został +stworzony w oparciu o bibliotekę Qt. PSI wspiera połączenia szyfrowane +SSL. W stosunku do domyślnego zachowania komunikatora została +wprowadzona zmiana, która powoduje że certyfikaty SSL są poszukiwane w +katalogu $DATADIR/certs lub ~/.psi/certs. + +%package -n qt-designer-psiwidgets +Summary: Psi widgets collection for Qt Designer +Summary(pl.UTF-8): Kolekcja widgetów Psi do wykorzystania w Projektancie Qt +License: GPL v2 +Group: X11/Development/Libraries + +%description -n qt-designer-psiwidgets +This is a package of widgets, that are used in Psi You may be +interested in it, if you want to develop custom dialogs, or hack +existing ones. + +%description -n qt-designer-psiwidgets -l pl.UTF-8 +Pakiet ten zawiera wtyczkę dla programu Qt Designer będącą zbiorem +widgetów użytych w programie Psi. Może się przydać tym, którzy +chcieliby napisać własne okna dialogowe albo poprawić obecne. %prep %setup -q +# PLD %patch0 -p1 -rm -rf third-party +%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 + +%{__perl} -pi -e "s,/usr/local/share/psi,%{_datadir}/psi,g" src/common.cpp +%{__perl} -pi -e 's/CONFIG \+= debug//g' src/src.pro + +cp %{SOURCE1} src/richlistview.cpp +cp %{SOURCE2} src/richlistview.h +cp %{SOURCE3} README.rich-roster +cp %{SOURCE4} indicator.png +tar -jxf %{SOURCE10} %build +export QTDIR=%{_prefix} + ./configure \ - --prefix=%{_prefix} \ - --datadir=%{_datadir} + --prefix=%{_prefix} + +qmake psi.pro \ + QMAKE_CXX="%{__cxx}" \ + QMAKE_LINK="%{__cxx}" \ + QMAKE_CXXFLAGS_RELEASE="%{rpmcflags}" \ + QMAKE_RPATH= -qt4-qmake %{__make} %install rm -rf $RPM_BUILD_ROOT -export QTDIR=%{_libdir}/qt4 +export QTDIR=%{_prefix} %{__make} install \ INSTALL_ROOT=$RPM_BUILD_ROOT +install -d \ + $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \ + $RPM_BUILD_ROOT%{_libdir}/qt/plugins-mt/designer + +install psi.desktop $RPM_BUILD_ROOT%{_desktopdir} +install iconsets/system/default/icon_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/psi.png +install indicator.png $RPM_BUILD_ROOT%{_datadir}/psi/iconsets/roster/default/indicator.png +install libpsi/psiwidgets/*.so $RPM_BUILD_ROOT%{_libdir}/qt/plugins-mt/designer +install *.qm $RPM_BUILD_ROOT%{_datadir}/psi + +rm -rf $RPM_BUILD_ROOT%{_datadir}/psi/designer +rm $RPM_BUILD_ROOT%{_datadir}/%{name}/COPYING $RPM_BUILD_ROOT%{_datadir}/%{name}/README + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc INSTALL README +%doc ChangeLog README README.rich-roster TODO %attr(755,root,root) %{_bindir}/* %dir %{_datadir}/psi %{_datadir}/psi/certs %{_datadir}/psi/iconsets %{_datadir}/psi/sound +%lang(bg) %{_datadir}/psi/psi_bg.qm +%lang(eo) %{_datadir}/psi/psi_eo.qm +%lang(es) %{_datadir}/psi/psi_es.qm +%lang(fr) %{_datadir}/psi/psi_fr.qm +%lang(hu) %{_datadir}/psi/psi_hu.qm +%lang(mk) %{_datadir}/psi/psi_mk.qm +%lang(nl) %{_datadir}/psi/psi_nl.qm +%lang(pl) %{_datadir}/psi/psi_pl.qm +%lang(pt_BR) %{_datadir}/psi/psi_pt_BR.qm +%lang(sk) %{_datadir}/psi/psi_sk.qm +%lang(sl) %{_datadir}/psi/psi_sl.qm +%lang(vi) %{_datadir}/psi/psi_vi.qm %{_desktopdir}/*.desktop -%{_iconsdir}/hicolor/*/*/*.png +%{_pixmapsdir}/*.png + +%files -n qt-designer-psiwidgets +%defattr(644,root,root,755) +%doc libpsi/psiwidgets/README +%attr(755,root,root) %{_libdir}/qt/plugins-mt/designer/libpsiwidgets.so %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -84,41 +187,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.140.2.4 2007-11-25 19:25:18 hawk -- dropping functionality in order to race for numbers is not what I like -- release down to 0.1, added blocker, all required patches from 0.10 - _must_ be ported - -Revision 1.140.2.3 2007-10-18 20:10:30 shadzik -- merged from HEAD - -Revision 1.144 2007/10/18 18:13:10 shadzik -- add patch0 which clears TODO -- rel 1 - -Revision 1.143 2007/10/18 17:42:46 shadzik -- better - -Revision 1.142 2007/10/18 17:30:15 shadzik -- no need to export QTDIR when using qt4-qmake - -Revision 1.141 2007/10/18 12:15:08 shadzik -- one more german fix -- adapterized - -Revision 1.140 2007/10/18 11:48:00 shadzik -- german summary fix - -Revision 1.139 2007/10/17 20:18:48 arekm -R: qt4-plugin-qca-ossl - -Revision 1.138 2007/10/17 20:09:47 arekm -- BR xscreensaver stuff - -Revision 1.137 2007/10/17 19:56:41 arekm -- up to 0.11; old patches/changes dropped. 0.10 series tagged with psi-0_10-3 +Revision 1.140.2.5 2008-01-25 12:07:39 hawk +- reverted to psi 0.10, version 0.11 requires qca2 which is not available in Ac -Revision 1.136 2007/09/05 14:32:29 baggins +Revision 1.136 2007-09-05 14:32:29 baggins - rel 3 Revision 1.135 2007/04/09 01:42:38 shadzik ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/psi.spec?r1=1.140.2.4&r2=1.140.2.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
