From ef403b9174a4521b2a3539d777983b21c8752d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 25 Jan 2014 20:03:06 +0100 Subject: [PATCH] RPM Packaging: update R14 packages --- redhat/applications/adept/adept-14.0.0.spec | 13 ++++++++++--- .../tde-systemsettings-14.0.0.spec | 4 ++-- redhat/build/Makefile.r14 | 10 ++++++++-- redhat/buildenv.sh | 4 ++-- .../tdebase-14.0.0-displayconfig_translation.patch | 12 ++++++------ redhat/tdebase/tdebase-14.0.0.spec | 9 +++++---- redhat/tdegraphics/tdegraphics-14.0.0.spec | 4 +++- redhat/tdelibs/tdelibs-14.0.0.spec | 4 ---- redhat/tdepim/tdepim-14.0.0.spec | 1 + redhat/tdeutils/tdeutils-14.0.0.spec | 4 +++- 10 files changed, 40 insertions(+), 25 deletions(-) diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec index ebd0ef00b..b271314ce 100644 --- a/redhat/applications/adept/adept-14.0.0.spec +++ b/redhat/applications/adept/adept-14.0.0.spec @@ -44,7 +44,9 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-util + +BuildRequires: libapt-front-devel Requires: %{name}-manager = %{version}-%{release} Requires: %{name}-installer = %{version}-%{release} @@ -165,10 +167,15 @@ export PATH="%{tde_bindir}:${PATH}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ + \ --disable-rpath \ - --enable-closure + --enable-closure \ + \ + --with-extra-includes=%{_includedir}/tqt3 \ + \ + --enable-adept -%__make %{?_smp_mflags} -C adept +%__make %{?_smp_mflags} %install 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 3bd3a64b3..e08ab5f2b 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec @@ -128,8 +128,8 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %files %defattr(-,root,root,-) %doc README TODO -%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu -%{tde_sysconfdir}/xdg/menus/system-settings.menu +%{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu +%{tde_sysconfdir}/xdg/menus/tde-system-settings.menu %{tde_bindir}/systemsettings %{tde_datadir}/applications/tde/audioencoding.desktop %{tde_datadir}/applications/tde/defaultapplication.desktop diff --git a/redhat/build/Makefile.r14 b/redhat/build/Makefile.r14 index ac31b4913..5712c83f4 100644 --- a/redhat/build/Makefile.r14 +++ b/redhat/build/Makefile.r14 @@ -126,8 +126,8 @@ htdig: $(call buildpkg,3rdparty/htdig) imlib1: -# Do NOT build on Fedora -ifeq ($(wildcard /etc/fedora-release),) +# Do NOT build on Fedora / CentOS +ifeq ($(wildcard /etc/fedora-release /etc/centos-release),) $(call buildpkg,3rdparty/imlib1) endif @@ -483,7 +483,10 @@ potracegui: tdebase $(call buildpkg,applications/potracegui) qt4-tqt-theme-engine: tdebase +# Do NOT build on CentOS +ifeq ($(wildcard /etc/centos-release),) $(call buildpkg,applications/qt4-tqt-theme-engine) +endif rosegarden: tdebase lilypond $(call buildpkg,applications/rosegarden) @@ -516,7 +519,10 @@ tdeio-umountwrapper: tdebase $(call buildpkg,applications/tdeio-umountwrapper) tdenetworkmanager: tdebase +# Do NOT build on CentOS +ifeq ($(wildcard /etc/centos-release),) $(call buildpkg,applications/tdenetworkmanager) +endif tdepowersave: tdebase $(call buildpkg,applications/tdepowersave) diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index f7aef2a08..a18661729 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -11,8 +11,8 @@ TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION} export PATH="${PATH}:${TDE_GITBASEPKG}" # Distribution suffix (e.g: .el6 , .mga3 ...) -export DIST="$( "${TDE_GITBASEPKG}/rpmdist.sh" --dist )" -alias dist='~/bin/rpmdist.sh --dist' +export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )" +#alias dist='~/bin/rpmdist.sh --dist' # Go to the RPMS folder alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}' diff --git a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch index 76fd104ba..0ed0de35c 100644 --- a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch +++ b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch @@ -5,10 +5,10 @@ Comment=Configure display Comment[en_US]=Configure display +Comment[fr]=Configuration de l'affichage - # Restore the following key and remove this comment when a help handbook - # is written. Disabling this key prevents populating the main handbook - # table of contents with a non-existent document, which results in a -@@ -17,6 +18,7 @@ + DocPath=kcontrol/displayconfig/index.html + Exec=tdecmshell displayconfig + GenericName= +@@ -11,6 +12,7 @@ MimeType= Name=Monitor & Display Name[en_US]=Monitor & Display @@ -18,7 +18,7 @@ StartupNotify=true --- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop.ORI 2013-05-11 21:21:04.241337141 +0200 +++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop 2013-05-11 21:21:44.782537929 +0200 -@@ -18,6 +18,7 @@ +@@ -12,6 +12,7 @@ Categories=Qt;TDE;X-TDE-settings-hardware; Comment=Configure display ICC profile Comment[en_US]=Configure display ICC profile @@ -26,7 +26,7 @@ GenericName= GenericName[en_US]= Keywords=ICC,display,color,profile -@@ -24,5 +25,6 @@ +@@ -18,5 +19,6 @@ MimeType= Name=ICC Color Profile Name[en_US]=ICC Color Profile diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index e71cb7aaf..f1417f7ae 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -914,7 +914,7 @@ plugdev group. %{tde_bindir}/keditfiletype %{tde_bindir}/tdefontinst %{tde_bindir}/tdefontview -%{tde_bindir}/kinfocenter +#%{tde_bindir}/kinfocenter %{tde_bindir}/klocaldomainurifilterhelper %{tde_bindir}/krdb %{tde_tdelibdir}/fontthumbnail.la @@ -1078,7 +1078,7 @@ plugdev group. %{tde_tdeappdir}/tdehtml_behavior.desktop %{tde_tdeappdir}/tdehtml_fonts.desktop %{tde_tdeappdir}/tdehtml_java_js.desktop -%{tde_tdeappdir}/kinfocenter.desktop +#%{tde_tdeappdir}/kinfocenter.desktop %{tde_tdeappdir}/kthememanager.desktop %{tde_tdeappdir}/lanbrowser.desktop %{tde_tdeappdir}/language.desktop @@ -1358,7 +1358,7 @@ needed for a basic TDE desktop installation. %{tde_datadir}/apps/kcontrol/ %{tde_datadir}/apps/tdedisplay/ %{tde_datadir}/apps/tdefontview/ -%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc +#%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc %{tde_datadir}/apps/kthememanager/themes/* %{tde_datadir}/icons/crystalsvg/*/apps/access.png %{tde_datadir}/icons/crystalsvg/*/apps/acroread.png @@ -1594,7 +1594,7 @@ needed for a basic TDE desktop installation. %{tde_tdedocdir}/HTML/en/kcontrol/ %exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ -%{tde_tdedocdir}/HTML/en/kinfocenter/ +#%{tde_tdedocdir}/HTML/en/kinfocenter/ %post data for f in crystalsvg ; do @@ -1888,6 +1888,7 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_datadir}/services/print.protocol %{tde_datadir}/services/printdb.protocol %{tde_tdedocdir}/HTML/en/tdeprint/ +%{tde_tdedocdir}/HTML/en/tdeprintfax/ %post -n trinity-tdeprint /sbin/ldconfig || : diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec index dd74fb9b8..228574b0a 100644 --- a/redhat/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec @@ -458,6 +458,7 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images %{tde_datadir}/apps/kfax/ %{tde_datadir}/icons/hicolor/??x??/apps/kfax.png %{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz +%{tde_tdedocdir}/HTML/en/kfax/ %post -n trinity-kfax for f in hicolor ; do @@ -497,6 +498,7 @@ kfax application once it reproduces all of kfax's features. %{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz %{tde_datadir}/services/kfaxmultipage.desktop %{tde_datadir}/services/kfaxmultipage_tiff.desktop +%{tde_tdedocdir}/HTML/en/kfaxview/ %post -n trinity-kfaxview for f in hicolor ; do @@ -532,7 +534,7 @@ Homepage: http://kgamma.berlios.de/index2.php %{tde_bindir}/xf86gammacfg %{tde_tdelibdir}/kcm_kgamma.la %{tde_tdelibdir}/kcm_kgamma.so -%{tde_tdeappdir}/kgamma.desktop +%{tde_datadir}/applnk/.hidden/kgamma.desktop %{tde_datadir}/apps/kgamma/ %{tde_datadir}/icons/hicolor/*/apps/kgamma.png %{tde_tdedocdir}/HTML/en/kgamma/ diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 151b0dfcd..028aaa031 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -36,8 +36,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Patch1: tdelibs-14.0.0-fix_icon_path.patch - # Patches from Mandriva Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch Patch102: tdelibs-14.0.0-cups_by_default.patch @@ -448,8 +446,6 @@ applications for TDE. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .icons - %patch101 -p1 -b .xdg_path %patch102 -p1 -b .cups_by_default diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec index 2be7c765e..ad39e92c1 100644 --- a/redhat/tdepim/tdepim-14.0.0.spec +++ b/redhat/tdepim/tdepim-14.0.0.spec @@ -882,6 +882,7 @@ keybox and for retrieving certificates from LDAP servers. %{tde_datadir}/apps/kleopatra %{tde_datadir}/apps/kwatchgnupg %{tde_datadir}/services/kleopatra_config_*.desktop +%{tde_tdeappdir}/kleopatra.desktop %{tde_tdedocdir}/HTML/en/kleopatra/ %{tde_tdedocdir}/HTML/en/kwatchgnupg/ diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec index fc510bd38..726f816b7 100644 --- a/redhat/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/tdeutils/tdeutils-14.0.0.spec @@ -374,7 +374,7 @@ in a file manager. %{tde_datadir}/icons/hicolor/*/apps/kdf.png %{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png %{tde_tdedocdir}/HTML/en/kdf/ -%{tde_tdedocdir}/HTML/en/kinfocenter/blockdevices/ +%{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/ %post -n trinity-kdf for f in crystalsvg hicolor ; do @@ -728,6 +728,8 @@ plugin, if you need this package please file a bug. %{tde_datadir}/services/kmilo/kmilo_delli8k.desktop %{tde_datadir}/services/kmilo/kmilo_kvaio.desktop %{tde_datadir}/services/kmilo/kmilo_thinkpad.desktop +%{tde_tdedocdir}/HTML/en/kcontrol/kvaio/ +%{tde_tdedocdir}/HTML/en/kcontrol/thinkpad/ ##########