Revisions of Licq

unknown committed (revision 86)
unknown committed (revision 85)
unknown committed (revision 84)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 83)
--This line, and those below, will be ignored--

!    licq-1.3.5.3-config-fix.patch
!    licq-1.3.5.3-two_desktop_files.patch
!    licq-1.3.5.3-userinfodlg.patch
!    licq-1.3.5.3-viewurl.patch
A    licq-1.3.6-config-fix.patch
A    licq-1.3.6-rc1.tar.bz2
A    licq-1.3.6-two_desktop_files.patch
A    licq-1.3.6-userinfodlg.patch
A    licq-1.3.6-viewurl.patch
M    licq.spec

Diff for working copy: .
Index: licq.spec
===================================================================

--- licq.spec     (revision 82) 
+++ licq.spec     (working copy) 
@@ -21,19 +21,20 @@
 License:        GPL v2 or later
 Group:          Productivity/Networking/ICQ
 AutoReqProv:    on
-Version:        1.3.5.3
+Version:        1.3.5.99.1
+Þfine         pkgversion 1.3.6
 Release:        4
 Summary:        Linux ICQ Client
-Source:         licq-20080716.tar.bz2
+Source:         licq-1.3.6-rc1.tar.bz2
 #Source1:        icqnd-0.2BETA.tar.bz2
 Source2:        licq.png
 %if 0%{?suse_version} > 1000
 Recommends:     sox
 %endif
-Patch1:         %{name}-%{version}-config-fix.patch
-Patch5:         %{name}-%{version}-userinfodlg.patch
-Patch6:         %{name}-%{version}-viewurl.patch
-Patch7:         %{name}-%{version}-two_desktop_files.patch
+Patch1:         %{name}-%{pkgversion}-config-fix.patch
+Patch5:         %{name}-%{pkgversion}-userinfodlg.patch
+Patch6:         %{name}-%{pkgversion}-viewurl.patch
+Patch7:         %{name}-%{pkgversion}-two_desktop_files.patch
 #Patch20:        icqnd-0.1.9-libdir_64bit.patch
 #Patch21:        icqnd-0.1.9-do_not_strip.patch
 Url:            http://www.licq.org/
@@ -96,7 +97,7 @@
 #    Joachim Staib <staib@qnd-media.de>
 
 %prep
-%setup -n licq-20080716
+%setup -n licq-1.3.6-rc1
 ## move icqnd source into plugins where it belongs
 #mv 0.2BETA plugins/icqnd
 %patch1
@@ -117,7 +118,7 @@
 export CXXFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
 export CPPFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
 %endif
-make -f Makefile.cvs
+#make -f Makefile.cvs
 aclocal
 automake
 autoconf
@@ -131,7 +132,7 @@
 cd plugins
   cp -a qt-gui kde-gui
 cd rms
-  make -f Makefile.cvs
+#  make -f Makefile.cvs
   aclocal
   automake
   autoconf
@@ -153,7 +154,7 @@
 #  make %{?jobs:-j%jobs}
 ###
 cd ../console
-  make -f Makefile.cvs
+#  make -f Makefile.cvs
   aclocal
   automake
   autoconf
@@ -170,7 +171,7 @@
   make %{?jobs:-j%jobs}
   cd ..
 cd ../qt-gui
-  make -f Makefile.cvs
+#  make -f Makefile.cvs
         aclocal
 	automake
 	perl am_edit {src/,share/,po/}Makefile.in
@@ -182,7 +183,7 @@
 		--mandir=%{_mandir}
   make %{?jobs:-j%jobs}
 cd ../kde-gui
-  make -f Makefile.cvs
+#  make -f Makefile.cvs
 	aclocal
 	automake
 	perl am_edit {src/,share/,po/}Makefile.in
@@ -195,7 +196,7 @@
 		--mandir=%{_mandir}
   make %{?jobs:-j%jobs}
 cd ../email
-  make -f Makefile.cvs
+#  make -f Makefile.cvs
   aclocal -I /usr/share/aclocal
   automake
   autoconf
@@ -205,7 +206,7 @@
         --mandir=%{_mandir}
   make %{?jobs:-j%jobs}
 cd ../auto-reply
-  make -f Makefile.cvs
+#  make -f Makefile.cvs
   aclocal
   automake
   autoconf
@@ -215,7 +216,7 @@
         --mandir=%{_mandir}
   make %{?jobs:-j%jobs}
 cd ../osd
-  make -f Makefile.cvs
+#  make -f Makefile.cvs
   gettextize -f
   aclocal
   automake
