From 2684939e2168b39190416af1601f3e1830771064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 1 Feb 2014 14:55:25 +0100 Subject: [PATCH] RPM Packaging: update 14.0.0 packages --- .../gtk-qt-engine/gtk-qt-engine-14.0.0.spec | 1 + .../gtk3-tqt-engine-14.0.0.spec | 2 +- .../kbarcode/kbarcode-14.0.0.spec | 3 +- redhat/applications/knemo/knemo-14.0.0.spec | 1 + .../knetload/knetload-14.0.0.spec | 2 +- redhat/applications/kpilot/kpilot-14.0.0.spec | 2 +- .../ksystemlog/ksystemlog-14.0.0.spec | 2 +- .../tde-systemsettings-14.0.0.spec | 6 +- .../tderadio/tderadio-14.0.0.spec | 1 + .../trinity-live/fedora-live-tde-base.ks | 87 +++++++++++++++---- .../extras/trinity-live/fedora-livecd-tde.ks | 10 +-- .../tdeaccessibility-14.0.0.spec | 3 +- redhat/tdebase/tdebase-14.0.0.spec | 1 + redhat/tdegames/tdegames-14.0.0.spec | 3 +- .../tdemultimedia/tdemultimedia-14.0.0.spec | 2 + redhat/tdenetwork/tdenetwork-14.0.0.spec | 5 +- redhat/tdepim/tdepim-14.0.0.spec | 3 +- redhat/tdesdk/tdesdk-14.0.0.spec | 2 +- redhat/tdevelop/tdevelop-14.0.0.spec | 2 +- 19 files changed, 102 insertions(+), 36 deletions(-) diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index 351e03bc7..06b4a1cc4 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -127,6 +127,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/kgtk/gtk-qt-engine.rc.sh %{tde_datadir}/kgtk/.gtkrc-2.0-kde4 %{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 +%{tde_tdedocdir}/HTML/en/kcmgtk/ # The following files are outside TDE's directory %{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec index 95d954223..a9c42d87d 100644 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec +++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec @@ -96,7 +96,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-final \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility + --disable-gcc-hidden-visibility %__make %{?_smp_mflags} diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec index 50e598529..064a1402a 100644 --- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec +++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec @@ -103,7 +103,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-final \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility \ + --disable-gcc-hidden-visibility \ \ --with-extra-includes=%{_includedir}/pcre @@ -155,6 +155,7 @@ update-desktop-database %{tde_appdir} &> /dev/null %{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png %{tde_datadir}/icons/hicolor/*/apps/kbarcode.png %{tde_datadir}/services/tdefile_kbarcode.desktop +%{tde_tdedocdir}/HTML/en/kbarcode/ %changelog diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec index 790289a78..7ff9d6f0d 100644 --- a/redhat/applications/knemo/knemo-14.0.0.spec +++ b/redhat/applications/knemo/knemo-14.0.0.spec @@ -137,6 +137,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo %{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo %{tde_datadir}/services/kded/knemod.desktop +%{tde_tdedocdir}/HTML/en/kcontrol/knemo/ %changelog diff --git a/redhat/applications/knetload/knetload-14.0.0.spec b/redhat/applications/knetload/knetload-14.0.0.spec index a28673fcb..c57045b15 100644 --- a/redhat/applications/knetload/knetload-14.0.0.spec +++ b/redhat/applications/knetload/knetload-14.0.0.spec @@ -133,7 +133,7 @@ done %{tde_datadir}/apps/knetload %{tde_datadir}/icons/crystalsvg/*/apps/knetload.png %{tde_datadir}/icons/locolor/*/apps/knetload.png - +%{tde_tdedocdir}/HTML/en/knetload/ %changelog * Fri Jul 05 2013 Francois Andriot - 2.3-6 diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec index 435434a7a..f7557a3fd 100644 --- a/redhat/applications/kpilot/kpilot-14.0.0.spec +++ b/redhat/applications/kpilot/kpilot-14.0.0.spec @@ -172,7 +172,7 @@ done %{tde_datadir}/icons/locolor/*/apps/*.png %{tde_datadir}/services/*.desktop %{tde_datadir}/servicetypes/kpilotconduit.desktop - +%{tde_tdedocdir}/HTML/en/kpilot/ %changelog * Mon Jul 29 2013 Francois Andriot - 0.7-7 diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec index 88f7e4f46..b7a520096 100644 --- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec +++ b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec @@ -123,7 +123,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/config.kcfg/ksystemlog.kcfg %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz - +%{tde_tdedocdir}/HTML/en/ksystemlog/ %changelog * Fri Jul 05 2013 Francois Andriot - 0.3.2-5 diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec index e08ab5f2b..a19ade93c 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec @@ -42,7 +42,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: kde-settings-laptops.directory +Source1: kde-settings-laptops.directory Provides: trinity-kde-systemsettings = %{version}-%{release} Obsoletes: trinity-kde-systemsettings < %{version}-%{release} @@ -94,7 +94,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-new-ldflags \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility + --disable-gcc-hidden-visibility %__make %{?_smp_mflags} @@ -141,7 +141,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %{tde_datadir}/config/systemsettingsrc %{tde_datadir}/desktop-directories/*.directory %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png - +%{tde_tdedocdir}/HTML/en/systemsettings/ %changelog diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec index 6265f14d6..40ad0415c 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio-14.0.0.spec @@ -175,6 +175,7 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||: %{tde_datadir}/icons/locolor/*/*/tderadio*.png %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo +%{tde_tdedocdir}/HTML/en/tderadio/ %changelog * Fri Jul 05 2013 Francois Andriot - 0.1.1.1-8 diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks index 3b9caf753..a1733e811 100644 --- a/redhat/extras/trinity-live/fedora-live-tde-base.ks +++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks @@ -20,36 +20,78 @@ repo --name="RPM Fusion for Fedora - Nonfree - Updates" --baseurl="http://downlo ### The Trinity Desktop -# Required -trinity-hal -trinity-repo - # Main packages #trinity-tdeaccessibility #trinity-tdeaddons -trinity-tdeadmin +#trinity-tdeadmin #trinity-tdeartwork trinity-tdebase #trinity-tdebindings #trinity-tdeedu #trinity-tdegames -trinity-tdegraphics -trinity-tdemultimedia -trinity-tdenetwork -trinity-tdepim -trinity-tdeutils +#trinity-tdegraphics +trinity-tdelibs +#trinity-tdemultimedia +#trinity-tdenetwork +#trinity-tdepim +#trinity-tdeutils #trinity-tdetoys +# Subset of tdegraphics +trinity-kamera +trinity-kcoloredit +#trinity-tdegraphics-kfile-plugins +#trinity-kdvi +#trinity-kfax +#trinity-kfaxview +trinity-kgamma +#trinity-kghostview +#trinity-kiconedit +#trinity-kmrml +#trinity-kolourpaint +#trinity-kooka +trinity-kpdf +#trinity-kpovmodeler +#trinity-kruler +trinity-ksnapshot +#trinity-ksvg +#trinity-kview +trinity-kviewshell +#trinity-libkscan +trinity-tdegraphics-libpoppler-tqt + +# Subset of tdeutils +trinity-ark +trinity-kcalc +#trinity-kcharselect +#trinity-kdelirc +#trinity-kdessh +#trinity-kdf +#trinity-kedit +#trinity-kfloppy +#trinity-kgpg +#trinity-khexedit +#trinity-kjots +#trinity-klaptopdaemon +#trinity-kmilo +#trinity-kmilo-legacy +trinity-kregexpeditor +trinity-ksim +#trinity-ktimer +trinity-kwalletmanager +#trinity-superkaramba + + # Subset of tdeaddons #trinity-atlantikdesigner -trinity-kaddressbook-plugins +#trinity-kaddressbook-plugins trinity-kate-plugins -trinity-tdeaddons-kfile-plugins +#trinity-tdeaddons-kfile-plugins trinity-kicker-applets -trinity-knewsticker-scripts +#trinity-knewsticker-scripts trinity-konq-plugins -trinity-ksig -trinity-noatun-plugins +#trinity-ksig +#trinity-noatun-plugins # TDE is missing a Network Applet, so we use Gnome... @@ -63,8 +105,19 @@ alsa-utils # make sure gnome-packagekit doesn't end up the KDE live images -gnome-packagekit* -# use kde-print-manager instead of system-config-printer --system-config-printer-libs +# Remove printing support +-cups +-cups-filters +-cups-filesystem +-cups-pk-helper +-foomatic* +-gutenprint* +-paps +-system-config-printer* + +# Remove bluetooth support +-bluez +-bluez-cups %end diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks index 8afeec7cb..7550ed9ea 100644 --- a/redhat/extras/trinity-live/fedora-livecd-tde.ks +++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks @@ -17,15 +17,15 @@ trinity-live-openbox # Some TDE applications trinity-amarok -trinity-amarok-konqueror -trinity-digikam +#trinity-amarok-konqueror +#trinity-digikam #trinity-dolphin trinity-gtk-qt-engine trinity-gwenview trinity-k3b -trinity-k3b-plugin-ffmpeg -trinity-k3b-plugin-lame -trinity-k3b-plugin-mad +#trinity-k3b-plugin-ffmpeg +#trinity-k3b-plugin-lame +#trinity-k3b-plugin-mad trinity-kaffeine #trinity-kbookreader #trinity-kdiff3 diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec index 1a404749d..ef01ddc71 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -271,6 +271,7 @@ This package is part of Trinity, as a component of the TDE accessibility module. %{tde_datadir}/icons/hicolor/32x32/apps/ksayit_talking.png %{tde_datadir}/services/ksayit_libFreeverb.desktop %{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop +%{tde_tdedocdir}/HTML/en/ksayit/ %post -n trinity-ksayit /sbin/ldconfig ||: @@ -475,7 +476,7 @@ fi --enable-final \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility \ + --disable-gcc-hidden-visibility \ \ --enable-ksayit-audio-plugins \ --with-akode diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index f1417f7ae..6751ebeee 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -583,6 +583,7 @@ web browser, X terminal emulator, and many other programs and components. %doc AUTHORS COPYING COPYING-DOCS README README.pam %{tde_bindir}/release_notes %{tde_datadir}/autostart/release_notes.desktop +%{tde_tdeappdir}/tdehtml_userinterface.desktop ########## diff --git a/redhat/tdegames/tdegames-14.0.0.spec b/redhat/tdegames/tdegames-14.0.0.spec index c8f3bfdad..a995053c9 100644 --- a/redhat/tdegames/tdegames-14.0.0.spec +++ b/redhat/tdegames/tdegames-14.0.0.spec @@ -840,6 +840,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_datadir}/apps/knetwalk %{tde_datadir}/icons/hicolor/*/apps/knetwalk.png %{tde_tdeappdir}/knetwalk.desktop +%{tde_tdedocdir}/HTML/en/knetwalk/ %post -n trinity-knetwalk for f in hicolor ; do @@ -1552,7 +1553,7 @@ fi --enable-final \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility \ + --disable-gcc-hidden-visibility \ \ --disable-setgid diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index eaa7eb077..814b511df 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -603,6 +603,7 @@ Konqueror and the audiocd:/ URL. %{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg %{tde_datadir}/services/audiocd.protocol %{tde_tdedocdir}/HTML/en/tdeioslave/audiocd.docbook +%{tde_tdedocdir}/HTML/en/kcontrol/audiocd/ %post tdeio-plugins /sbin/ldconfig @@ -924,6 +925,7 @@ databases, for TDE applications. %{tde_tdeappdir}/libkcddb.desktop %{tde_datadir}/apps/tdeconf_update/kcmcddb-emailsettings.upd %{tde_datadir}/config.kcfg/libkcddb.kcfg +%{tde_tdedocdir}/HTML/en/kcontrol/cddb/ %post -n trinity-libkcddb /sbin/ldconfig diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index d1d20c7bd..96b93fc0f 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -333,6 +333,8 @@ NFS and Samba. %{tde_tdeappdir}/kcmsambaconf.desktop %{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png %{tde_datadir}/services/fileshare_propsdlgplugin.desktop +%{tde_tdedocdir}/HTML/en/kcontrol/fileshare/ +%{tde_tdedocdir}/HTML/en/kcontrol/kcmsambaconf/ %post filesharing for f in hicolor ; do @@ -957,7 +959,8 @@ wavelan card that uses the wireless extensions interface. %{tde_datadir}/apps/kwifimanager %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz -%doc %{tde_tdedocdir}/HTML/en/kwifimanager +%{tde_tdedocdir}/HTML/en/kwifimanager/ +%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/ %post -n trinity-kwifimanager for f in hicolor ; do diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec index ad39e92c1..c69309a73 100644 --- a/redhat/tdepim/tdepim-14.0.0.spec +++ b/redhat/tdepim/tdepim-14.0.0.spec @@ -1324,7 +1324,7 @@ scheduling, address book and other PIM functionality. %{tde_datadir}/services/kontactconfig.desktop %{tde_datadir}/servicetypes/kontactplugin.desktop %{tde_tdedocdir}/HTML/en/kontact/ -%{tde_tdedocdir}/HTML/en/kpilot/ +#%{tde_tdedocdir}/HTML/en/kpilot/ %post -n trinity-kontact for f in crystalsvg hicolor ; do @@ -2166,6 +2166,7 @@ dialing calls, phonebook, and phone status monitoring. %{tde_libdir}/libkmobileclient.so %{tde_libdir}/libkmobiledevice.la %{tde_libdir}/libkmobiledevice.so +%{tde_tdedocdir}/HTML/en/kmobile/ %post -n trinity-kmobile for f in hicolor ; do diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec index 01d561bbd..af757fa4a 100644 --- a/redhat/tdesdk/tdesdk-14.0.0.spec +++ b/redhat/tdesdk/tdesdk-14.0.0.spec @@ -1101,7 +1101,7 @@ fi -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_GCC_VISIBILITY=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec index 43a5fd862..0e59f4832 100644 --- a/redhat/tdevelop/tdevelop-14.0.0.spec +++ b/redhat/tdevelop/tdevelop-14.0.0.spec @@ -452,7 +452,7 @@ individual needs. %{tde_tdedocdir}/HTML/en/kde_app_devel/ %{tde_datadir}/mimelnk/text/x-fortran.desktop %{tde_datadir}/services/kdevvisualboyadvance.desktop - +%{tde_tdedocdir}/HTML/en/kdevdesigner/ %post for f in hicolor locolor ; do