Hello community, here is the log from the commit of package psi checked in at Fri Apr 4 01:43:50 CEST 2008. -------- --- psi/psi.changes 2007-07-19 21:18:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/psi/psi.changes 2008-04-03 17:11:56.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 3 16:33:18 CEST 2008 - prusnak@suse.cz + +- updated to 0.12-rc1 + * rewrite to Qt 4 and QCA 2 + * changes too numerous to list + +------------------------------------------------------------------- Old: ---- psi-0.10-desktopfile.patch psi-0.10.tar.bz2 New: ---- psi-0.12-RC1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi.spec ++++++ --- /var/tmp/diff_new_pack.wX2696/_old 2008-04-04 01:42:56.000000000 +0200 +++ /var/tmp/diff_new_pack.wX2696/_new 2008-04-04 01:42:56.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package psi (Version 0.10) +# spec file for package psi (Version 0.11.99.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,19 +10,20 @@ # norootforbuild + Name: psi -URL: http://psi-im.org/ +Url: http://psi-im.org/ License: GPL v2 or later Group: Productivity/Networking/Talk/Clients -Version: 0.10 +Version: 0.11.99.1 Release: 1 +%define real_ver 0.12-RC1 Summary: PSI Jabber client using Qt -Autoreqprov: on -Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}-desktopfile.patch +AutoReqProv: on +Source: %{name}-%{real_ver}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: qt3 qca >= 1 -BuildRequires: gcc-c++ qca-devel >= 1 qt3-devel +BuildRequires: libqt4-devel >= 4.2.0 +BuildRequires: libqca2-devel >= 2.0.0 BuildRequires: update-desktop-files %description @@ -44,27 +45,17 @@ Maciej Niedzielski %prep -%setup -%patch0 +%setup -q -n %{name}-%{real_ver} %build -# qmake bug workaround -echo "QMAKE_PROJECT_DEPTH = 1" >> src/src.pro -CFLAGS="$RPM_OPT_FLAGS" -CXXFLAGS="$RPM_OPT_FLAGS" -LDFLAGS="$RPM_OPT_FLAGS" -./configure \ - --with-qca-inc=/usr/lib/qt3/include \ - --with-qca-lib=/usr/lib/qt3/%{_lib} \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --datadir=%{_datadir} +# do not use %configure - not real configure script +./configure --prefix=%{_prefix} --disable-bundled-qca make %install make INSTALL_ROOT=%{buildroot} install mkdir -p %{buildroot}%{_datadir}/pixmaps -cp iconsets/system/default/icon_mac.png %{buildroot}%{_datadir}/pixmaps/psi.png +cp iconsets/system/default/logo_48.png %{buildroot}%{_datadir}/pixmaps/psi.png %suse_update_desktop_file psi %clean @@ -80,8 +71,12 @@ %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/pixmaps/psi.png %{_datadir}/psi -%doc ChangeLog COPYING README TODO +%doc COPYING README %changelog -* Thu Jul 19 2007 - pcerny@suse.cz +* Thu Apr 03 2008 prusnak@suse.cz +- updated to 0.12-rc1 + * rewrite to Qt 4 and QCA 2 + * changes too numerous to list +* Thu Jul 19 2007 pcerny@suse.cz - initial package version 0.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org