commit 743ddbbba3c25d4bf757493a340f2ea5319d0afb
Author: Elan Ruusamäe <[email protected]>
Date: Sat Apr 5 20:14:11 2014 +0300
add %systemduserunitdir handling
adapter.awk | 5 ++++-
adapter.sh | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 738c25d..3e0cda4 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -1127,6 +1127,8 @@ function use_macros()
gsub("%{_unitdir}", "%{systemdunitdir}")
gsub(systemdunitdir, "%{systemdunitdir}")
+ gsub("%{_userunitdir}", "%{systemduserunitdir}")
+ gsub(systemduserunitdir, "%{systemduserunitdir}")
gsub(systemdtmpfilesdir, "%{systemdtmpfilesdir}")
gsub("%{_datadir}/applications", "%{_desktopdir}")
@@ -1852,7 +1854,7 @@ function import_rpm_macros( v) {
}
# update this version dep each time some new macro export is added
- v = 1.51
+ v = 1.52
if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < v) {
printf("adapter shell script is outdated: Need %s, got %s.
Please update it.\n", v, ENVIRON["ADAPTER_REVISION"]) > "/dev/stderr"
do_not_touch_anything = 1
@@ -1914,6 +1916,7 @@ function import_rpm_macros( v) {
tmpdir = ENVIRON["tmpdir"]
systemdunitdir = ENVIRON["systemdunitdir"]
+ systemduserunitdir = ENVIRON["systemduserunitdir"]
systemdtmpfilesdir = ENVIRON["systemdtmpfilesdir"]
}
diff --git a/adapter.sh b/adapter.sh
index 761eeb9..2b1e987 100755
--- a/adapter.sh
+++ b/adapter.sh
@@ -12,7 +12,7 @@
#
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-REVISION=1.51
+REVISION=1.52
VERSION="v0.35/$REVISION"
VERSIONSTRING="\
Adapter adapts .spec files for PLD Linux.
@@ -231,6 +231,7 @@ import_rpm_macros() {
tmpdir
systemdunitdir
+ systemduserunitdir
systemdtmpfilesdir
"
eval_expr=""
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/743ddbbba3c25d4bf757493a340f2ea5319d0afb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
