SPECS: kvirc.spec - fix build on my amd64

[glen]

Author: glen                         Date: Sat Sep 24 15:06:23 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix build on my amd64

---- Files affected:
SPECS:
   kvirc.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/kvirc.spec
diff -u SPECS/kvirc.spec:1.46 SPECS/kvirc.spec:1.47
--- SPECS/kvirc.spec:1.46	Sat Jun 18 16:47:39 2005
+++ SPECS/kvirc.spec	Sat Sep 24 17:06:18 2005
@@ -4,23 +4,22 @@
 # - do something about the conflicting file /usr/share/services/irc.protocol
 # - installed but unpackaged: /usr/share/locale/{de,it}/LC_MESSAGES/perlcore.mo
 
-%define		_ver	3.2.0
 #define		_snap	20040211
-%define		_snap	%nil
+%define		_snap	%{nil}
 Summary:	KDE Enhanced Visual IRC Client
 Summary(es):	KVirc - Cliente IRC
 Summary(pl):	Wizualny Klient IRC dla KDE
 Summary(pt_BR):	KVirc - Cliente IRC
 Name:		kvirc
-Version:	%{_ver}
+Version:	3.2.0
 #Release:	0.%{_snap}.4.5
 Release:	1
 License:	GPL
 Group:		X11/Applications
 Vendor:		Szymon Stefanek <kvirc at tin.it>
-Source0:	ftp://ftp.kvirc.net/pub/kvirc/%{_ver}/source/%{name}-%{_ver}.tar.bz2
+Source0:	ftp://ftp.kvirc.net/pub/kvirc/%{version}/source/%{name}-%{version}.tar.bz2
 # Source0-md5:	e783827fda3832fc3fb50e7a41ed627d
-##Source0:	ftp://ftp.kvirc.net/pub/kvirc/snapshots/source/kvirc-%{_ver}-snap%{_snap}.tar.gz
+##Source0:	ftp://ftp.kvirc.net/pub/kvirc/snapshots/source/kvirc-%{version}-snap%{_snap}.tar.gz
 ##Source0:	%{name}-snap%{_snap}.tar.bz2
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-build.patch
@@ -92,7 +91,7 @@
 # sed -i -e s,KVIRC_PROG_LIBTOOL,AC_PROG_LIBTOOL, configure.in
 
 # fix for (wrong) hardcoded path
-%{__sed} -i 's:/usr/lib/kvirc/3.0.0-beta3:%{_libdir}/kvirc/3.2.0:g' src/kvirc/kernel/kvi_app_fs.cpp
+%{__sed} -i 's:/usr/lib/kvirc/3.0.0-beta3:%{_libdir}/kvirc/%{version}:g' src/kvirc/kernel/kvi_app_fs.cpp
 
 %build
 %{__libtoolize}
@@ -106,6 +105,7 @@
 	--with-aa-fonts \
 	--with-big-channels \
 	--with-pizza \
+	--with-qt-library-dir=%{_libdir} \
 %ifarch %{ix86}
 	--with-i386-asm \
 	--with-ix86-asm \
@@ -133,8 +133,8 @@
 
 for lang in bg ca cs de es fr it nl pl pt pt_BR ru sr; do
 	for mofile in about dcc editor filetransferwindow kvirc logview notifier perl perlcore sharedfileswindow; do
-		[ -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/${mofile}_${lang}.mo ] && \
-		mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/${mofile}_${lang}.mo \
+		[ -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{version}/locale/${mofile}_${lang}.mo ] && \
+		mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{version}/locale/${mofile}_${lang}.mo \
 		      $RPM_BUILD_ROOT%{_datadir}/locale/${lang}/LC_MESSAGES/${mofile}.mo
 	done
 done
@@ -145,6 +145,17 @@
 	cat $foo.lang >> kvirc.lang
 done
 
+# should probably patch
+%if "%{_lib}" != "lib"
+mv $RPM_BUILD_ROOT/usr/{lib/kvirc,%{_lib}}
+%endif
+
+install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps
+mv $RPM_BUILD_ROOT%{_datadir}/{kvirc/%{version}/icons/*,icons/hicolor/apps}
+install -d $RPM_BUILD_ROOT%{_datadir}/mimelnk/text
+mv $RPM_BUILD_ROOT%{_datadir}/{kvirc/%{version}/mimelnk/*,mimelnk/text}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -154,33 +165,33 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README TODO doc/scriptexamples/{*.kvs,*/*.kvs,*/*.png}
-%dir %{_datadir}/kvirc/%{_ver}/help
-%dir %{_datadir}/kvirc/%{_ver}/help/en
-%doc %{_datadir}/kvirc/%{_ver}/help/en/*
+%dir %{_datadir}/kvirc/%{version}/help
+%dir %{_datadir}/kvirc/%{version}/help/en
+%doc %{_datadir}/kvirc/%{version}/help/en/*
 %attr(755,root,root) %{_bindir}/kvi_*.sh
 %attr(755,root,root) %{_bindir}/kvirc
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 %dir %{_libdir}/kvirc
-%dir %{_libdir}/kvirc/%{_ver}
-%dir %{_libdir}/kvirc/%{_ver}/modules
-%{_libdir}/kvirc/%{_ver}/modules/caps
-%attr(755,root,root) %{_libdir}/kvirc/%{_ver}/modules/*.so
+%dir %{_libdir}/kvirc/%{version}
+%dir %{_libdir}/kvirc/%{version}/modules
+%{_libdir}/kvirc/%{version}/modules/caps
+%attr(755,root,root) %{_libdir}/kvirc/%{version}/modules/*.so
 # needed or not?
-%{_libdir}/kvirc/%{_ver}/modules/*.la
+%{_libdir}/kvirc/%{version}/modules/*.la
 
 %dir %{_datadir}/kvirc
-%dir %{_datadir}/kvirc/%{_ver}
-%{_datadir}/kvirc/%{_ver}/config
-%{_datadir}/kvirc/%{_ver}/defscript
-%{_datadir}/kvirc/%{_ver}/pics
-%{_datadir}/kvirc/%{_ver}/msgcolors/*.msgclr
-%{_datadir}/kvirc/%{_ver}/themes/*/*.kvc
 %{_datadir}/mimelnk/text/*.desktop
+%dir %{_datadir}/kvirc/%{version}
+%{_datadir}/kvirc/%{version}/config
+%{_datadir}/kvirc/%{version}/defscript
+%{_datadir}/kvirc/%{version}/pics
+%{_datadir}/kvirc/%{version}/msgcolors/*.msgclr
+%{_datadir}/kvirc/%{version}/themes/*/*.kvc
 %{_datadir}/services/*
 # initial kvirc run complained on missing COPYING file
 # it's having additional clause to GPL allowing distributing binaries for win32
-%dir %{_datadir}/kvirc/%{_ver}/license
-%{_datadir}/kvirc/%{_ver}/license/COPYING
+%dir %{_datadir}/kvirc/%{version}/license
+%{_datadir}/kvirc/%{version}/license/COPYING
 
 %{_iconsdir}/hicolor/*/*/*.png
 %{_desktopdir}/*.desktop
@@ -199,6 +210,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2005/09/24 15:06:18  glen
+- fix build on my amd64
+
 Revision 1.46  2005/06/18 14:47:39  pluto
 - BR(sed >= 4.0) added.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kvirc.spec?r1=1.46&r2=1.47&f=u