[kdenetwork] kdenetwork split packaging (#724053)

Rex Dieter rdieter at fedoraproject.org
Mon Jul 25 13:49:08 UTC 2011


commit d6209baa53f51347b663132f7ccb051fb5f2fd38
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jul 25 08:54:31 2011 -0500

    kdenetwork split packaging (#724053)

 kdenetwork.spec |  380 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 314 insertions(+), 66 deletions(-)
---
diff --git a/kdenetwork.spec b/kdenetwork.spec
index e6adf0c..cf44411 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -2,7 +2,7 @@ Summary: KDE Network Applications
 Name:    kdenetwork
 Epoch:   7
 Version: 4.6.95
-Release: 1%{?dist}
+Release: 10%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -37,6 +37,7 @@ BuildRequires: glib2-devel
 BuildRequires: gmp-devel
 BuildRequires: gpgme-devel
 BuildRequires: jasper-devel
+# libkonq
 BuildRequires: kdebase-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -44,7 +45,6 @@ BuildRequires: libidn-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libktorrent-devel
 BuildRequires: libmsn-devel >= 4.1
-# (may not?) be ready yet, but we'll be when it is
 BuildRequires: nxcl-devel
 BuildRequires: libvncserver-devel
 BuildRequires: libv4l-devel
@@ -75,19 +75,14 @@ BuildRequires: sqlite-devel
 #     iLBC is low bitrate audio codec - plugin for mediastreamer
 #     Needed to build Google Talk libjingle voice call support with iLBC codec
 
-Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: mozilla-filesystem
-
-# kopete/jabber
-Requires: qca-ossl%{?_isa}
-## kppp
-Requires: ppp
-## krdc
-Requires: rdesktop
-
-# consolehelper
-Requires: usermode-gtk
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-fileshare-samba = %{epoch}:%{version}-%{release}
+Requires: %{name}-kdnssd = %{epoch}:%{version}-%{release}
+Requires: %{name}-kget = %{epoch}:%{version}-%{release}
+Requires: %{name}-kopete = %{epoch}:%{version}-%{release}
+Requires: %{name}-kppp = %{epoch}:%{version}-%{release}
+Requires: %{name}-krdc = %{epoch}:%{version}-%{release}
+Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
 
 %description
 Networking applications, including:
@@ -97,22 +92,118 @@ Networking applications, including:
 * krdc: a client for Desktop Sharing and other VNC servers
 * krfb: Desktop Sharing server, allow others to access your desktop via VNC
 
-%package libs
-Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
-#{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
-%{?_kde4_version:Requires: kdepimlibs%{?_isa} >= %{_kde4_version}}
-%description libs
+%package common 
+Summary: Common files for %{name}
+BuildArch: noarch
+# when split occurred
+Conflicts: kdenetwork < 7:4.6.95-10
+%description common 
 %{summary}.
 
 %package devel
-Group:    Development/Libraries
 Summary:  Development files for %{name}
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: kdelibs4-devel
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-kopete-devel = %{epoch}:%{version}-%{release}
+Requires: %{name}-krdc-devel = %{epoch}:%{version}-%{release}
+BuildArch: noarch
 %description devel
 %{summary}.
 
+%package fileshare-samba
+Summary: Share files via samba 
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: samba
+%description fileshare-samba 
+%{summary}.
+
+%package kdnssd
+Summary: Kdnssd
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%description kdnssd
+%{summary}.
+
+%package kget
+Summary: A downloader manager 
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-kget-libs%{?_isa} = %{epoch}:%{version}-%{release}
+%description kget
+%{summary}.
+
+%package kget-libs
+Summary: Runtime libraries for %{name}
+Requires: %{name}-kget = %{epoch}:%{version}-%{release}
+%description kget-libs
+%{summary}.
+
+%package kppp
+Summary: A dialer and front end for pppd
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: ppp
+# consolehelper
+Requires: usermode-gtk
+%description kppp
+%{summary}.
+
+%package kopete
+Summary: A chat client 
+Requires: %{name}-kopete-libs%{?_isa} = %{epoch}:%{version}-%{release}
+# jabber
+Requires: qca-ossl%{?_isa}
+Requires: mozilla-filesystem
+%description kopete
+%{summary}.
+
+%package kopete-libs
+Summary: Runtime libraries for %{name}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-kopete = %{epoch}:%{version}-%{release}
+%description kopete-libs
+%{summary}.
+
+%package kopete-devel
+Summary: Development files for Kopete
+Requires: %{name}-kopete-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4-devel
+%description kopete-devel
+%{summary}.
+
+%package krdc
+Summary: A client for Desktop Sharing and other VNC servers
+Requires: %{name}-krdc-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: rdesktop
+%description krdc
+%{summary}.
+
+%package krdc-libs
+Summary: Runtime libraries for %{name} 
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-krdc = %{epoch}:%{version}-%{release}
+%description krdc-libs
+%{summary}.
+
+%package krdc-devel
+Summary: Developer files for %{name} 
+Requires: %{name}-krdc-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4-devel
+%description krdc-devel
+%{summary}.
+
+%package krfb
+Summary: Desktop Sharing server, allow others to access your desktop via VNC 
+Requires: %{name}-krfb-libs%{?_isa} = %{epoch}:%{version}-%{release}
+# https://bugzilla.redhat.com/655844
+Provides: bundled(libvncserver)
+%description krfb
+%{summary}.
+
+%package krfb-libs
+Summary: Runtime libraries for %{name}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%description krfb-libs
+%{summary}.
+
+
 
 %prep
 %setup -q -a 1 -n kdenetwork-%{version}%{?alphatag}
@@ -148,21 +239,103 @@ ln -s consolehelper %{buildroot}%{_bindir}/kppp
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/kppp
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/kppp
 
+%find_lang kget --with-kde --without-mo
+%find_lang kopete --with-kde --without-mo
+%find_lang kppp --with-kde --without-mo
+%find_lang krdc --with-kde --without-mo
+%find_lang krfb --with-kde --without-mo
+
+# unpackaged files
+rm -f %{buildroot}%{_kde4_libdir}/libkgetcore.so
+
+
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
 
 %clean
 rm -rf %{buildroot}
 
 
-%post
+%files
+# blank
+
+%files devel
+# blank
+
+%files common
+#doc README COPYING*
+
+%files fileshare-samba
+%{_kde4_libdir}/kde4/sambausershareplugin.so
+%{_kde4_datadir}/kde4/services/sambausershareplugin.desktop
+
+%files kdnssd
+%{_kde4_datadir}/kde4/services/zeroconf.protocol
+%{_kde4_datadir}/kde4/services/kded/dnssdwatcher.desktop
+%{_datadir}/dbus-1/interfaces/org.kde.kdnssd.xml
+%dir %{_kde4_appsdir}/remoteview/
+%{_kde4_appsdir}/remoteview/zeroconf.desktop
+%{_kde4_libdir}/kde4/kded_dnssdwatcher.so
+%{_kde4_libdir}/kde4/kio_zeroconf.so
+
+%post kget
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans kget
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+
+%postun kget
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
+
+%files kget -f kget.lang
+%{_kde4_bindir}/kget
+%{_kde4_appsdir}/dolphinpart/kpartplugins/kget_plug_in.*
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kget/
+%{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.*
+%if 0%{?fedora}
+%{_kde4_appsdir}/kwebkitpart/kpartplugins/kget_plug_in.*
+%endif
+%{_kde4_iconsdir}/hicolor/*/apps/kget.*
+%{_datadir}/dbus-1/services/org.kde.kget.service
+%{_kde4_datadir}/applications/kde4/kget.desktop
+%{_kde4_datadir}/kde4/services/kget*.desktop
+%{_kde4_datadir}/kde4/services/plasma-engine-kget.desktop
+%{_kde4_datadir}/kde4/services/plasma-runner-kget.desktop
+%{_kde4_datadir}/kde4/servicetypes/kget*.desktop
+%{_kde4_datadir}/config.kcfg/kget*.kcfg
+%{_kde4_libdir}/kde4/kget_*.so
+%{_kde4_datadir}/kde4/services/ServiceMenus/kget_download.desktop
+%{_kde4_libdir}/kde4/kcm_kget_*.so
+%{_kde4_libdir}/kde4/krunner_kget.so
+%{_kde4_libdir}/kde4/plasma_engine_kget.so
+%{_kde4_libdir}/kde4/plasma_kget_barapplet.so
+%{_kde4_libdir}/kde4/plasma_kget_piechart.so
+
+%post kget-libs -p /sbin/ldconfig
+%postun kget-libs -p /sbin/ldconfig
+
+%files kget-libs
+%{_kde4_libdir}/libkgetcore.so.4*
+
+%post kopete 
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
-%posttrans
+%posttrans kopete 
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 update-desktop-database -q &> /dev/null ||:
 
-%postun
+%postun kopete
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -171,58 +344,133 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
-%post libs -p /sbin/ldconfig
+%files kopete -f kopete.lang
+%{_kde4_bindir}/kopete
+%{_kde4_bindir}/winpopup*
+%{_kde4_appsdir}/kopete*
+%{_libdir}/mozilla/plugins/skypebuttons.so
+%{_kde4_configdir}/kopeterc
+%{_datadir}/dbus-1/interfaces/org.kde.Kopete.xml
+%{_datadir}/dbus-1/interfaces/org.kde.kopete.*.xml
+%{_kde4_datadir}/applications/kde4/kopete.desktop
+%{_kde4_datadir}/config.kcfg/kopete*
+%{_kde4_datadir}/sounds/Kopete_*
+%{_kde4_datadir}/sounds/KDE-Im-Phone-Ring.wav
+%{_kde4_datadir}/kde4/services/aim.protocol
+%{_kde4_datadir}/kde4/services/callto.protocol
+%{_kde4_datadir}/kde4/services/chatwindow.desktop
+%{_kde4_datadir}/kde4/services/emailwindow.desktop
+%{_kde4_datadir}/kde4/services/kopete_*.desktop
+%{_kde4_datadir}/kde4/services/kconfiguredialog/
+%{_kde4_datadir}/kde4/services/skype.protocol
+%{_kde4_datadir}/kde4/services/tel.protocol
+%{_kde4_datadir}/kde4/services/xmpp.protocol
+%{_kde4_datadir}/kde4/servicetypes/kopete*.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/kopete*.*
+%{_kde4_iconsdir}/oxygen/*/actions/*
+%{_kde4_iconsdir}/oxygen/*/status/object-locked*.*
+%{_kde4_libdir}/kde4/kopete_*.so
+%{_kde4_libdir}/kde4/kcm_kopete_*.so
+%{_kde4_libdir}/libqgroupwise.so
+%{_kde4_bindir}/kopete_latexconvert.sh
+%{_kde4_libdir}/kde4/libchattexteditpart.so
+%{_kde4_datadir}/config.kcfg/historyconfig.kcfg
+%{_kde4_datadir}/config.kcfg/latexconfig.kcfg
+%{_kde4_datadir}/config.kcfg/nowlisteningconfig.kcfg
+%{_kde4_datadir}/config.kcfg/translatorconfig.kcfg
+%{_kde4_datadir}/config.kcfg/urlpicpreview.kcfg
+%{_kde4_datadir}/config.kcfg/webpresenceconfig.kcfg
+
+%post kopete-libs -p /sbin/ldconfig
+%postun kopete-libs -p /sbin/ldconfig
+
+%files kopete-libs
+%{_kde4_libdir}/libkopete*.so.*
+%{_kde4_libdir}/libkyahoo.so*
+%{_kde4_libdir}/liboscar.so*
+
+%files kopete-devel
+%{_kde4_includedir}/kopete/
+%{_kde4_libdir}/libkopete*.so
 
-%postun libs -p /sbin/ldconfig
+%post kppp
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
+%posttrans kppp
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%files
-%defattr(-,root,root,-)
-%doc COPYING README
+%postun kppp
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
+%files kppp -f kppp.lang
+%{_sbindir}/kppp
+%{_kde4_bindir}/kppp*
 %config(noreplace) %{_sysconfdir}/security/console.apps/kppp
 %config(noreplace) %{_sysconfdir}/pam.d/kppp
-%{_kde4_bindir}/*
-%{_kde4_appsdir}/dolphinpart/kpartplugins/kget_plug_in.*
-%{_kde4_appsdir}/kconf_update/*
-%{_kde4_appsdir}/kget/
-%{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.*
-%if 0%{?fedora}
-%{_kde4_appsdir}/kwebkitpart/kpartplugins/kget_plug_in.*
-%endif
-%{_kde4_appsdir}/kopete*
 %{_kde4_appsdir}/kppp/
+%{_kde4_datadir}/applications/kde4/Kppp.desktop
+%{_kde4_datadir}/applications/kde4/kppplogview.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/kppp.*
+%{_datadir}/dbus-1/interfaces/org.kde.kppp.xml
+
+%post krdc
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans krdc
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%postun krdc
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
+%files krdc -f krdc.lang
+%{_kde4_bindir}/krdc
 %{_kde4_appsdir}/krdc/
+%{_kde4_datadir}/applications/kde4/krdc.desktop
+%{_kde4_datadir}/kde4/services/krdc_*.desktop
+%{_kde4_datadir}/kde4/services/rdp.protocol
+%{_kde4_datadir}/kde4/services/vnc.protocol
+%{_kde4_datadir}/kde4/servicetypes/krdc*.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/krdc.*
+%{_kde4_libdir}/kde4/kcm_krdc*.so
+%{_kde4_datadir}/kde4/services/ServiceMenus/smb2rdc.desktop
+%{_kde4_datadir}/config.kcfg/krdc.kcfg
+%{_kde4_libdir}/kde4/krdc_*.so
+
+%post krdc-libs -p /sbin/ldconfig
+%postun krdc-libs -p /sbin/ldconfig
+
+%files krdc-libs
+%{_kde4_libdir}/libkrdccore.so.4*
+
+%files krdc-devel
+%{_kde4_includedir}/krdc/
+%{_kde4_libdir}/libkrdccore.so
+
+%files krfb -f krfb.lang
+%{_kde4_bindir}/krfb
 %{_kde4_appsdir}/krfb/
-%{_kde4_appsdir}/remoteview/
-%{_kde4_configdir}/kopeterc
-%{_kde4_datadir}/applications/kde4/*
-%{_kde4_datadir}/config.kcfg/*
-%{_datadir}/dbus-1/interfaces/*
-%{_datadir}/dbus-1/services/*
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/sounds/*
-%{_kde4_docdir}/HTML/en/*/
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*.so
-%{_libdir}/mozilla/plugins/skypebuttons.so
-%{_sbindir}/kppp
+%{_kde4_datadir}/applications/kde4/krfb.desktop
+%{_kde4_datadir}/kde4/services/krfb_*.desktop
+%{_kde4_datadir}/kde4/servicetypes/krfb*.desktop
+%{_kde4_libdir}/kde4/krfb_*.so
 
-%files libs
-%defattr(-,root,root,-)
-%{_kde4_libdir}/libqgroupwise.so
-%{_kde4_libdir}/lib*.so.*
+%post krfb-libs -p /sbin/ldconfig
+%postun krfb-libs -p /sbin/ldconfig
 
-%files devel
-%defattr(-,root,root,-)
-%{_kde4_includedir}/kopete/
-%{_kde4_includedir}/krdc/
-%{_kde4_libdir}/lib*.so
-%exclude %{_kde4_libdir}/libqgroupwise.so
+%files krfb-libs
+%{_kde4_libdir}/libkrfbprivate.so.4*
 
 
 %changelog
+* Thu Jul 21 2011 Rex Dieter <rdieter at fedoraproject.org> 7:4.6.95-10
+- kdenetwork split packaging (#724053)
+
 * Fri Jul 11 2011 Jaroslav Reznik <jreznik at redhat.com> 7:4.6.95-1
 - 4.6.95 (rc2)
 


More information about the scm-commits mailing list