@@ -226,7 +227,7 @@
         --mandir=%{_mandir}
   make %{?jobs:-j%jobs}
 cd ../msn
-  make -f Makefile.cvs
+#  make -f Makefile.cvs
   aclocal
   automake
   autoconf

Index: licq-1.3.6-config-fix.patch
===================================================================

--- licq-1.3.6-config-fix.patch     (revision 82) 
+++ licq-1.3.6-config-fix.patch     (working copy) 
@@ -1,0 +1,60 @@
+--- plugins/auto-reply/src/Makefile.am
++++ plugins/auto-reply/src/Makefile.am
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS = -Wall @WEXTRA@
+ 
+-libdir=@libdir@/licq/
++#libdir = $(prefix)/lib/licq
+ plugindir = $(libdir)
+ licq_incdir = @LICQ_INCLUDES@
+ 
+--- plugins/console/src/Makefile.am
++++ plugins/console/src/Makefile.am
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS = -Wall @WEXTRA@
+ 
+-libdir=@libdir@/licq/
++#libdirlibdir=@libdir@/licq/
+ plugindir = $(libdir)
+ licq_incdir = @LICQ_INCLUDES@
+ 
+--- plugins/email/src/Makefile.am
++++ plugins/email/src/Makefile.am
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS = -Wall @WEXTRA@
+ 
+-libdir=@libdir@/licq/
++#libdir = $(prefix)/lib/licq/
+ plugindir = $(libdir)
+ licq_incdir = @LICQ_INCLUDES@
+ 
+--- plugins/msn/src/Makefile.am
++++ plugins/msn/src/Makefile.am
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS = -Wall @WEXTRA@
+ 
+-libdir=@libdir@/licq/
++#libdir=@libdir@/licq/
+ plugindir = $(libdir)
+ licq_incdir = @LICQ_INCLUDES@
+ 
+--- plugins/qt-gui/src/Makefile.am
++++ plugins/qt-gui/src/Makefile.am
+@@ -1,6 +1,6 @@
+ EXTRA_DIST = xpm
+ 
+-libdir=@libdir@/licq/
++#libdir=@libdir@/licq/
+ licq_incdir = $(LICQ_INCLUDES)
+ 
+ AM_CPPFLAGS = -D_REENTRANT \
+--- plugins/rms/src/Makefile.am
++++ plugins/rms/src/Makefile.am
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS = -Wall @WEXTRA@
+ 
+-libdir=@libdir@/licq/
++#libdir = $(prefix)/lib/licq/
+ plugindir = $(libdir)
+ licq_incdir = @LICQ_INCLUDES@
+ 

Index: licq-1.3.6-rc1.tar.bz2
===================================================================

Binary file licq-1.3.6-rc1.tar.bz2 has changed

Index: licq-1.3.6-two_desktop_files.patch
===================================================================

--- licq-1.3.6-two_desktop_files.patch     (revision 82) 
+++ licq-1.3.6-two_desktop_files.patch     (working copy) 
@@ -1,0 +1,10 @@
+--- plugins/qt-gui/share/Makefile.am
++++ plugins/qt-gui/share/Makefile.am
+@@ -16,7 +16,6 @@
+ 		fi; \
+ 		appsdir=`echo $$appsdir | sed -e 's#$${datadir}#$(datadir)#'`; \
+ 		$(mkinstalldirs) $(DESTDIR)$$appsdir; \
+-		$(INSTALL_DATA) $(srcdir)/licq.desktop $(DESTDIR)$$appsdir; \
+ 	else \
+ 		$(mkinstalldirs) $(DESTDIR)$(datadir)/applications; \
+ 		$(INSTALL_DATA) $(srcdir)/licq.desktop $(DESTDIR)$(datadir)/applications; \

Index: licq-1.3.6-userinfodlg.patch
===================================================================

