summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2016-10-01 10:58:34 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2016-10-01 10:58:34 +0200
commit56bee759ee359e2a4d0dec0a57e3c717f18391de (patch)
tree979f821899ff16e66640ac39dae0844886f5f2ad
parent0467a0218782c3224c7075de8f27609a16bd0594 (diff)
downloadtde-packaging-56bee759ee359e2a4d0dec0a57e3c717f18391de.tar.gz
tde-packaging-56bee759ee359e2a4d0dec0a57e3c717f18391de.zip
RPM packaging: update brp-check-trinity for opensuse >= 42.1
-rw-r--r--redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec7
1 files changed, 6 insertions, 1 deletions
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec b/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec
index 7e0f8e1ce..7ba15a9af 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec
@@ -66,9 +66,11 @@ for i in \
brp-desktop.data/xdg_menu \
brp-suse.d/brp-25-symlink \
brp-suse.d/brp-72-extract-appdata \
+ map-desktop-category.sh \
suse_update_desktop_file.sh \
; do
echo "Patching file '/usr/lib/rpm/${i}' ..."
+ [ -r "/usr/lib/rpm/${i}" ] || continue
install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}"
sed -i "/usr/lib/rpm/${i}" \
-e "s|opt/kde3|opt/trinity|g" \
@@ -78,7 +80,8 @@ for i in \
-e "s|doc/kde|doc/tde|g" \
-e "s|kde_xdgdata|tde_xdgdata|g" \
-e "s|applications/kde|applications/tde|g" \
- -e "s|KDE|TDE|g"
+ -e "s|KDE|TDE|g" \
+ -e "s|kde-|tde-|g"
done
@@ -89,8 +92,10 @@ for i in \
brp-desktop.data/xdg_menu \
brp-suse.d/brp-25-symlink \
brp-suse.d/brp-72-extract-appdata \
+ map-desktop-category.sh \
suse_update_desktop_file.sh \
; do
+ [ -r "/usr/lib/rpm.orig/${i}" ] || continue
echo "Restoring file '/usr/lib/rpm/${i}' ..."
install "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}"
done