SPECS: kvirc.spec - updating do 3.2.0, builds, doesn't work yet - ...

prism prism at pld-linux.org
Sat Jun 18 10:23:31 CEST 2005


Author: prism                        Date: Sat Jun 18 08:23:31 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updating do 3.2.0, builds, doesn't work yet
- lots of patches modifications
- something is fscked up, it looks for libraries in a wrong place,
  I guess some paths must be hardcoded. To be fixed.

---- Files affected:
SPECS:
   kvirc.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SPECS/kvirc.spec
diff -u SPECS/kvirc.spec:1.42 SPECS/kvirc.spec:1.43
--- SPECS/kvirc.spec:1.42	Sun Feb  6 22:44:16 2005
+++ SPECS/kvirc.spec	Sat Jun 18 10:23:26 2005
@@ -1,27 +1,30 @@
 # $Revision$, $Date$
-# TODO
-# - file /usr/share/services/irc.protocol from install of
+# TODO:
+# - check if the following still occurs:
+#   file /usr/share/services/irc.protocol from install of
 #   kvirc-3.0.0-0.20040211.4 conflicts with file from package
 #   kdenetwork-kopete-protocol-irc-3.3.2-1
 
-%define		_snap	20040211
-%define 	fver	3.0.0-beta3
+%define		_ver	3.2.0
+#define		_snap	20040211
+%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:	3.0.0
-Release:	0.%{_snap}.4.5
+Version:	%{_ver}
+#Release:	0.%{_snap}.4.5
+Release:	0.1
 License:	GPL
 Group:		X11/Applications
 Vendor:		Szymon Stefanek <kvirc at tin.it>
-##Source0:	ftp://ftp.kvirc.net/kvirc/%{fver}/source/%{name}-%{fver}.tar.bz2
-##Source0:	ftp://ftp.kvirc.net/pub/kvirc/snapshots/source/kvirc-%{version}-snap%{_snap}.tar.gz
-Source0:	%{name}-snap%{_snap}.tar.bz2
-# Source0-md5:	a1b31ac966d9d35c392631d41e2b506e
+Source0:	ftp://ftp.kvirc.net/pub/kvirc/%{_ver}/source/%{name}-%{_ver}.tar.bz2
+# Source0-md5:	e783827fda3832fc3fb50e7a41ed627d
+##Source0:	ftp://ftp.kvirc.net/pub/kvirc/snapshots/source/kvirc-%{_ver}-snap%{_snap}.tar.gz
+##Source0:	%{name}-snap%{_snap}.tar.bz2
 Patch0:		%{name}-paths.patch
-Patch1:		%{name}-optw_irc.patch
+Patch1:		%{name}-build.patch
 URL:		http://www.kvirc.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -79,9 +82,9 @@
 Pliki nagłówkowe biblioteki KVirc.
 
 %prep
-%setup -q -n kvirc
+%setup -q -n %{name}-%{version}
 %patch0 -p1 -b .niedakh
-%patch1 -p0
+%patch1 -p1
 
 # kill libtool.m4 and co. in acinclude.m4
 # head -n 2012 acinclude.m4 > acinclude.m4.tmp
@@ -123,31 +126,29 @@
 echo "Categories=Qt;KDE;Network;X-Communication;IRCClient;" >> $RPM_BUILD_ROOT%{_desktopdir}/kvirc.desktop
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
-mv $RPM_BUILD_ROOT{%{_datadir}/man/kvirc.1*,%{_mandir}/man1/}
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/kvirc_de.mo	$RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/kvirc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/dcc_de.mo      $RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/dcc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/about_de.mo      $RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/about.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/kvirc_es.mo      $RPM_BUILD_ROOT%{_datadir}/locale/es/LC_MESSAGES/kvirc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/about_es.mo      $RPM_BUILD_ROOT%{_datadir}/locale/es/LC_MESSAGES/about.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/kvirc_fr.mo      $RPM_BUILD_ROOT%{_datadir}/locale/fr/LC_MESSAGES/kvirc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/kvirc_it.mo      $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/kvirc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/dcc_it.mo      $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/dcc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/about_it.mo      $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/about.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/logview_it.mo      $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/logview.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/kvirc_nl.mo      $RPM_BUILD_ROOT%{_datadir}/locale/nl/LC_MESSAGES/kvirc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/kvirc_pl.mo      $RPM_BUILD_ROOT%{_datadir}/locale/pl/LC_MESSAGES/kvirc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/kvirc_pt.mo      $RPM_BUILD_ROOT%{_datadir}/locale/pt/LC_MESSAGES/kvirc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/kvirc_pt_BR.mo      $RPM_BUILD_ROOT%{_datadir}/locale/pt_BR/LC_MESSAGES/kvirc.mo
-mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{fver}/locale/kvirc_sr.mo      $RPM_BUILD_ROOT%{_datadir}/locale/sr/LC_MESSAGES/kvirc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/kvirc_de.mo	$RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/kvirc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/dcc_de.mo      $RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/dcc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/about_de.mo      $RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/about.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/kvirc_es.mo      $RPM_BUILD_ROOT%{_datadir}/locale/es/LC_MESSAGES/kvirc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/about_es.mo      $RPM_BUILD_ROOT%{_datadir}/locale/es/LC_MESSAGES/about.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/kvirc_fr.mo      $RPM_BUILD_ROOT%{_datadir}/locale/fr/LC_MESSAGES/kvirc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/kvirc_it.mo      $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/kvirc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/dcc_it.mo      $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/dcc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/about_it.mo      $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/about.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/logview_it.mo      $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/logview.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/kvirc_nl.mo      $RPM_BUILD_ROOT%{_datadir}/locale/nl/LC_MESSAGES/kvirc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/kvirc_pl.mo      $RPM_BUILD_ROOT%{_datadir}/locale/pl/LC_MESSAGES/kvirc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/kvirc_pt.mo      $RPM_BUILD_ROOT%{_datadir}/locale/pt/LC_MESSAGES/kvirc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/kvirc_pt_BR.mo      $RPM_BUILD_ROOT%{_datadir}/locale/pt_BR/LC_MESSAGES/kvirc.mo
+mv -f $RPM_BUILD_ROOT%{_datadir}/kvirc/%{_ver}/locale/kvirc_sr.mo      $RPM_BUILD_ROOT%{_datadir}/locale/sr/LC_MESSAGES/kvirc.mo
 
 %find_lang	kvirc	--with-kde
