From 668c4bed1a253fdc9ad6a94d7c367795b83bde28 Mon Sep 17 00:00:00 2001
From: Valentin Hilbig <webmaster@scylla-charybdis.com>
Date: Sun, 13 Dec 2015 21:04:53 +0100
Subject: [PATCH 1/2] allow build WITHOUT_XATTR

---
 src/fs_xattr.cpp | 3 +++
 src/getxattr.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/fs_xattr.cpp b/src/fs_xattr.cpp
index 16f6f8f5..f279513e 100644
--- a/src/fs_xattr.cpp
+++ b/src/fs_xattr.cpp
@@ -24,7 +24,10 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
+#ifndef WITHOUT_XATTR
 #include <attr/xattr.h>
+#endif
+#include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/getxattr.cpp b/src/getxattr.cpp
index 2e511e76..8b727d3b 100644
--- a/src/getxattr.cpp
+++ b/src/getxattr.cpp
@@ -62,7 +62,7 @@ _lgetxattr(const string &path,
 
   return ((rv == -1) ? -errno : rv);
 #else
-  return -ENOSUP;
+  return -ENOTSUP;
 #endif
 }
 

From f94f82130eea90f244ff2451165be0a73c1356d1 Mon Sep 17 00:00:00 2001
From: Valentin Hilbig <webmaster@scylla-charybdis.com>
Date: Sun, 13 Dec 2015 21:49:55 +0100
Subject: [PATCH 2/2] "make rpmbuild" now works for non-bash-shells

Also ignore some build artifacts.
---
 .gitignore | 5 +++++
 Makefile   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5c51ed50..2c558de3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,8 @@
 # Debian files
 debian/files
 debian/changelog
+
+# ignore build artifacts
+obj/
+rpmbuild/
+src/version.hpp
diff --git a/Makefile b/Makefile
index 765c1b88..99b752c0 100644
--- a/Makefile
+++ b/Makefile
@@ -219,7 +219,7 @@ rpm-clean:
 rpm: tarball
 	$(eval VERSION := $(shell $(GIT) describe --always --tags --dirty))
 	$(eval VERSION := $(subst -,_,$(VERSION)))
-	$(MKDIR) -p rpmbuild/{BUILD,RPMS,SOURCES}
+	$(MKDIR) -p rpmbuild/BUILD rpmbuild/RPMS,SOURCES rpmbuild/SOURCES
 	$(SED) 's/__VERSION__/$(VERSION)/g' $(TARGET).spec > \
 		rpmbuild/SOURCES/$(TARGET).spec
 	cp -ar $(TARGET)-$(VERSION).tar.gz rpmbuild/SOURCES