Merge pull request #119 from mojohaus/118

#118
mojohaus · Jan 20, 2020 · c7ed5ca · c7ed5ca
2 parents e353276 + 4d5a21f
commit c7ed5ca
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/org/codehaus/mojo/rpm/SpecWriter.java b/src/main/java/org/codehaus/mojo/rpm/SpecWriter.java
@@ -18,8 +18,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -238,8 +239,8 @@ private void writeFiles()
             scanner.setExcludes( null );
             scanner.scan();
 
-            if ( scanner.isEverythingIncluded() && links.isEmpty() && map.isDirectoryIncluded()
-                && !map.isRecurseDirectories() )
+            final boolean noFiles = map.getSources().isEmpty() || (scanner.isEverythingIncluded() && links.isEmpty());
+            if ( noFiles && map.isDirectoryIncluded() && !map.isRecurseDirectories() )
             {
                 log.debug( "writing attribute string for directory: " + destination );
                 spec.println( attrString + " \"" + destination + "\"" );
@@ -272,7 +273,7 @@ private void writeFiles()
                 }
 
                 // only list files if requested (directoryIncluded == false) or we have to
-                if ( !( map.isDirectoryIncluded() && scanner.isEverythingIncluded() && links.isEmpty() && !map.isRecurseDirectories()) )
+                if ( !map.isDirectoryIncluded() || !noFiles )
                 {
                     final String[] files = scanner.getIncludedFiles();