rpms/licq/devel licq-1.3.2-viewUrl.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 licq.spec, 1.7, 1.8 sources, 1.2, 1.3
Peter Vrabec (pvrabec)
fedora-extras-commits at redhat.com
Mon Jun 12 13:51:41 UTC 2006
Author: pvrabec
Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8646
Modified Files:
.cvsignore licq.spec sources
Added Files:
licq-1.3.2-viewUrl.patch
Log Message:
htmlview is default url viewer(#193959)
licq-1.3.2-viewUrl.patch:
--- NEW FILE licq-1.3.2-viewUrl.patch ---
--- licq-1.3.2/plugins/qt-gui/src/optionsdlg.cpp.viewUrl 2006-06-12 14:45:29.000000000 +0200
+++ licq-1.3.2/plugins/qt-gui/src/optionsdlg.cpp 2006-06-12 14:32:52.000000000 +0200
@@ -1471,6 +1471,7 @@
cmbUrlViewer->insertItem("viewurl-netscape.sh");
cmbUrlViewer->insertItem("viewurl-opera.sh");
cmbUrlViewer->insertItem("viewurl-w3m.sh");
+ cmbUrlViewer->insertItem("licq-viewurl.sh");
lblTerminal = new QLabel(tr("Terminal:"), boxExtensions);
edtTerminal = new QLineEdit(tr("Terminal:"), boxExtensions);
--- licq-1.3.2/src/licq.conf.h.viewUrl 2004-09-15 17:11:20.000000000 +0200
+++ licq-1.3.2/src/licq.conf.h 2006-06-12 14:34:58.000000000 +0200
@@ -23,7 +23,7 @@
"ErrorTypes = 6\n"
"Rejects = log.rejects\n"
"Translation = none\n"
-"UrlViewer = viewurl-netscape.sh\n"
+"UrlViewer = licq-viewurl.sh\n"
"Terminal = xterm -T Licq -e \n"
"ProxyEnabled = 0\n"
"ProxyServerType = 1\n"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 12 Jan 2006 09:39:40 -0000 1.2
+++ .cvsignore 12 Jun 2006 13:51:41 -0000 1.3
@@ -1 +1,2 @@
licq-1.3.2.tar.bz2
+licq-viewurl.sh
Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- licq.spec 11 Apr 2006 11:52:04 -0000 1.7
+++ licq.spec 12 Jun 2006 13:51:41 -0000 1.8
@@ -1,12 +1,14 @@
Name: licq
Version: 1.3.2
-Release: 7
+Release: 8
License: GPL
Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
+Source1: licq-viewurl.sh
URL: http://www.licq.org/
Summary: Licq - A graphical ICQ Client for Linux
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: htmlview
BuildRequires: qt-devel
BuildRequires: gpgme-devel libgpg-error-devel
BuildRequires: openssl-devel
@@ -14,6 +16,7 @@
BuildRequires: libXScrnSaver-devel
Patch1: licq-1.3.2-gcc-4_1-patch
Patch2: licq-1.3.2-libdir.patch
+Patch3: licq-1.3.2-viewUrl.patch
%package kde
Summary: Licq plugin for KDE
@@ -46,6 +49,7 @@
%setup -q
%patch1 -p1 -b .gcc-4_1
%patch2 -p1 -b .libdir
+%patch3 -p1 -b .viewUrl
#remove cvs stuff
rm -rf `find . -name CVS`
@@ -105,6 +109,10 @@
make install
cd ../osd
make install
+
+#install url viewer
+install -m755 %SOURCE1 %buildroot/%_bindir/licq-viewurl.sh
+
%find_lang licq_osd_plugin
#remove devel
@@ -125,6 +133,7 @@
%{_bindir}/viewurl-netscape.sh
%{_bindir}/viewurl-opera.sh
%{_bindir}/viewurl-w3m.sh
+%attr(0755,root,root) %_bindir/licq-viewurl.sh
%dir %{_libdir}/licq
%{_libdir}/licq/licq_qt-gui.so
%{_datadir}/licq
@@ -160,6 +169,9 @@
%doc plugins/osd*/{AUTHORS,TODO,README,changelog}
%changelog
+* Mon Jun 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-8
+- htmlview is default url viewer(#193959)
+
* Mon Apr 11 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-7
- fix auto away, it requires libXScrnSaver-devel
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 12 Jan 2006 09:39:40 -0000 1.2
+++ sources 12 Jun 2006 13:51:41 -0000 1.3
@@ -1 +1,2 @@
0471bb8fed91eefb23dfe153c9a4a806 licq-1.3.2.tar.bz2
+b5d06b8482e9f73c3889d0b445aace00 licq-viewurl.sh
More information about the scm-commits
mailing list