From f5c075c86b746c7c0d6c99f457b1236fa6b6b81a Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 19 Feb 2021 09:42:44 +0100
Subject: [PATCH] Add fedora 34 config

---
 NEWS                                      |  8 ++++++++
 distgen/distconf/fedora-34-i686.yaml      |  2 +-
 distgen/distconf/fedora-34-x86_64.yaml    |  4 ++--
 distgen/distconf/fedora-35-i686.yaml      |  7 +++++++
 distgen/distconf/fedora-35-x86_64.yaml    | 10 ++++++++++
 distgen/distconf/fedora-rawhide-i686.yaml |  2 +-
 tests/dockerfile/test.exp                 |  2 +-
 7 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 distgen/distconf/fedora-35-i686.yaml
 create mode 100644 distgen/distconf/fedora-35-x86_64.yaml

diff --git a/NEWS b/NEWS
index b4886e7..d513df5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+New in 1.7:
+
+* New features:
+
+  - Added 'fedora-34' config, and rawhide moved to 'fedora-35'.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.6:
 
 * New features:
diff --git a/distgen/distconf/fedora-34-i686.yaml b/distgen/distconf/fedora-34-i686.yaml
index 9e43610..1e4d98e 100644
--- a/distgen/distconf/fedora-34-i686.yaml
+++ b/distgen/distconf/fedora-34-i686.yaml
@@ -4,4 +4,4 @@ package_installer:
   name: dnf
 
 os:
-  version: 33
+  version: 34
diff --git a/distgen/distconf/fedora-34-x86_64.yaml b/distgen/distconf/fedora-34-x86_64.yaml
index 0a8ff10..96dae47 100644
--- a/distgen/distconf/fedora-34-x86_64.yaml
+++ b/distgen/distconf/fedora-34-x86_64.yaml
@@ -1,4 +1,4 @@
-extends: "fedora-33-i686.yaml"
+extends: "fedora-34-i686.yaml"
 
 macros:
   libdir: $prefix/lib64
@@ -7,4 +7,4 @@ os:
   arch: x86_64
 
 docker:
-  from: fedora:33
+  from: fedora:34
diff --git a/distgen/distconf/fedora-35-i686.yaml b/distgen/distconf/fedora-35-i686.yaml
new file mode 100644
index 0000000..3cb578e
--- /dev/null
+++ b/distgen/distconf/fedora-35-i686.yaml
@@ -0,0 +1,7 @@
+extends: "lib/fedora.yaml"
+
+package_installer:
+  name: dnf
+
+os:
+  version: 35
diff --git a/distgen/distconf/fedora-35-x86_64.yaml b/distgen/distconf/fedora-35-x86_64.yaml
new file mode 100644
index 0000000..c67dde4
--- /dev/null
+++ b/distgen/distconf/fedora-35-x86_64.yaml
@@ -0,0 +1,10 @@
+extends: "fedora-35-i686.yaml"
+
+macros:
+  libdir: $prefix/lib64
+
+os:
+  arch: x86_64
+
+docker:
+  from: fedora:35
diff --git a/distgen/distconf/fedora-rawhide-i686.yaml b/distgen/distconf/fedora-rawhide-i686.yaml
index bd86d4b..d8e5503 120000
--- a/distgen/distconf/fedora-rawhide-i686.yaml
+++ b/distgen/distconf/fedora-rawhide-i686.yaml
@@ -1 +1 @@
-fedora-34-i686.yaml
\ No newline at end of file
+fedora-35-i686.yaml
\ No newline at end of file
diff --git a/tests/dockerfile/test.exp b/tests/dockerfile/test.exp
index b31fa01..d0c9579 100644
--- a/tests/dockerfile/test.exp
+++ b/tests/dockerfile/test.exp
@@ -77,7 +77,7 @@ MAINTAINER Pavel Raiskup <praiskup@redhat.com>
 
 ENV container="docker" \
     PGDATA="/var/lib/pgsql/data" \
-    TEST_VAR="build_for fedora-33-x86_64"
+    TEST_VAR="build_for fedora-35-x86_64"
 
 RUN dnf -y --setopt=tsflags=nodocs install postgresql-server \
     && dnf -y --setopt=tsflags=nodocs reinstall glibc-common \