--- licq-1.3.6-userinfodlg.patch     (revision 82) 
+++ licq-1.3.6-userinfodlg.patch     (working copy) 
@@ -1,0 +1,115 @@
+--- plugins/qt-gui/src/userinfodlg.cpp
++++ plugins/qt-gui/src/userinfodlg.cpp
+@@ -135,7 +135,7 @@
+   tabs->addTab(tabList[KABCInfo].tab, tabList[KABCInfo].label);
+ #endif
+ 
+-  connect (tabs, SIGNAL(selected(const QString &)), this, SLOT(updateTab(const QString &)));
++  connect (tabs, SIGNAL(currentChanged(QWidget*)), this, SLOT(updateTab(QWidget*)));
+   connect (sigman, SIGNAL(signal_updatedUser(CICQSignal *)),
+            this, SLOT(updatedUser(CICQSignal *)));
+ 
+@@ -2086,9 +2086,9 @@
+ 
+ // -----------------------------------------------------------------------------
+ 
+-void UserInfoDlg::updateTab(const QString& txt)
++void UserInfoDlg::updateTab(QWidget* tab)
+ {
+-  if (txt == tabList[GeneralInfo].label)
++  if (tab == tabList[GeneralInfo].tab)
+   {
+     currentTab = GeneralInfo;
+     btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
+@@ -2100,7 +2100,7 @@
+     if (!tabList[GeneralInfo].loaded)
+       SetGeneralInfo(NULL);
+   }
+-  else if (txt == tabList[MoreInfo].label)
++  else if (tab == tabList[MoreInfo].tab)
+   {
+     btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
+     btnMain2->setText(m_bOwner ? tr("&Retrieve") : tr("&Save"));
+@@ -2112,7 +2112,7 @@
+     if (!tabList[MoreInfo].loaded)
+       SetMoreInfo(NULL);
+   }
+-  else if (txt == tabList[More2Info].label)
++  else if (tab == tabList[More2Info].tab)
+   {
+      btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
+      btnMain2->setText(m_bOwner ? tr("&Retrieve") : tr("&Save"));
+@@ -2124,7 +2124,7 @@
+      if (!tabList[More2Info].loaded)
+        SetMore2Info(NULL);
+   }
+-  else if (txt == tabList[WorkInfo].label)
++  else if (tab == tabList[WorkInfo].tab)
+   {
+     btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
+     btnMain2->setText(m_bOwner ? tr("&Retrieve") : tr("&Save"));
+@@ -2136,7 +2136,7 @@
+     if (!tabList[WorkInfo].loaded)
+       SetWorkInfo(NULL);
+   }
+-  else if (txt == tabList[AboutInfo].label)
++  else if (tab == tabList[AboutInfo].tab)
+   {
+     btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
+     btnMain2->setText(m_bOwner ? tr("&Retrieve") : tr("&Save"));
+@@ -2148,7 +2148,7 @@
+     if (!tabList[AboutInfo].loaded)
+       SetAbout(NULL);
+   }
+-  else if (txt == tabList[PhoneInfo].label)
++  else if (tab == tabList[PhoneInfo].tab)
+   {
+     btnMain3->setText(m_bOwner ? tr("&Add")   : tr("&Update"));
+     btnMain2->setText(m_bOwner ? tr("&Clear") : tr("&Save"));
+@@ -2160,7 +2160,7 @@
+     if (!tabList[PhoneInfo].loaded)
+       SetPhoneBook(NULL);
+   }
+-  else if (txt == tabList[PictureInfo].label)
++  else if (tab == tabList[PictureInfo].tab)
+   {
+     btnMain3->setText(m_bOwner ? tr("&Browse") : tr("&Update"));
+     btnMain2->setText(m_bOwner ? tr("&Clear")  : tr("&Save"));
+@@ -2172,7 +2172,7 @@
+     if (!tabList[PictureInfo].loaded)
+       SetPicture(NULL);
+   }
+-  else if (txt == tabList[HistoryInfo].label)
++  else if (tab == tabList[HistoryInfo].tab)
+   {
+     btnMain3->setText(tr("Nex&t"));
+     btnMain2->setText(tr("P&rev"));
+@@ -2188,7 +2188,7 @@
+       SetupHistory();
+     mlvHistory->setFocus();
+   }
+-  else if (txt == tabList[LastCountersInfo].label)
++  else if (tab == tabList[LastCountersInfo].tab)
+   {
+     currentTab = LastCountersInfo;
+     btnMain3->setText("");
+@@ -2201,7 +2201,7 @@
+       SetLastCountersInfo(NULL);
+   }
+ #ifdef USE_KABC
+-  else if (txt == tabList[KABCInfo].label)
++  else if (tab == tabList[KABCInfo].tab)
+   {
+     currentTab = KABCInfo;
+     btnMain3->setText(tr("&Browse"));
+--- plugins/qt-gui/src/userinfodlg.h
++++ plugins/qt-gui/src/userinfodlg.h
+@@ -202,7 +202,7 @@
+   void ShowHistoryNext();
+   void HistoryReverse(bool);
+   void HistoryReload();
+-  void updateTab(const QString&);
++  void updateTab(QWidget*);
+   void updatedUser(CICQSignal*);
+   void SaveSettings();
+   void slotUpdate();

Index: licq-1.3.6-viewurl.patch
===================================================================

--- licq-1.3.6-viewurl.patch     (revision 82) 
+++ licq-1.3.6-viewurl.patch     (working copy) 
@@ -1,0 +1,104 @@
+--- bin/viewurl-mozilla.sh
++++ bin/viewurl-mozilla.sh
+@@ -20,9 +20,15 @@
+ #      "new-window" - opens URL in a new window
+ #      "current" - opens URL in the current window
+ #
++#
++# Because Mozilla is not a part of Suse Linux any more
++# script was rewritten to use Firefox instead.
++# Rewrite the MOZILLA=firefox into MOZILLA=mozilla
++# if you want to use Mozilla, if installed.
++#
+ 
+ if [ -z "${VURL_MOZILLA}" ]; then
+-  MOZILLA=mozilla
++  MOZILLA=firefox
+ else
+   MOZILLA=${VURL_MOZILLA}
+ fi
+@@ -51,6 +57,5 @@
+   OPENSTRING="${URL},${OPENMODE}"
+ fi
+ 
+-# If mozilla is already running, open the URL as new tab,
+-# otherwise launch a fresh copy of mozilla.
+-((${MOZILLA} -remote openurl\("${OPENSTRING}"\) ) ||  (${MOZILLA} "${URL}") & ) > /dev/null 2>&1
++( (${MOZILLA} "${URL}") & ) > /dev/null 2>&1
++
+--- bin/viewurl-netscape.sh
++++ bin/viewurl-netscape.sh
+@@ -19,9 +19,50 @@
+ # Netscape lockfile does not exist;
+ #	-> Open new window.
+ #
++# Because Netscape is not a part of Suse Linux any more
++# script was rewritten to use Firefox instead.
++# Uncomment what is commented bellow and comment the rest in case
++# you want to use Netscape, if installed.
++#
++#
++#
++#NETSCAPE=netscape
++#URLHOME='http://www.linux.org'
++#
++#if [ "$1" = "" ] ; then
++#  URL=$URLHOME
++#else
++#  URL=$1
++#fi
++#
++#if [ -h ${HOME}/.netscape/lock ]; then
++#  if ps -e | grep netscape > /dev/null ; then
++#     ${NETSCAPE} -remote openURL\("$URL"\,new_window\) &
++#  else
++#     rm ${HOME}/.netscape/lock
++#     ${NETSCAPE} "$URL" &
++#  fi
++#else
++#  ${NETSCAPE} "$URL" &
++#fi
++#
++if [ -z "${VURL_MOZILLA}" ]; then
++  MOZILLA=firefox
++else
++  MOZILLA=${VURL_MOZILLA}
++fi
+ 
+-NETSCAPE=netscape
+-URLHOME='http://www.linux.org'
++if [ -z "${VURL_HOME}" ]; then
++  URLHOME='http://www.licq.org'
++else
++  URLHOME="${VURL_HOME}"
++fi
++
++if [ -z "${VURL_OPENMODE}" ]; then
++  OPENMODE=new-tab
++else
++  OPENMODE="${VURL_OPENMODE}"
++fi
+ 
+ if [ "$1" = "" ] ; then
+   URL=$URLHOME
+@@ -29,15 +70,12 @@
+   URL=$1
+ fi
+ 
+-if [ -h ${HOME}/.netscape/lock ]; then
+-  if ps -e | grep netscape > /dev/null ; then
+-     ${NETSCAPE} -remote openURL\("$URL"\,new_window\) &
+-  else
+-     rm ${HOME}/.netscape/lock
+-     ${NETSCAPE} "$URL" &
+-  fi
++if [ "${OPENMODE}" = "current" ]; then
++  OPENSTRING="${URL}"
+ else
+-  ${NETSCAPE} "$URL" &
++  OPENSTRING="${URL},${OPENMODE}"
+ fi
+ 
++( (${MOZILLA} "${URL}") & ) > /dev/null 2>&1
++
+
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 82)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 81)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 80)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 79)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 78)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 77)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 76)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 75)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 74)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 73)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 72)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 71)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 70)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 69)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 68)
Ladislav Michnovic's avatar Ladislav Michnovic (lmich) committed (revision 67)
Displaying revisions 1 - 20 of 86
openSUSE Build Service is sponsored by