From 8cb4edf81789724083ebfd61d71454e574839b9f Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: May 25 2017 13:30:58 +0000
Subject: use the same spec file for both epel and fedora


---

diff --git a/mbs-expand-home-dir.patch b/mbs-expand-home-dir.patch
deleted file mode 100644
index 8d0be9c..0000000
--- a/mbs-expand-home-dir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/module_build_service/config.py b/module_build_service/config.py
-index e2e2fbe..34f62e3 100644
---- a/module_build_service/config.py
-+++ b/module_build_service/config.py
-@@ -350,22 +350,23 @@ class Config(object):
-             raise Exception("Configuration item's name is not allowed: %s" % key)
- 
-         # Create the empty self._key attribute, so we can assign to it.
--        setattr(self, "_" + key, None)
--
--        # Create self.key property to access the self._key attribute.
--        # Use the setifok_func if available for the attribute.
--        setifok_func = '_setifok_{}'.format(key)
--        if hasattr(self, setifok_func):
--            setx = lambda self, val: getattr(self, setifok_func)(val)
--        elif value_type == Path:
--            # For paths, expanduser.
--            setx = lambda self, val: setattr(
--                self, "_" + key, os.path.expanduser(val))
--        else:
--            setx = lambda self, val: setattr(self, "_" + key, val)
--        getx = lambda self: getattr(self, "_" + key)
--        delx = lambda self: delattr(self, "_" + key)
--        setattr(Config, key, property(getx, setx, delx))
-+        if not hasattr(self, "_" + key):
-+            setattr(self, "_" + key, None)
-+
-+            # Create self.key property to access the self._key attribute.
-+            # Use the setifok_func if available for the attribute.
-+            setifok_func = '_setifok_{}'.format(key)
-+            if hasattr(self, setifok_func):
-+                setx = lambda self, val: getattr(self, setifok_func)(val)
-+            elif value_type == Path:
-+                # For paths, expanduser.
-+                setx = lambda self, val: setattr(
-+                    self, "_" + key, os.path.expanduser(val))
-+            else:
-+                setx = lambda self, val: setattr(self, "_" + key, val)
-+            getx = lambda self: getattr(self, "_" + key)
-+            delx = lambda self: delattr(self, "_" + key)
-+            setattr(Config, key, property(getx, setx, delx))
- 
-         # managed/registered configuration items
-         if key in self._defaults:
diff --git a/mock-no-bootstrap-container.patch b/mock-no-bootstrap-container.patch
deleted file mode 100644
index 2785426..0000000
--- a/mock-no-bootstrap-container.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py
-index 763f779..5a4978d 100644
---- a/module_build_service/builder/MockModuleBuilder.py
-+++ b/module_build_service/builder/MockModuleBuilder.py
-@@ -67,6 +67,7 @@ config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
- config_opts['releasever'] = ''
- config_opts['package_manager'] = 'dnf'
- config_opts['nosync'] = True
-+config_opts['use_bootstrap_container'] = False
- 
- config_opts['yum.conf'] = \"\"\"
- $yum_conf
diff --git a/module-build-service.spec b/module-build-service.spec
index 29819de..e4dd1c4 100644
--- a/module-build-service.spec
+++ b/module-build-service.spec
@@ -130,9 +130,6 @@ for a number of tasks:
 %endif
 %patch1 -p1
 
-%patch0 -p1
-%patch1 -p1
-
 # Simply remove an old .pyc file that was included in one release.
 rm -f module_build_service/scheduler/consumer.pyc
 # And this weird sqlite file that made it in...