vanagon 0.15.24 → 0.15.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c90f6996d87caf5793fc3eaf0b7b609454d041b
-  data.tar.gz: 6c9d867da407534d7c7572c0ae5b309b9cd4f63c
+  metadata.gz: e439c40238f1b9c246f4643ff159f37f55437420
+  data.tar.gz: 7b36f0ba073896d0b59955e81b5e36b01e9f8de8
 SHA512:
-  metadata.gz: 59cbc9de7d13484bd6ee0e6c4909740d8666e32d2f79f40439c27cf76dfb206e08dcb424faa0acea098fdfe7314b5341afe470e70ba0a4521daaeccd5e853015
-  data.tar.gz: c86a251a3092cf00a30d46ff244999cae5501b95549c9a3b1544eb5032e0aea87d3e8bdfc21b8d54a8c8f50bcf1881e2eb38d6054f13bfdf1fa674a5f001808f
+  metadata.gz: 0a7dab94875f2434215cdd7dba115d89d73aaab095c1bb8684adcbe2dbf985e7b7f1fcdcdb6c6cdb5145f705182804e9aebfb40202294fdad118b5ca82062043
+  data.tar.gz: b4878076d2e16f5c17cfef267665ecdf5b91232e4604dc5289a9e930f80d669d3a8040b427b2ee672461e060af65c11e67fd6a1ed652c2d8e3bbd8414869fe9f

data/resources/rpm/project.spec.erb

@@ -172,11 +172,15 @@ install -d %{buildroot}
 <%- end -%>
 
 # Here we turn all dirs in the file-list into %dir entries to avoid duplicate files
-while read entry; do
-  if [ -n "$entry" -a -d "$entry" -a ! -L "$entry" ]; then
-    <%= @platform.sed %> -i "\|^$entry\$|s|^|%dir |" %{SOURCE1}
-  fi
-done < %{SOURCE1}
+if command -v perl; then
+  perl -i -lne 'if ((-d $_) && !(-l $_)) { print "%dir $_" } else { print }' %{SOURCE1}
+else
+  while read entry; do
+    if [ -n "$entry" -a -d "$entry" -a ! -L "$entry" ]; then
+      <%= @platform.sed %> -i "\|^$entry\$|s|^|%dir |" %{SOURCE1}
+    fi
+  done < %{SOURCE1}
+fi
 
 
 %pre

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.24
+  version: 0.15.25
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git