Branch: master

f57c8794 2014-12-09 14:08:18 François Andriot
RPM Packaging: update tdetoys
M redhat/main/tdetoys/tdetoys-14.0.0.spec
R redhat/main/tdeutils/kdeutils-3.5.12.spec
R redhat/main/tdeutils/kdeutils-3.5.13-ark_fix_utf8.patch
R redhat/main/tdeutils/kdeutils-3.5.13-ark_repairs_and_extensions.patch
R redhat/main/tdeutils/kdeutils-3.5.13-fix_ark_embedding.patch
R redhat/main/tdeutils/kdeutils-3.5.13-further_organise_menu.patch
R redhat/main/tdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch
R redhat/main/tdeutils/kdeutils-3.5.13-missing_ldflags.patch
R redhat/main/tdeutils/kdeutils-3.5.13-remove_more_applications.patch
R redhat/main/tdeutils/kdeutils-3.5.13-reorganize_kcontrol_menu_tree.patch
R redhat/main/tdeutils/kdeutils-3.5.13.1.spec
R redhat/main/tdeutils/kdeutils-3.5.13.2-rhel4.patch
R redhat/main/tdeutils/kdeutils-3.5.13.spec
R redhat/main/tdeutils/kdf-3.0.2-label.patch
diff --git a/redhat/main/tdetoys/tdetoys-14.0.0.spec b/redhat/main/tdetoys/tdetoys-14.0.0.spec
index 5f3fa0f..8589080 100644
--- a/redhat/main/tdetoys/tdetoys-14.0.0.spec
+++ b/redhat/main/tdetoys/tdetoys-14.0.0.spec
@@ -58,6 +58,8 @@
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+
 # Trinity dependencies
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 
diff --git a/redhat/main/tdeutils/kdeutils-3.5.12.spec b/redhat/main/tdeutils/kdeutils-3.5.12.spec
deleted file mode 100644
index 5cf187c..0000000
--- a/redhat/main/tdeutils/kdeutils-3.5.12.spec
+++ /dev/null
@@ -1,361 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 7
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-kdeutils
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-License:	GPL
-Summary:	TDE Utilities
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@...>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kdeutils-%{version}.tar.gz
-Source1: klaptop_acpi_helper.pam
-Source2: klaptop_acpi_helper.console
-Source3: kcmlaptoprc
-
-BuildRequires:	tqtinterface
-BuildRequires:	trinity-arts
-BuildRequires:	trinity-kdelibs
-
-# RedHat / Fedora legacy patches
-Patch1: kdf-3.0.2-label.patch
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-Requires:	tqtinterface
-Requires:	trinity-kdelibs
-
-BuildRequires: gettext
-BuildRequires: net-snmp-devel
-BuildRequires: python-devel
-BuildRequires: gmp-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libXScrnSaver-devel libXtst-devel
-%endif
-BuildRequires: xmms-devel
-
-%define superkaramba_ver 0.39
-Obsoletes: superkaramba < 0:%{superkaramba_ver}
-Provides:  superkaramba = 0:%{superkaramba_ver}
-
-%description
-Utilities for the Trinity Desktop Environment, including:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * kdepasswd (change password)
-  * kdessh (ssh front end)
-  * kdf (view disk usage)
-  * kedit (simple text editor)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-  * khexedit (hex editor)
-  * kjots (note taker)
-  * kregexpeditor (regular expression editor)
-  * ktimer (task scheduler)
-  * kwikdisk (removable media utility)
-
-
-# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
-%package devel
-Summary: Development files for %{name} 
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-extras = %{version}-%{release}
-Requires: trinity-kdelibs-devel
-%description devel
-Development files for %{name}.
-
-%package extras
-Summary: Extras packages from %{name} 
-Group: Applications/Internet
-Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
-Requires: pm-utils
-%endif
-Requires: usermode
-%description extras
-More Utilities for the K Desktop Environment:
- * kmilo
- * ksim (system information monitor);
- * klaptopdaemon (battery monitoring and management for laptops);
-
-
-%prep
-%setup -q -n kdeutils
-
-%patch1 -p1 -b .label
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-   --disable-debug --disable-warnings \
-   --enable-final \
-   --includedir=%{tde_includedir} \
-   --with-snmp \
-   --with-xscreensaver \
-   --with-extra-includes=%{_includedir}/tqt \
-   --enable-closure
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Show only in KDE (really? -- Rex)
-for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
-  KCharSelect ark kwalletmanager kwalletconfig \
- irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
- if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
-   echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
- fi
-done
-
-## File lists
-# locale's
-%find_lang %{name} || touch %{name}.lang
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-    pushd $lang_dir/kcontrol
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# using pam
-install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-
-pushd %{buildroot}%{_bindir}
-  mkdir -p %{buildroot}%{_sbindir}
-  mv klaptop_acpi_helper ../sbin
-  ln -s consolehelper klaptop_acpi_helper
-popd
-
-# klaptop setting
-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%post
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%post extras
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun extras
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-
-
-%files extras
-%defattr(-,root,root,-)
-# kmilo
-%{tde_libdir}/kded_kmilod.*
-%{tde_libdir}/kmilo*
-%{_libdir}/libkmilo.la
-%{_libdir}/libkmilo.so.*
-%{_datadir}/services/kded/kmilod.desktop
 ** Diff limit reached (max: 250 lines) **