From 23ba4c2c3b7b4c7cfb8850f815c2f00b1e09e387 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Tue, 29 Aug 2023 15:36:01 +0200
Subject: [PATCH] Move sql files to schemas directory

---
 Makefile                                       |  2 +-
 docs/Makefile                                  | 13 ++-----------
 docs/README.schema                             |  1 +
 koji.spec                                      |  4 ++--
 schemas/Makefile                               | 18 ++++++++++++++++++
 {docs => schemas}/schema-update-cgen.sql       |  0
 {docs => schemas}/schema-update-cgen2.sql      |  0
 {docs => schemas}/schema-update-dist-repos.sql |  0
 {docs => schemas}/schema-upgrade-1.10-1.11.sql |  0
 {docs => schemas}/schema-upgrade-1.11-1.12.sql |  0
 {docs => schemas}/schema-upgrade-1.12-1.13.sql |  0
 {docs => schemas}/schema-upgrade-1.13-1.14.sql |  0
 {docs => schemas}/schema-upgrade-1.14-1.15.sql |  0
 {docs => schemas}/schema-upgrade-1.15-1.16.sql |  0
 {docs => schemas}/schema-upgrade-1.16-1.17.sql |  0
 {docs => schemas}/schema-upgrade-1.17-1.18.sql |  0
 {docs => schemas}/schema-upgrade-1.18-1.19.sql |  0
 {docs => schemas}/schema-upgrade-1.19-1.20.sql |  0
 {docs => schemas}/schema-upgrade-1.2-1.3.sql   |  0
 {docs => schemas}/schema-upgrade-1.20-1.21.sql |  0
 {docs => schemas}/schema-upgrade-1.21-1.22.sql |  0
 {docs => schemas}/schema-upgrade-1.22-1.23.sql |  0
 {docs => schemas}/schema-upgrade-1.23-1.24.sql |  0
 {docs => schemas}/schema-upgrade-1.24-1.25.sql |  0
 {docs => schemas}/schema-upgrade-1.25-1.26.sql |  0
 {docs => schemas}/schema-upgrade-1.27-1.28.sql |  0
 {docs => schemas}/schema-upgrade-1.28-1.29.sql |  0
 {docs => schemas}/schema-upgrade-1.29-1.30.sql |  0
 {docs => schemas}/schema-upgrade-1.3-1.4.sql   |  0
 {docs => schemas}/schema-upgrade-1.30-1.31.sql |  0
 {docs => schemas}/schema-upgrade-1.31-1.32.sql |  0
 {docs => schemas}/schema-upgrade-1.32-1.33.sql |  0
 {docs => schemas}/schema-upgrade-1.4-1.5.sql   |  0
 {docs => schemas}/schema-upgrade-1.6-1.7.sql   |  0
 {docs => schemas}/schema-upgrade-1.7-1.8.sql   |  0
 {docs => schemas}/schema-upgrade-1.8-1.9.sql   |  0
 {docs => schemas}/schema-upgrade-1.9-1.10.sql  |  0
 {docs => schemas}/schema.sql                   |  0
 38 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 docs/README.schema
 create mode 100644 schemas/Makefile
 rename {docs => schemas}/schema-update-cgen.sql (100%)
 rename {docs => schemas}/schema-update-cgen2.sql (100%)
 rename {docs => schemas}/schema-update-dist-repos.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.10-1.11.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.11-1.12.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.12-1.13.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.13-1.14.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.14-1.15.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.15-1.16.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.16-1.17.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.17-1.18.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.18-1.19.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.19-1.20.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.2-1.3.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.20-1.21.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.21-1.22.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.22-1.23.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.23-1.24.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.24-1.25.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.25-1.26.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.27-1.28.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.28-1.29.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.29-1.30.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.3-1.4.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.30-1.31.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.31-1.32.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.32-1.33.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.4-1.5.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.6-1.7.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.7-1.8.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.8-1.9.sql (100%)
 rename {docs => schemas}/schema-upgrade-1.9-1.10.sql (100%)
 rename {docs => schemas}/schema.sql (100%)

