SPECS (DEVEL): kdemultimedia.spec, kdenetwork.spec - 050625 & 050626

adgor adgor at pld-linux.org
Sun Jun 26 19:09:49 CEST 2005 

Author: adgor                        Date: Sun Jun 26 17:09:49 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 050625 & 050626

---- Files affected:
SPECS:
   kdemultimedia.spec (1.194 -> 1.194.2.1) , kdenetwork.spec (1.186.2.1 -> 1.186.2.2) 

---- Diffs:

================================================================
Index: SPECS/kdemultimedia.spec
diff -u SPECS/kdemultimedia.spec:1.194 SPECS/kdemultimedia.spec:1.194.2.1
--- SPECS/kdemultimedia.spec:1.194	Wed Jun  1 08:09:08 2005
+++ SPECS/kdemultimedia.spec	Sun Jun 26 19:09:44 2005
@@ -8,25 +8,26 @@
 %bcond_without	xine	# build without xine support
 %bcond_with	gstreamer # build with gstreamer support
 #
-%define		_state		stable
-%define		_kdever		3.4.1
-%define		_ver		3.4.1
+%define		_state		unstable
+%define		_kdever		3.4.89
+%define		_ver		3.4.89
+%define		_snap		050625
 
-%define		_minlibsevr	9:3.4.1
-%define		_minbaseevr	9:3.4.1
+%define		_minlibsevr	9:3.4.89.050624
+%define		_minbaseevr	9:3.4.89.050625
 
 Summary:	K Desktop Environment - multimedia applications
 Summary(pl):	K Desktop Environment - aplikacje multimedialne
 Name:		kdemultimedia
-Version:	%{_ver}
+Version:	%{_ver}.%{_snap}
 Release:	1
 Epoch:		9
 License:	GPL
 Vendor:		The KDE Team
 Group:		X11/Applications
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{_ver}.tar.bz2
-# Source0-md5:	db69c9ab845c8295f095dc6394fba047
-Patch100:	%{name}-branch.diff
+Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{_snap}.tar.bz2
+##% Source0-md5:	db69c9ab845c8295f095dc6394fba047
+#Patch100:	%{name}-branch.diff
 Patch0:		%{name}-llh.patch
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
 BuildRequires:	arts-qt-devel
@@ -506,9 +507,9 @@
 KDE Media Player - biblioteki współdzielone.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_snap}
 #%patch100 -p1
-%patch0 -p1
+#%patch0 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Audio;Player;/' \
 	-e 's/Terminal=0/Terminal=false/' \
@@ -604,8 +605,8 @@
 %find_lang kio_audiocd	--with-kde
 %find_lang kmid		--with-kde
 %find_lang kmix		--with-kde
-%find_lang kmixcfg	--with-kde
-cat kmixcfg.lang >> kmix.lang
+#%find_lang kmixcfg	--with-kde
+#cat kmixcfg.lang >> kmix.lang
 %find_lang krec		--with-kde
 %find_lang kscd		--with-kde
 %find_lang noatun	--with-kde
@@ -718,8 +719,7 @@
 %attr(755,root,root) %{_libdir}/libaudiofilearts.so
 %{_libdir}/mcop/audiofilearts.mcopclass
 %{_libdir}/mcop/audiofilearts.mcoptype
-%{_iconsdir}/crystalsvg/*/actions/arts[!bc]*.png
-%{_iconsdir}/crystalsvg/*/actions/arts[!bc]*.svg
+%{_iconsdir}/[!l]*/*/actions/arts[!bc]*.*
 
 %files artsbuilder -f artsbuilder.lang
 %defattr(644,root,root,755)
@@ -729,8 +729,8 @@
 %{_datadir}/apps/artsbuilder
 %{_datadir}/mimelnk/application/x-artsbuilder.desktop
 %{_desktopdir}/kde/artsbuilder.desktop
-%{_iconsdir}/crystalsvg/*/actions/artsbuilderexecute.png
-%{_iconsdir}/crystalsvg/*/apps/artsbuilder.*
+%{_iconsdir}/[!l]*/*/actions/artsbuilderexecute.*
+%{_iconsdir}/[!l]*/*/apps/artsbuilder.*
 
 %files artscontrol
 %defattr(644,root,root,755)
@@ -738,8 +738,7 @@
 %{_datadir}/apps/artscontrol
 %{_datadir}/apps/kicker/applets/artscontrolapplet.desktop
 %{_desktopdir}/kde/artscontrol.desktop
-%{_iconsdir}/crystalsvg/*/apps/artscontrol.png
-%{_iconsdir}/crystalsvg/*/apps/artscontrol.svg
+%{_iconsdir}/[!l]*/*/apps/artscontrol.*
 
 %if %{with xine}
 %files artsplugin-xine
@@ -822,14 +821,13 @@
 %{_libdir}/kde3/libkmidpart.la
 %attr(755,root,root) %{_libdir}/kde3/libkmidpart.so
 %{_libdir}/libkmidlib.la
