rpms/licq/devel .cvsignore, 1.3, 1.4 licq.spec, 1.11, 1.12 sources, 1.3, 1.4 licq-1.3.2-gcc-4_1-patch, 1.1, NONE licq-1.3.2-libdir.patch, 1.1, NONE licq-1.3.2-viewUrl.patch, 1.1, NONE

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18217

Modified Files:
	.cvsignore licq.spec sources 
Removed Files:
	licq-1.3.2-gcc-4_1-patch licq-1.3.2-libdir.patch 
	licq-1.3.2-viewUrl.patch 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jun 2006 13:51:41 -0000	1.3
+++ .cvsignore	27 Oct 2006 11:29:04 -0000	1.4
@@ -1,2 +1 @@
-licq-1.3.2.tar.bz2
-licq-viewurl.sh
+licq-1.3.4.tar.gz


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- licq.spec	4 Oct 2006 23:03:17 -0000	1.11
+++ licq.spec	27 Oct 2006 11:29:04 -0000	1.12
@@ -1,9 +1,8 @@
 Name: licq
-Version: 1.3.2
-Release: 11
+Version: 1.3.4
+Release: 1
 License: GPL
-Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
-Source1: licq-viewurl.sh
+Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 URL: http://www.licq.org/
 Summary: Licq - A graphical ICQ Client for Linux
 Group: Applications/Internet
@@ -15,9 +14,6 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libXScrnSaver-devel
 BuildRequires: gettext, automake, libtool
-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
@@ -48,15 +44,14 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .gcc-4_1
-%patch2 -p1 -b .libdir
-%patch3 -p1 -b .viewUrl
 
 #remove cvs stuff
 rm -rf `find . -name CVS`
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
+export KDEDIR=/usr/%_lib
+
 sed -i s/lib/%{_lib}/ include/licq_constants.h
 %configure
 make
@@ -67,12 +62,9 @@
   automake
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
-  export KDEDIR=/usr/%_lib
   %configure \
      --with-kde \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/
   make
 cd ../qt-gui
   aclocal
@@ -80,19 +72,10 @@
   perl am_edit {src/,share/,po/}Makefile.in
   autoconf
   %configure \
-     --libdir=%{_libdir}/licq \
-     --with-qt-includes=%{_libdir}/qt-3.3/include \
-     --with-qt-libraries=%{_libdir}/qt-3.3/lib/
+     --libdir=%{_libdir}/ \
   make
-  #create Qt qm files
-  cd po
-  lrelease *.ts
-cd ../../osd
-  rm -rf autom4te.cache
-  sed -i s/aclocal-1.7/aclocal/ build
-  sed -i s/automake-1.7/automake/ build
-  ./build
-  %configure --libdir=%{_libdir}/licq
+cd ../osd
+  %configure --libdir=%{_libdir}/
   make
 
 %install
@@ -111,16 +94,13 @@
 cd ../osd
 make install
 
-#install url viewer
-install -m755 %SOURCE1 %buildroot/%_bindir/licq-viewurl.sh
-
 %find_lang licq_osd_plugin
 
 #remove devel 
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
-#remove licq.desktop installed by makefile
-rm -rf $RPM_BUILD_ROOT/usr/share/applnk/Internet/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/licq.desktop
+rm -r  $RPM_BUILD_ROOT/%{_datadir}/applications/kde/licq.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +114,8 @@
 %{_bindir}/viewurl-netscape.sh
 %{_bindir}/viewurl-opera.sh
 %{_bindir}/viewurl-w3m.sh
-%attr(0755,root,root) %_bindir/licq-viewurl.sh
+%{_bindir}/viewurl-firefox.sh
+%{_bindir}/viewurl-seamonkey.sh
 %dir %{_libdir}/licq
 %{_libdir}/licq/licq_qt-gui.so
 %{_datadir}/licq
@@ -157,7 +138,7 @@
 %lang(tr) %{_datadir}/licq/qt-gui/locale/tr.qm
 %lang(uk) %{_datadir}/licq/qt-gui/locale/uk.qm
 %{_datadir}/applications/fedora-licq.desktop
-%doc doc/ upgrade/ ChangeLog README* LICENSE
+%doc doc/ upgrade/ README* LICENSE
 
 %files kde
 %defattr(-,root,root)
@@ -170,8 +151,8 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.3.2-11
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Fri Sep 27 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.4-1
+- upgrade
 
 * Mon Sep 18 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-10
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jun 2006 13:51:41 -0000	1.3
+++ sources	27 Oct 2006 11:29:04 -0000	1.4
@@ -1,2 +1 @@
-0471bb8fed91eefb23dfe153c9a4a806  licq-1.3.2.tar.bz2
-b5d06b8482e9f73c3889d0b445aace00  licq-viewurl.sh
+34a51541173a2ba453b5984b52bfa489  licq-1.3.4.tar.gz


--- licq-1.3.2-gcc-4_1-patch DELETED ---


--- licq-1.3.2-libdir.patch DELETED ---


--- licq-1.3.2-viewUrl.patch DELETED ---