Hello community,
here is the log from the commit of package kvirc
checked in at Thu Sep 7 01:21:01 CEST 2006.
--------
--- KDE/kvirc/kvirc.changes 2006-07-18 12:10:04.000000000 +0200
+++ kvirc/kvirc.changes 2006-09-06 01:06:57.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 6 01:01:28 CEST 2006 - ro@suse.de
+
+- update to 3.2.4
+ - uparser is definitively gone: KVS is the reality.
+ - many cleanups all over, including documentation
+ - countless bugfixes
+
+-------------------------------------------------------------------
Old:
----
kvirc-3.2.0.dif
kvirc-3.2.0.tar.bz2
kvirc-link.diff
New:
----
kvirc-3.2.4.tar.bz2
kvirc-browser.patch
kvirc-retval.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kvirc.spec ++++++
--- /var/tmp/diff_new_pack.kSpkX1/_old 2006-09-07 01:18:18.000000000 +0200
+++ /var/tmp/diff_new_pack.kSpkX1/_new 2006-09-07 01:18:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kvirc (Version 3.2.0)
+# spec file for package kvirc (Version 3.2.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,19 @@
# norootforbuild
Name: kvirc
-BuildRequires: kdelibs3-devel
+%define _prefix /opt/kde3
+%define _mandir /usr/share/man
+%define _realversion 3.2
+BuildRequires: kdebase3-devel update-desktop-files
URL: http://www.kvirc.net/
License: GPL
Group: Productivity/Networking/IRC
Summary: Graphical Front-End for IRC
-Version: 3.2.0
-Release: 23
-%define realversion 3.2.0
-Source0: kvirc-%{realversion}.tar.bz2
-Patch0: kvirc-%{realversion}.dif
-Patch1: kvirc-link.diff
+Version: 3.2.4
+Release: 1
+Source: kvirc-%{version}.tar.bz2
+Patch: kvirc-browser.patch
+Patch1: kvirc-retval.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -36,9 +38,10 @@
--------
Szymon Stefanek
-%package devel
+%package -n kvirc-devel
Summary: Graphical Front-End for IRC
Group: Productivity/Networking/IRC
+Requires: kvirc = %{version}
%description devel
IRC (Internet Relay Chat) client with an MDI interface; scripting,
@@ -53,95 +56,82 @@
Szymon Stefanek
%prep
-%setup -q -n kvirc-%{realversion}
-%patch0
-%patch1 -b .orig
+%setup -q
+%patch
+%patch1
%build
-for i in `find po -name "*.po" ` ; do
- msgconv -t UTF-8 $i > $i.new 2>/dev/null && mv $i.new $i
-done
-#
-%{?suse_update_config:%{suse_update_config -l -f . }}
-KDEDIR=/opt/kde3
+. /etc/opt/kde3/common_options
./autogen.sh
-CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DNDEBUG " ./configure \
- --prefix=/opt/kde3 \
- --mandir=%{_mandir} \
+./configure $configkde \
+ --with-qt-library-dir=/usr/lib/qt3/%{_lib} \
--libdir=/opt/kde3/%{_lib} \
- --with-qt-dir=/usr/lib/qt3 \
- --with-qt-name=qt-mt \
- --with-qt-library-dir=/usr/lib/qt3/%_lib \
- --with-qt-include-dir=/usr/lib/qt3/include \
- --with-qt-moc=/usr/lib/qt3/bin/moc \
- --disable-qt-mt \
- --with-kde-support \
- --with-kde-library-dir=/opt/kde3/%_lib \
- --with-aa-fonts \
- --with-local-8bit \
- --with-ipv6-support \
- --enable-static
+ --with-kde-library-dir=/opt/kde3/%{_lib} \
+ --disable-final
make -C src/kvilib/build symlinks
make -C src/kvirc/build symlinks
-make -d %{?jobs:-j%jobs}
+
+%__make %{?jobs:-j%jobs}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/opt/kde3/share/applnk/Internet
-install -d $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/text
-#install -d $RPM_BUILD_ROOT/%{_mandir}/man1
-#mv $RPM_BUILD_ROOT/%{_mandir}/kvirc.1 $RPM_BUILD_ROOT/%{_mandir}/man1
-find $RPM_BUILD_ROOT -name "*.la" | xargs chmod 644
+%makeinstall
+
+%__install -d %{buildroot}%{_datadir}/applnk/Internet
+
+%__install -d %{buildroot}%{_datadir}/mimelnk/text
%suse_update_desktop_file kvirc Network IRCClient
-# conflicts with kopete from KDE 3.3
-rm $RPM_BUILD_ROOT/opt/kde3/share/services/irc.protocol
-# cleanup unused files that just make the package big
-rm -f $RPM_BUILD_ROOT/opt/kde3/share/kvirc/%{version}/modules/lib*.a
+# conflicts with kopete
+
+%__rm -f %{buildroot}%{_datadir}/services/irc.protocol
+
+%__rm -f %{buildroot}%{_datadir}/kvirc/3.2/modules/lib*.la
+
+%__rm -f %{buildroot}%{_libdir}/lib*.la
%post
-%run_ldconfig
+%{run_ldconfig}
+
+%clean
+# clean up the hard disc after build
-%postun
-%run_ldconfig
+%__rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc TODO README INSTALL ChangeLog
-%doc %{_mandir}/man1/kvirc.1.gz
-%dir /opt/kde3/share/kvirc
-%dir /opt/kde3/share/kvirc/%{realversion}
-/opt/kde3/share/appl*/*/*
-/opt/kde3/share/icons/*
-/opt/kde3/share/mimelnk/text/*
-/opt/kde3/share/services/*
-%config(noreplace) /opt/kde3/share/kvirc/%{realversion}/config
-/opt/kde3/share/kvirc/%{realversion}/defscript
-/opt/kde3/share/kvirc/%{realversion}/help
-/opt/kde3/share/kvirc/%{realversion}/license
-/opt/kde3/share/kvirc/%{realversion}/locale
-/opt/kde3/share/kvirc/%{realversion}/modules
-/opt/kde3/share/kvirc/%{realversion}/pics
-/opt/kde3/share/kvirc/%{realversion}/msgcolors
-/opt/kde3/share/kvirc/%{realversion}/themes
-#/opt/kde2/bin/kvi_make_scriptdist.sh
-/opt/kde3/bin/kvi_run_netscape.sh
-/opt/kde3/bin/kvi_search_help.sh
-/opt/kde3/bin/kvirc
-#/opt/kde3/%_lib/libkvicore.*
-/opt/kde3/%_lib/libkvilib.*so*
-#/opt/kde2/share/applnk/Internet/kvirc.desktop
-#/opt/kde2/share/icons/hicolor/*/apps/kvirc.png
-#%{_mandir}/man1/kvirc.1.gz
+%{_bindir}/kvirc
+%{_bindir}/kvi_run_netscape
+%{_bindir}/kvi_search_help
+%{_libdir}/libkvilib.so.*
+%{_datadir}/appl*/*/*
+%{_datadir}/icons/*
+%{_datadir}/mimelnk/text/*
+%{_datadir}/services/*
+%dir %{_datadir}/kvirc
+%dir %{_datadir}/kvirc/%{_realversion}
+%config(noreplace) %{_datadir}/kvirc/%{_realversion}/config
+%{_datadir}/kvirc/%{_realversion}/defscript
+%{_datadir}/kvirc/%{_realversion}/help
+%{_datadir}/kvirc/%{_realversion}/license
+%{_datadir}/kvirc/%{_realversion}/locale
+%{_datadir}/kvirc/%{_realversion}/modules
+%{_datadir}/kvirc/%{_realversion}/pics
+%{_datadir}/kvirc/%{_realversion}/msgcolors
+%{_datadir}/kvirc/%{_realversion}/themes
+%{_mandir}/man?/kvirc.1.gz
%files devel
%defattr(-,root,root)
-/opt/kde3/bin/kvirc-config
-/opt/kde3/include/kvirc
-/opt/kde3/%_lib/libkvilib.la
-/opt/kde3/%_lib/libkvilib.a
-/opt/kde3/%_lib/libkvilib.a
+%{_bindir}/kvirc-config
+%{_includedir}/kvirc
+%{_libdir}/libkvilib.so
%changelog -n kvirc
+* Wed Sep 06 2006 - ro@suse.de
+- update to 3.2.4
+- uparser is definitively gone: KVS is the reality.
+- many cleanups all over, including documentation
+- countless bugfixes
* Tue Jul 18 2006 - dmueller@suse.de
- fix build
* Tue Jun 20 2006 - dmueller@suse.de
++++++ kvirc-3.2.0.tar.bz2 -> kvirc-3.2.4.tar.bz2 ++++++
++++ 746340 lines of diff (skipped)
++++++ kvirc-browser.patch ++++++
--- scripts/browser/kvi_run_netscape
+++ scripts/browser/kvi_run_netscape 2006/08/16 14:41:14
@@ -5,6 +5,9 @@
if [ -z "$1" ]; then
echo "Missing URL"
else
+ if which desktop-launch > /dev/null; then
+ desktop-launch "$1" 2>/dev/null
+ else
if which netscape > /dev/null; then
BROWSER=netscape
elif which mozilla > /dev/null; then
@@ -17,4 +20,5 @@
echo "$BROWSER is not currently running. Starting a new instance..."
$BROWSER "$1" &
fi
+ fi
fi
++++++ kvirc-retval.patch ++++++
--- src/kvirc/kernel/kvi_app_setup.cpp
+++ src/kvirc/kernel/kvi_app_setup.cpp 2006/09/05 23:20:24
@@ -304,6 +304,7 @@
// If we have it , ok...done
if(checkLocalKvircDirectory(m_szLocalKvircDir))return true;
+ return false;
}
void KviApp::loadDirectories()
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org