-%attr(755,root,root) %{_libdir}/libkmidlib.so*
+%{_libdir}/libkmidlib.so
+%attr(755,root,root) %{_libdir}/libkmidlib.so.*.*.*
 %{_datadir}/apps/kmid
 %{_datadir}/mimelnk/audio/x-karaoke.desktop
 %{_datadir}/servicetypes/*midi*.desktop
 %{_desktopdir}/kde/kmid.desktop
 %{_iconsdir}/*/*/*/kmid.png
-%{_libdir}/libkmidlib.la
-%attr(755,root,root) %{_libdir}/libkmidlib.so.0.0.0
 
 %files kmix -f kmix.lang
 %defattr(644,root,root,755)
@@ -851,7 +849,6 @@
 %{_datadir}/services/kmixctrl_restore.desktop
 %{_desktopdir}/kde/kmix.desktop
 %{_iconsdir}/*/*/*/kmix.png
-%{_kdedocdir}/en/kcontrol/kmixcfg
 
 %files kscd -f kscd.lang
 %defattr(644,root,root,755)
@@ -979,6 +976,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.194.2.1  2005/06/26 17:09:44  adgor
+- 050625 & 050626
+
 Revision 1.194  2005/06/01 06:09:08  arekm
 - rel 1
 

================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.186.2.1 SPECS/kdenetwork.spec:1.186.2.2
--- SPECS/kdenetwork.spec:1.186.2.1	Tue May  3 12:42:20 2005
+++ SPECS/kdenetwork.spec	Sun Jun 26 19:09:44 2005
@@ -3,9 +3,9 @@
 %define		_state		stable
 %define		_kdever		3.4.89
 %define		_ver		3.4.89
-%define		_snap		050428
-%define		_minlibsevr	9:3.4.89.050428
-%define		_minbaseevr	9:3.4.89.050428
+%define		_snap		050626
+%define		_minlibsevr	9:3.4.89.050624
+%define		_minbaseevr	9:3.4.89.050625
 
 Summary:	K Desktop Environment - network applications
 Summary(es):	K Desktop Environment - aplicaciones de red
@@ -13,7 +13,7 @@
 Summary(pt_BR):	K Desktop Environment - aplicaçőes de rede
 Name:		kdenetwork
 Version:	%{_ver}.%{_snap}
-Release:	2
+Release:	1
 Epoch:		10
 License:	GPL
 Group:		X11/Libraries
@@ -161,21 +161,6 @@
 %description kdnssd -l pl
 Nadzorowanie usług DNS-SD.
 
-%package kinetd
-Summary:	KDE Internet Daemon
-Summary(pl):	Demon internetowy KDE
-Group:		X11/Applications
-Requires:	kdelibs >= %{_minlibsevr}
-Obsoletes:	kdenetwork-krfb < 9:3.1-6
-
-%description kinetd
-A KDE daemon that listen on TCP ports and starts programs when a
-client connects. Configurable using DCOP.
-
-%description kinetd -l pl
-Demon KDE nasłuchujący na portach TCP i uruchamiający programy po
-połączeniu klienta. Jest konfigurowalny przy użyciu DCOP.
-
 %package kfile-torrent
 Summary:	Meta information plugin for BitTorrent files (*.torrent)
 Summary(pl):	Wtyczka pobierająca metainformacje z plików BitTorrenta (*.torrent)
@@ -208,6 +193,21 @@
 Zarządca ściągania plików podobny do GetRighta z obsługą wznawiania
 oraz integracją z Konquerorem/Mozillą.
 
+%package kinetd
+Summary:	KDE Internet Daemon
+Summary(pl):	Demon internetowy KDE
+Group:		X11/Applications
+Requires:	kdelibs >= %{_minlibsevr}
+Obsoletes:	kdenetwork-krfb < 9:3.1-6
+
+%description kinetd
+A KDE daemon that listen on TCP ports and starts programs when a
+client connects. Configurable using DCOP.
+
+%description kinetd -l pl
+Demon KDE nasłuchujący na portach TCP i uruchamiający programy po
+połączeniu klienta. Jest konfigurowalny przy użyciu DCOP.
+
 %package knewsticker
 Summary:	KDE News Ticker
 Summary(pl):	News Ticker dla KDE
@@ -941,6 +941,8 @@
 	fi
 done
 
+echo "KDE_OPTIONS = nofinal" >> kopete/protocols/yahoo/libyahoo2/Makefile.am
+
 %build
 cp %{_datadir}/automake/config.sub admin
 
@@ -1050,8 +1052,12 @@
 %files kdict -f kdict.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kdict
+%{_libdir}/kde3/kdict.la
+%attr(755,root,root) %{_libdir}/kde3/kdict.so
 %{_libdir}/kde3/kdict_panelapplet.la
 %attr(755,root,root) %{_libdir}/kde3/kdict_panelapplet.so
+%{_libdir}/libkdeinit_kdict.la
+%attr(755,root,root) %{_libdir}/libkdeinit_kdict.so
 %{_datadir}/apps/kdict
 %{_datadir}/apps/kicker/applets/kdictapplet.desktop
 %{_desktopdir}/kde/kdict.desktop
@@ -1082,6 +1088,7 @@
 %{_datadir}/apps/kget
 %{_datadir}/apps/khtml/kpartplugins/kget_plug_in.desktop
 %{_datadir}/apps/khtml/kpartplugins/kget_plug_in.rc
+%{_datadir}/apps/konqueror/servicemenus/kget_download.desktop
 %{_datadir}/mimelnk/application/x-kgetlist.desktop
 %{_desktopdir}/kde/kget.desktop
 %{_iconsdir}/*/*/*/*kget*
@@ -1172,6 +1179,7 @@
 %{_datadir}/apps/kopete_statistics
 %dir %{_datadir}/apps/kopeterichtexteditpart
 %{_datadir}/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
+%{_datadir}/config.kcfg/kopete.kcfg
 %{_datadir}/services/chatwindow.desktop
 %{_datadir}/services/emailwindow.desktop
 %{_datadir}/services/kopete_accountconfig.desktop
@@ -1187,14 +1195,15 @@
 %{_datadir}/sounds/Kopete_Sent.ogg
 %{_datadir}/sounds/Kopete_User_is_Online.ogg
 %{_desktopdir}/kde/kopete.desktop
-%{_iconsdir}/crystalsvg/*/apps/kopete.png
-%{_iconsdir}/crystalsvg/*/apps/kopete2.svgz
+%{_iconsdir}/*/*/apps/kopete.png
+%{_iconsdir}/*/*/apps/kopete2.svgz
 %{_iconsdir}/crystalsvg/*/apps/kopete_all_away.png
 %{_iconsdir}/crystalsvg/*/apps/kopete_offline.png
 %{_iconsdir}/crystalsvg/*/apps/kopete_some_away.png
 %{_iconsdir}/crystalsvg/*/apps/kopete_some_online.png
 %{_iconsdir}/crystalsvg/*/mimetypes/kopete_emoticons.png
 %{_datadir}/mimelnk/application/x-kopete-emoticons.desktop
+
 # TODO (separate?)
 %attr(755,root,root) %{_bindir}/kopete_latexconvert.sh
 %{_libdir}/kde3/kcm_kopete_latex.la
@@ -1202,10 +1211,23 @@
 %{_libdir}/kde3/kopete_latex.la
 %attr(755,root,root) %{_libdir}/kde3/kopete_latex.so
 %{_datadir}/apps/kopete/icons/crystalsvg/32x32/apps/latex.png
+%{_datadir}/apps/kopete_latex/latexchatui.rc
 %{_datadir}/config.kcfg/latexconfig.kcfg
-%{_datadir}/services/kconfiguredialog/kopete_addbookmarks_config.desktop
 %{_datadir}/services/kconfiguredialog/kopete_latex_config.desktop
 %{_datadir}/services/kopete_latex.desktop
+
+%{_libdir}/kde3/kcm_kopete_identityconfig.la
+%attr(755,root,root) %{_libdir}/kde3/kcm_kopete_identityconfig.so
+%{_datadir}/services/kopete_identityconfig.desktop
+
+%{_libdir}/kde3/kio_jabberdisco.la
+%attr(755,root,root) %{_libdir}/kde3/kio_jabberdisco.so
+%{_datadir}/services/jabberdisco.protocol
+
+%{_libdir}/kde3/kopete_testbed.la
+%attr(755,root,root) %{_libdir}/kde3/kopete_testbed.so
+%{_datadir}/apps/kopete/icons/crystalsvg/*/apps/testbed_protocol.png
+%{_datadir}/services/kopete_testbed.desktop
 # New icons
 %{_datadir}/apps/kopete/icons/crystalsvg/*/actions/contact_away_overlay.png
 %{_datadir}/apps/kopete/icons/crystalsvg/*/actions/contact_busy_overlay.png
