Hello community, here is the log from the commit of package psi for openSUSE:Factory checked in at Thu Feb 11 21:10:56 CET 2010. -------- --- psi/psi.changes 2010-01-31 19:03:46.000000000 +0100 +++ psi/psi.changes 2010-02-10 13:30:39.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Feb 20 13:23:57 UTC 2010 - axel@links2linux.de + +- built with configure options "--debug" and "--no-seperate-debug-info" + instead of "--release" to get useful debug-packages without creating + an extra > 25MB psi.debug binary +- added support for "off the record" encryption (OTR) (enable_otr.patch) +- added desktop_file.patch +- spec cleanup + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- psi-0.13-mpris.patch psi-0.13-sxe-debug.patch psi-0.13-whiteboarding.patch New: ---- psi-0.14-desktop_file.patch psi-0.14-enable_otr.patch psi-0.14-mpris.patch psi-0.14-sxe-debug.patch psi-0.14-whiteboarding.patch psi-otr-0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi.spec ++++++ --- /var/tmp/diff_new_pack.HHnfnT/_old 2010-02-11 21:09:40.000000000 +0100 +++ /var/tmp/diff_new_pack.HHnfnT/_new 2010-02-11 21:09:40.000000000 +0100 @@ -17,15 +17,19 @@ # norootforbuild +%define otrplugin_version 0.5 Name: psi Url: http://psi-im.org/ License: GPLv2+ Group: Productivity/Networking/Talk/Clients Version: 0.14 -Release: 1 +Release: 2 Summary: Jabber client using Qt Source: http://downloads.sourceforge.net/psi/%{name}-%{version}.tar.bz2 +# OTR support: http://public.beuth-hochschule.de/~s30935/ +# http://public.beuth-hochschule.de/~s30935/files/psi-otr-0.5.tar.gz +Source1: psi-otr-%{otrplugin_version}.tar.bz2 Source30: http://psi-im.org/download/lang/psi_be.qm Source31: http://psi-im.org/download/lang/qt_be.qm Source32: http://psi-im.org/download/lang/psi_cs.qm @@ -50,12 +54,18 @@ Source51: http://psi-im.org/download/lang/psi_ur_PK.qm Source52: http://psi-im.org/download/lang/qt_ur_PK.qm Source53: http://psi-im.org/download/lang/psi_zh_TW.qm -Patch0: %{name}-0.13-mpris.patch -Patch1: %{name}-0.13-whiteboarding.patch -Patch2: %{name}-0.13-sxe-debug.patch +Patch0: %{name}-0.14-enable_otr.patch +Patch1: %{name}-0.14-whiteboarding.patch +Patch2: %{name}-0.14-mpris.patch +Patch3: %{name}-0.14-sxe-debug.patch +Patch4: %{name}-0.14-desktop_file.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: aspell-devel libqca2-devel libqt4-devel -BuildRequires: fdupes update-desktop-files +BuildRequires: aspell-devel +BuildRequires: libqca2-devel +BuildRequires: libqt4-devel +BuildRequires: libotr-devel +BuildRequires: fdupes +BuildRequires: update-desktop-files Recommends: psimedia >= 1.0.3 %description @@ -66,7 +76,7 @@ the features necessary to chat, with no bloated extras that slow your computer down. - +This package contains a plugin for "off the record" encryption (OTR). Authors: -------- @@ -77,24 +87,31 @@ Maciej Niedzielski %prep -%setup -q -%patch0 +%setup -q -a 1 +%patch0 -p1 %patch1 %patch2 +%patch3 +%patch4 %build -# do not use %configure - not real configure script +# do not use %%configure - not real configure script export QMAKE_CXXFLAGS="%{optflags}" -./configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-bundled-qca +./configure --prefix=%{_prefix} --libdir=%{_libdir} --disable-bundled-qca --enable-plugins --debug --no-separate-debug-info +make %{?jobs:-j%jobs} +pushd psi-otr-%{otrplugin_version} +mv README README.OTR +qmake make %{?jobs:-j%jobs} +popd %install make INSTALL_ROOT=%{buildroot} install rm -f %{buildroot}%{_datadir}/psi/{COPYING,README} -rm -f %{buildroot}%{_bindir}/psi.debug %suse_update_desktop_file psi install -m 0644 -t %{buildroot}%{_datadir}/%{name} $RPM_SOURCE_DIR/*.qm -mkdir -p %{buildroot}%{_libdir}/psi/plugins +mkdir -p %{buildroot}%{_libdir}/%{name}/plugins +install -m 0644 psi-otr-%{otrplugin_version}/libpsi-otr.so %{buildroot}%{_libdir}/%{name}/plugins/ %fdupes %{buildroot}%{_datadir} %clean @@ -102,7 +119,7 @@ %files %defattr(-,root,root) -%doc COPYING README +%doc COPYING README psi-otr-%{otrplugin_version}/README.OTR %{_bindir}/psi %{_datadir}/applications/psi.desktop %dir %{_datadir}/icons/hicolor @@ -117,26 +134,27 @@ %dir %{_datadir}/icons/hicolor/128x128 %dir %{_datadir}/icons/hicolor/128x128/apps %{_datadir}/icons/hicolor/*/apps/psi.png -%dir %{_libdir}/psi -%dir %{_libdir}/psi/plugins -%dir %{_datadir}/psi -%{_datadir}/psi/certs -%{_datadir}/psi/iconsets -%{_datadir}/psi/sound -%lang(be) %{_datadir}/psi/*_be.qm -%lang(cs) %{_datadir}/psi/*_cs.qm -%lang(de) %{_datadir}/psi/*_de.qm -%lang(es) %{_datadir}/psi/*_es.qm -%lang(fr) %{_datadir}/psi/*_fr.qm -%lang(it) %{_datadir}/psi/*_it.qm -%lang(ja) %{_datadir}/psi/*_ja.qm -%lang(mk) %{_datadir}/psi/*_mk.qm -%lang(pl) %{_datadir}/psi/*_pl.qm -%lang(pt_BR) %{_datadir}/psi/*_pt_BR.qm -%lang(ru) %{_datadir}/psi/*_ru.qm -%lang(sl) %{_datadir}/psi/*_sl.qm -%lang(sv) %{_datadir}/psi/*_sv.qm -%lang(ur_PK) %{_datadir}/psi/*_ur_PK.qm -%lang(zh_TW) %{_datadir}/psi/*_zh_TW.qm +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/plugins +%{_libdir}/%{name}/plugins/libpsi-otr.so +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/certs +%{_datadir}/%{name}/iconsets +%{_datadir}/%{name}/sound +%lang(be) %{_datadir}/%{name}/*_be.qm +%lang(cs) %{_datadir}/%{name}/*_cs.qm +%lang(de) %{_datadir}/%{name}/*_de.qm +%lang(es) %{_datadir}/%{name}/*_es.qm +%lang(fr) %{_datadir}/%{name}/*_fr.qm +%lang(it) %{_datadir}/%{name}/*_it.qm +%lang(ja) %{_datadir}/%{name}/*_ja.qm +%lang(mk) %{_datadir}/%{name}/*_mk.qm +%lang(pl) %{_datadir}/%{name}/*_pl.qm +%lang(pt_BR) %{_datadir}/%{name}/*_pt_BR.qm +%lang(ru) %{_datadir}/%{name}/*_ru.qm +%lang(sl) %{_datadir}/%{name}/*_sl.qm +%lang(sv) %{_datadir}/%{name}/*_sv.qm +%lang(ur_PK) %{_datadir}/%{name}/*_ur_PK.qm +%lang(zh_TW) %{_datadir}/%{name}/*_zh_TW.qm %changelog ++++++ psi-0.14-desktop_file.patch ++++++ Index: psi.desktop =================================================================== --- psi.desktop.orig +++ psi.desktop @@ -3,7 +3,7 @@ Version=1.0 Type=Application Name=Psi -GenericName=Jabber Client +GenericName=Jabber Client (with OTR support) Comment=Communicate over the Jabber network Icon=psi Exec=psi @@ -19,7 +19,7 @@ GenericName[ca]=Client Jabber Comment[ca]=Comuniqui's a través de la xarxa Jabber GenericName[cs]=Jabber Klient Comment[cs]=Komunikujte přes Jabber po síti -GenericName[de]=Jabber-Programm +GenericName[de]=Jabber-Programm (mit OTR Unterstützung) Comment[de]=Im Jabber-Netzwerk kommunizieren GenericName[eo]=Ĵabbera Klientilo Comment[eo]=Komunikiĝu per la ĵabbera reto ++++++ psi-0.14-enable_otr.patch ++++++ ++++ 817 lines (skipped) ++++++ psi-0.13-mpris.patch -> psi-0.14-mpris.patch ++++++ ++++++ psi-0.13-sxe-debug.patch -> psi-0.14-sxe-debug.patch ++++++ ++++++ psi-0.13-whiteboarding.patch -> psi-0.14-whiteboarding.patch ++++++ --- psi/psi-0.13-whiteboarding.patch 2010-01-31 19:03:44.000000000 +0100 +++ psi/psi-0.14-whiteboarding.patch 2010-02-10 13:30:37.000000000 +0100 @@ -8,7 +8,7 @@ CONFIG += pep -#CONFIG += whiteboarding +CONFIG += whiteboarding - #CONFIG += psi_plugins + CONFIG += psi_plugins DEFINES += QT_STATICPLUGIN DEFINES += QT3_SUPPORT_WARNINGS Index: src/whiteboarding/wbnewpath.cpp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org