rpms/licq/devel licq-1.3.2-libdir.patch,NONE,1.1 licq.spec,1.3,1.4

[Peter Vrabec (pvrabec)]

Author: pvrabec

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

Modified Files:
	licq.spec 
Added Files:
	licq-1.3.2-libdir.patch 
Log Message:
compile on x86-64


licq-1.3.2-libdir.patch:

--- NEW FILE licq-1.3.2-libdir.patch ---
--- licq-1.3.2/plugins/osd/src/Makefile.am.libdir	2006-01-13 15:06:36.000000000 +0100
+++ licq-1.3.2/plugins/osd/src/Makefile.am	2006-01-13 15:06:51.000000000 +0100
@@ -1,4 +1,4 @@
-libdir=$(prefix)/lib/licq
+#libdir=$(prefix)/lib/licq
 localedir=$(datadir)/locale
 
 AM_CXXFLAGS =  -I$(LICQ_INCLUDES) -I.. @LIBXOSD_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
--- licq-1.3.2/plugins/qt-gui/src/Makefile.am.libdir	2006-01-13 15:07:26.000000000 +0100
+++ licq-1.3.2/plugins/qt-gui/src/Makefile.am	2006-01-13 15:07:34.000000000 +0100
@@ -1,7 +1,7 @@
 EXTRA_DIST = xpm
 
 #hack, FIXME this in a clean manner
-libdir=$(prefix)/lib/licq
+#libdir=$(prefix)/lib/licq
 licq_incdir = $(LICQ_INCLUDES)
 
 AM_CPPFLAGS = -D_REENTRANT \


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- licq.spec	12 Jan 2006 15:39:28 -0000	1.3
+++ licq.spec	16 Jan 2006 11:17:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 3
+Release: 4
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -12,6 +12,7 @@
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
 Patch1: licq-1.3.2-gcc-4_1-patch
+Patch2: licq-1.3.2-libdir.patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -42,33 +43,40 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b gcc-4_1
-#remove cvs 
+%patch1 -p1 -b .gcc-4_1
+%patch2 -p1 -b .libdir
+
+#remove cvs stuff
 rm -rf `find . -name CVS`
 
 %build
-%configure --enable-gpgme --enable-openssl
-cd plugins
-cp -r qt-gui kde-gui
-cd kde-gui
-%configure --with-kde
-cd ../qt-gui
 %configure
-cd ../osd
-%configure
-
-export OPT="$RPM_OPT_FLAGS"
-cd ../..
-make
-cd plugins/kde-gui
 make
+cd plugins
+  cp -r qt-gui kde-gui
+  cd kde-gui
+  aclocal
+  automake
+  perl am_edit {src/,share/,po/}Makefile.in
+  autoconf
+  export KDEDIR=/usr/%_lib
+  %configure --with-kde --libdir=%{_libdir}/licq
+  make
 cd ../qt-gui
-make
-#create Qt qm files
-cd po
-lrelease *.ts
+  aclocal
+  automake
+  perl am_edit {src/,share/,po/}Makefile.in
+  autoconf
+  %configure --libdir=%{_libdir}/licq
+  make
+  #create Qt qm files
+  cd po
+  lrelease *.ts
 cd ../../osd
-make
+  rm -rf autom4te.cache
+  ./build
+  %configure --libdir=%{_libdir}/licq
+  make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -90,6 +98,8 @@
 #remove devel 
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
+#remove licq.desktop installed by makefile
+rm -f $RPM_BUILD_ROOT/%{_libdir}/share/applnk/Internet/licq.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,6 +148,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Mon Jan 16 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-4
+- compile on x86-64
+
 * Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-3
 - remove devel stuff with rm -rf