@@ -1214,6 +1236,7 @@
 %{_datadir}/apps/kopete/icons/crystalsvg/*/actions/contact_phone_overlay.png
 %{_datadir}/apps/kopete/icons/crystalsvg/*/actions/contact_xa_overlay.png
 # New one
+%{_datadir}/services/kconfiguredialog/kopete_addbookmarks_config.desktop
 %{_datadir}/services/invitation.protocol
 
 %files kopete-protocol-aim
@@ -1315,6 +1338,7 @@
 %{_libdir}/kde3/kopete_yahoo.la
 %attr(755,root,root) %{_libdir}/kde3/kopete_yahoo.so
 %{_datadir}/apps/kopete/icons/*/*/*/yahoo*
+%{_datadir}/apps/kopete_yahoo/yahoochatui.rc
 %{_datadir}/services/kopete_yahoo.desktop
 
 %files kopete-tool-alias
@@ -1581,6 +1605,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.186.2.2  2005/06/26 17:09:44  adgor
+- 050625 & 050626
+
 Revision 1.186.2.1  2005/05/03 10:42:20  adgor
 - 3.4.89
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdemultimedia.spec?r1=1.194&r2=1.194.2.1&f=u
    http://cvs.pld-linux.org/SPECS/kdenetwork.spec?r1=1.186.2.1&r2=1.186.2.2&f=u

More information about the pld-cvs-commit mailing list