-%find_lang      about   --with-kde
+%find_lang	about	--with-kde
 cat about.lang >> kvirc.lang
-# no lang found.
-#%%find_lang      logview   --with-kde
-#cat logview.lang >> kvirc.lang
-%find_lang      dcc   --with-kde
+%find_lang	logview	--with-kde
+cat logview.lang >> kvirc.lang
+%find_lang	dcc	--with-kde
 cat dcc.lang >> kvirc.lang
 
 %clean
@@ -156,34 +157,37 @@
 %post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f kvirc.lang
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README TODO doc/scriptexamples/{*.kvs,*/*.kvs,*/*.png}
-%dir %{_datadir}/kvirc/%{fver}/help
-%dir %{_datadir}/kvirc/%{fver}/help/en
-%doc %{_datadir}/kvirc/%{fver}/help/en/*
+%dir %{_datadir}/kvirc/%{_ver}/help
+%dir %{_datadir}/kvirc/%{_ver}/help/en
+%doc %{_datadir}/kvirc/%{_ver}/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/%{fver}
-%dir %{_libdir}/kvirc/%{fver}/modules
-%{_libdir}/kvirc/%{fver}/modules/caps
-%attr(755,root,root) %{_libdir}/kvirc/%{fver}/modules/*.so
+%dir %{_libdir}/kvirc/%{_ver}
+%dir %{_libdir}/kvirc/%{_ver}/modules
+%{_libdir}/kvirc/%{_ver}/modules/caps
+%attr(755,root,root) %{_libdir}/kvirc/%{_ver}/modules/*.so
 # needed or not?
-%{_libdir}/kvirc/%{fver}/modules/*.la
+%{_libdir}/kvirc/%{_ver}/modules/*.la
 
 %dir %{_datadir}/kvirc
-%dir %{_datadir}/kvirc/%{fver}
-%{_datadir}/kvirc/%{fver}/config
-%{_datadir}/kvirc/%{fver}/defscript
-%{_datadir}/kvirc/%{fver}/pics
+%dir %{_datadir}/kvirc/%{_ver}
+%{_datadir}/kvirc/%{_ver}/config
+%{_datadir}/kvirc/%{_ver}/defscript
+%{_datadir}/kvirc/%{_ver}/pics
+%{_datadir}/kvirc/%{_ver}/locale/*.mo
+%{_datadir}/kvirc/%{_ver}/msgcolors/*.msgclr
+%{_datadir}/kvirc/%{_ver}/themes/*/*.kvc
 %{_datadir}/mimelnk/text/*.desktop
 %{_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/%{fver}/license
-%{_datadir}/kvirc/%{fver}/license/COPYING
+%dir %{_datadir}/kvirc/%{_ver}/license
+%{_datadir}/kvirc/%{_ver}/license/COPYING
 
 %{_iconsdir}/hicolor/*/*/*.png
 %{_desktopdir}/*.desktop
@@ -202,6 +206,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2005/06/18 08:23:26  prism
+- updating do 3.2.0, builds, doesn't work yet
+- lots of patches modifications
+- something is fscked up, it looks for libraries in a wrong place,
+  I guess some paths must be hardcoded. To be fixed.
+
 Revision 1.42  2005/02/06 21:44:16  darekr
 - _kdedocdir requires macros 1.129; sorted BRs
 
================================================================

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




More information about the pld-cvs-commit mailing list