diff --git a/Makefile b/Makefile
index 9c10e646..f67a3087 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ PYVER_MAJOR := $(shell $(PYTHON) -c 'import sys; print(".".join(sys.version.spli
 ifeq ($(PYVER_MAJOR),2)
 	SUBDIRS = builder koji cli plugins vm
 else
-	SUBDIRS = kojihub builder koji cli util www plugins vm docs
+	SUBDIRS = kojihub builder koji cli util www plugins vm schemas
 endif
 
 
diff --git a/docs/Makefile b/docs/Makefile
index 020da729..b8bba227 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -50,19 +50,10 @@ help:
 clean:
 	rm -rf $(BUILDDIR)/*
 
-SQLFILES = $(wildcard *.sql)
-SQLDIR = /usr/share/koji
+# nothing to install for docs, we package from this dir
 install:
-	@if [ "$(DESTDIR)" = "" ]; then \
-		echo " "; \
-		echo "ERROR: A destdir is required"; \
-		exit 1; \
-	fi
+	@echo "(no install for docs dir)"
 
-	mkdir -p $(DESTDIR)/$(SQLDIR)
-	for p in $(SQLFILES) ; do \
-		install -p -m 644 $$p $(DESTDIR)/$(SQLDIR)/$$p; \
-	done
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
diff --git a/docs/README.schema b/docs/README.schema
new file mode 100644
index 00000000..a46334ff
--- /dev/null
+++ b/docs/README.schema
@@ -0,0 +1 @@
+SQL schema and updates were moved to ../schemas (/usr/share/koji)
diff --git a/koji.spec b/koji.spec
index 46f1bb38..2abbdfba 100644
--- a/koji.spec
+++ b/koji.spec
@@ -428,7 +428,7 @@ make DESTDIR=$RPM_BUILD_ROOT KOJI_MINIMAL=1 PYTHON=%{__python3} install
 popd
 %endif
 %if 0%{py3_support} > 1
-for D in kojihub builder plugins util www vm docs ; do
+for D in kojihub builder plugins util www vm schemas ; do
     pushd $D
     make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} install
     popd
@@ -498,7 +498,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %config(noreplace) /etc/koji.conf
 %dir /etc/koji.conf.d
-%doc docs/source Authors COPYING LGPL
+%doc docs Authors COPYING LGPL
 %{_datadir}/koji/*.sql
 
 %if 0%{py2_support}
diff --git a/schemas/Makefile b/schemas/Makefile
new file mode 100644
index 00000000..48d06da2
--- /dev/null
+++ b/schemas/Makefile
@@ -0,0 +1,18 @@
+BUILDDIR      = build
+SQLFILES = $(wildcard *.sql)
+SQLDIR = /usr/share/koji
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+install:
+	@if [ "$(DESTDIR)" = "" ]; then \
+		echo " "; \
+		echo "ERROR: A destdir is required"; \
+		exit 1; \
+	fi
+
+	mkdir -p $(DESTDIR)/$(SQLDIR)
+	for p in $(SQLFILES) ; do \
+		install -p -m 644 $$p $(DESTDIR)/$(SQLDIR)/$$p; \
+	done
diff --git a/docs/schema-update-cgen.sql b/schemas/schema-update-cgen.sql
similarity index 100%
rename from docs/schema-update-cgen.sql
rename to schemas/schema-update-cgen.sql
diff --git a/docs/schema-update-cgen2.sql b/schemas/schema-update-cgen2.sql
similarity index 100%
rename from docs/schema-update-cgen2.sql
rename to schemas/schema-update-cgen2.sql
diff --git a/docs/schema-update-dist-repos.sql b/schemas/schema-update-dist-repos.sql
similarity index 100%
rename from docs/schema-update-dist-repos.sql
rename to schemas/schema-update-dist-repos.sql
diff --git a/docs/schema-upgrade-1.10-1.11.sql b/schemas/schema-upgrade-1.10-1.11.sql
similarity index 100%
rename from docs/schema-upgrade-1.10-1.11.sql
rename to schemas/schema-upgrade-1.10-1.11.sql
diff --git a/docs/schema-upgrade-1.11-1.12.sql b/schemas/schema-upgrade-1.11-1.12.sql
similarity index 100%
rename from docs/schema-upgrade-1.11-1.12.sql
rename to schemas/schema-upgrade-1.11-1.12.sql
diff --git a/docs/schema-upgrade-1.12-1.13.sql b/schemas/schema-upgrade-1.12-1.13.sql
similarity index 100%
rename from docs/schema-upgrade-1.12-1.13.sql
rename to schemas/schema-upgrade-1.12-1.13.sql
diff --git a/docs/schema-upgrade-1.13-1.14.sql b/schemas/schema-upgrade-1.13-1.14.sql
similarity index 100%
rename from docs/schema-upgrade-1.13-1.14.sql
rename to schemas/schema-upgrade-1.13-1.14.sql
diff --git a/docs/schema-upgrade-1.14-1.15.sql b/schemas/schema-upgrade-1.14-1.15.sql
similarity index 100%
rename from docs/schema-upgrade-1.14-1.15.sql
rename to schemas/schema-upgrade-1.14-1.15.sql
diff --git a/docs/schema-upgrade-1.15-1.16.sql b/schemas/schema-upgrade-1.15-1.16.sql
similarity index 100%
rename from docs/schema-upgrade-1.15-1.16.sql
rename to schemas/schema-upgrade-1.15-1.16.sql
diff --git a/docs/schema-upgrade-1.16-1.17.sql b/schemas/schema-upgrade-1.16-1.17.sql
similarity index 100%
rename from docs/schema-upgrade-1.16-1.17.sql
rename to schemas/schema-upgrade-1.16-1.17.sql
diff --git a/docs/schema-upgrade-1.17-1.18.sql b/schemas/schema-upgrade-1.17-1.18.sql
similarity index 100%
rename from docs/schema-upgrade-1.17-1.18.sql
rename to schemas/schema-upgrade-1.17-1.18.sql
diff --git a/docs/schema-upgrade-1.18-1.19.sql b/schemas/schema-upgrade-1.18-1.19.sql
similarity index 100%
rename from docs/schema-upgrade-1.18-1.19.sql
rename to schemas/schema-upgrade-1.18-1.19.sql
diff --git a/docs/schema-upgrade-1.19-1.20.sql b/schemas/schema-upgrade-1.19-1.20.sql
similarity index 100%
rename from docs/schema-upgrade-1.19-1.20.sql
rename to schemas/schema-upgrade-1.19-1.20.sql
diff --git a/docs/schema-upgrade-1.2-1.3.sql b/schemas/schema-upgrade-1.2-1.3.sql
similarity index 100%
rename from docs/schema-upgrade-1.2-1.3.sql
rename to schemas/schema-upgrade-1.2-1.3.sql
diff --git a/docs/schema-upgrade-1.20-1.21.sql b/schemas/schema-upgrade-1.20-1.21.sql
similarity index 100%
rename from docs/schema-upgrade-1.20-1.21.sql
rename to schemas/schema-upgrade-1.20-1.21.sql
diff --git a/docs/schema-upgrade-1.21-1.22.sql b/schemas/schema-upgrade-1.21-1.22.sql
similarity index 100%
rename from docs/schema-upgrade-1.21-1.22.sql
rename to schemas/schema-upgrade-1.21-1.22.sql
diff --git a/docs/schema-upgrade-1.22-1.23.sql b/schemas/schema-upgrade-1.22-1.23.sql
similarity index 100%
rename from docs/schema-upgrade-1.22-1.23.sql
rename to schemas/schema-upgrade-1.22-1.23.sql
diff --git a/docs/schema-upgrade-1.23-1.24.sql b/schemas/schema-upgrade-1.23-1.24.sql
similarity index 100%
rename from docs/schema-upgrade-1.23-1.24.sql
rename to schemas/schema-upgrade-1.23-1.24.sql
diff --git a/docs/schema-upgrade-1.24-1.25.sql b/schemas/schema-upgrade-1.24-1.25.sql
similarity index 100%
rename from docs/schema-upgrade-1.24-1.25.sql
rename to schemas/schema-upgrade-1.24-1.25.sql
diff --git a/docs/schema-upgrade-1.25-1.26.sql b/schemas/schema-upgrade-1.25-1.26.sql
similarity index 100%
rename from docs/schema-upgrade-1.25-1.26.sql
rename to schemas/schema-upgrade-1.25-1.26.sql
diff --git a/docs/schema-upgrade-1.27-1.28.sql b/schemas/schema-upgrade-1.27-1.28.sql
similarity index 100%
rename from docs/schema-upgrade-1.27-1.28.sql
rename to schemas/schema-upgrade-1.27-1.28.sql
diff --git a/docs/schema-upgrade-1.28-1.29.sql b/schemas/schema-upgrade-1.28-1.29.sql
similarity index 100%
rename from docs/schema-upgrade-1.28-1.29.sql
rename to schemas/schema-upgrade-1.28-1.29.sql
diff --git a/docs/schema-upgrade-1.29-1.30.sql b/schemas/schema-upgrade-1.29-1.30.sql
similarity index 100%
rename from docs/schema-upgrade-1.29-1.30.sql
rename to schemas/schema-upgrade-1.29-1.30.sql
diff --git a/docs/schema-upgrade-1.3-1.4.sql b/schemas/schema-upgrade-1.3-1.4.sql
similarity index 100%
rename from docs/schema-upgrade-1.3-1.4.sql
rename to schemas/schema-upgrade-1.3-1.4.sql
diff --git a/docs/schema-upgrade-1.30-1.31.sql b/schemas/schema-upgrade-1.30-1.31.sql
similarity index 100%
rename from docs/schema-upgrade-1.30-1.31.sql
rename to schemas/schema-upgrade-1.30-1.31.sql
diff --git a/docs/schema-upgrade-1.31-1.32.sql b/schemas/schema-upgrade-1.31-1.32.sql
similarity index 100%
rename from docs/schema-upgrade-1.31-1.32.sql
rename to schemas/schema-upgrade-1.31-1.32.sql
diff --git a/docs/schema-upgrade-1.32-1.33.sql b/schemas/schema-upgrade-1.32-1.33.sql
similarity index 100%
rename from docs/schema-upgrade-1.32-1.33.sql
rename to schemas/schema-upgrade-1.32-1.33.sql
diff --git a/docs/schema-upgrade-1.4-1.5.sql b/schemas/schema-upgrade-1.4-1.5.sql
similarity index 100%
rename from docs/schema-upgrade-1.4-1.5.sql
rename to schemas/schema-upgrade-1.4-1.5.sql
diff --git a/docs/schema-upgrade-1.6-1.7.sql b/schemas/schema-upgrade-1.6-1.7.sql
similarity index 100%
rename from docs/schema-upgrade-1.6-1.7.sql
rename to schemas/schema-upgrade-1.6-1.7.sql
diff --git a/docs/schema-upgrade-1.7-1.8.sql b/schemas/schema-upgrade-1.7-1.8.sql
similarity index 100%
rename from docs/schema-upgrade-1.7-1.8.sql
rename to schemas/schema-upgrade-1.7-1.8.sql
diff --git a/docs/schema-upgrade-1.8-1.9.sql b/schemas/schema-upgrade-1.8-1.9.sql
similarity index 100%
rename from docs/schema-upgrade-1.8-1.9.sql
rename to schemas/schema-upgrade-1.8-1.9.sql
diff --git a/docs/schema-upgrade-1.9-1.10.sql b/schemas/schema-upgrade-1.9-1.10.sql
similarity index 100%
rename from docs/schema-upgrade-1.9-1.10.sql
rename to schemas/schema-upgrade-1.9-1.10.sql
diff --git a/docs/schema.sql b/schemas/schema.sql
similarity index 100%
rename from docs/schema.sql
rename to schemas/schema.sql