summaryrefslogtreecommitdiffstats
path: root/redhat/tde-i18n/tde-i18n-14.0.0.spec
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-06-08 19:21:13 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-06-08 19:21:13 +0200
commita20a95188ee0cc59529f1055f6de8a0b45a0b78d (patch)
tree6ec8b77d949340d3d0dec8408feded1e4e477c05 /redhat/tde-i18n/tde-i18n-14.0.0.spec
parent85084f00f8bd4bdbd04bdd2bb2c12d2a2d0bc975 (diff)
downloadtde-packaging-a20a95188ee0cc59529f1055f6de8a0b45a0b78d.tar.gz
tde-packaging-a20a95188ee0cc59529f1055f6de8a0b45a0b78d.zip
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/tde-i18n/tde-i18n-14.0.0.spec')
-rw-r--r--redhat/tde-i18n/tde-i18n-14.0.0.spec14
1 files changed, 3 insertions, 11 deletions
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
index 093d02d5e..4c66d5f2b 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -48,13 +48,7 @@ AutoReq: no
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# Main patch: lots of updates for TDE R14.0.0
-Patch1: tde-i18n-14.0.0-fr-updates.patch
-
-# Translate 'tdesu' message was modified in 'tdebase' package
-Patch2: tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch
-
-# Translate 'Open Terminal Here' desktop shortcut
-Patch3: tde-i18n-14.0.0-fr-openterminalhere.patch
+Patch1: tde-i18n-14.0.0-extra_translations.patch
BuildRequires: findutils
@@ -693,8 +687,6 @@ Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
# Patches for French translations
pushd tde-i18n-fr
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
popd
@@ -730,7 +722,7 @@ for l in %{TDE_LANGS}; do
..
# Run the build process in background
- ( %__make -j4 || %__make || echo Error ) &
+ ( %__make -j4 || %__make || echo TDE_Error ) &
# Do not build more than 4 languages at the same time
while [ $(jobs | wc -l) -ge 4 ]; do sleep 3; done
@@ -740,7 +732,7 @@ for l in %{TDE_LANGS}; do
done
) 2>&1 | tee /tmp/rpmbuild.$$
-if grep -qw Error /tmp/rpmbuild.$$; then
+if grep -qw TDE_Error /tmp/rpmbuild.$$; then
echo "Error while building. See '/tmp/rpmbuild.$$'"
exit 1
fi