23 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85a01a8b399..7429a335009 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,7 +328,7 @@ IF(NOT WITHOUT_SERVER)
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
-  ADD_SUBDIRECTORY(SPECIFIC-ULN)
+  ADD_SUBDIRECTORY(packaging/rpm-uln)
 ENDIF()
 
 INCLUDE(cmake/abi_check.cmake)
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 18c7afd8037..4adda0b6eac 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -138,7 +138,7 @@ SET(INSTALL_PLUGINTESTDIR_STANDALONE    ${plugin_tests})
 #
 # RPM layout
 #
-# See "SPECIFIC-ULN/mysql-5.5-libdir.patch" for the differences
+# See "packaging/rpm-uln/mysql-5.5-libdir.patch" for the differences
 # which apply to RPMs in ULN (Oracle Linux), that patch file will
 # be applied at build time via "rpmbuild".
 #
diff --git a/SPECIFIC-ULN/CMakeLists.txt b/packaging/rpm-uln/CMakeLists.txt
index c8f13379697..c8f13379697 100644
--- a/SPECIFIC-ULN/CMakeLists.txt
+++ b/packaging/rpm-uln/CMakeLists.txt
diff --git a/SPECIFIC-ULN/README-ULN b/packaging/rpm-uln/README-ULN
index 8ae44a18605..8ae44a18605 100644
--- a/SPECIFIC-ULN/README-ULN
+++ b/packaging/rpm-uln/README-ULN
diff --git a/SPECIFIC-ULN/README.mysql-docs b/packaging/rpm-uln/README.mysql-docs
index dd894a7b9c0..dd894a7b9c0 100644
--- a/SPECIFIC-ULN/README.mysql-docs
+++ b/packaging/rpm-uln/README.mysql-docs
diff --git a/SPECIFIC-ULN/filter-requires-mysql.sh b/packaging/rpm-uln/filter-requires-mysql.sh
index d435062b8dc..d435062b8dc 100755
--- a/SPECIFIC-ULN/filter-requires-mysql.sh
+++ b/packaging/rpm-uln/filter-requires-mysql.sh
diff --git a/SPECIFIC-ULN/generate-tarball.sh b/packaging/rpm-uln/generate-tarball.sh
index 2ff4bff2349..2ff4bff2349 100755
--- a/SPECIFIC-ULN/generate-tarball.sh
+++ b/packaging/rpm-uln/generate-tarball.sh
diff --git a/SPECIFIC-ULN/my.cnf b/packaging/rpm-uln/my.cnf
index fae0fa276e1..fae0fa276e1 100644
--- a/SPECIFIC-ULN/my.cnf
+++ b/packaging/rpm-uln/my.cnf
diff --git a/SPECIFIC-ULN/my_config.h b/packaging/rpm-uln/my_config.h
index 435a126ac97..435a126ac97 100644
--- a/SPECIFIC-ULN/my_config.h
+++ b/packaging/rpm-uln/my_config.h
diff --git a/SPECIFIC-ULN/mysql-5.5-errno.patch b/packaging/rpm-uln/mysql-5.5-errno.patch
index 033e5195973..033e5195973 100644
--- a/SPECIFIC-ULN/mysql-5.5-errno.patch
+++ b/packaging/rpm-uln/mysql-5.5-errno.patch
diff --git a/SPECIFIC-ULN/mysql-5.5-fix-tests.patch b/packaging/rpm-uln/mysql-5.5-fix-tests.patch
index a1ab7a82210..a1ab7a82210 100644
--- a/SPECIFIC-ULN/mysql-5.5-fix-tests.patch
+++ b/packaging/rpm-uln/mysql-5.5-fix-tests.patch
diff --git a/SPECIFIC-ULN/mysql-5.5-libdir.patch b/packaging/rpm-uln/mysql-5.5-libdir.patch
index 2ab3e9eec27..2ab3e9eec27 100644
--- a/SPECIFIC-ULN/mysql-5.5-libdir.patch
+++ b/packaging/rpm-uln/mysql-5.5-libdir.patch
diff --git a/SPECIFIC-ULN/mysql-5.5-mtr1.patch b/packaging/rpm-uln/mysql-5.5-mtr1.patch
index 7a7dc85f16c..7a7dc85f16c 100644
--- a/SPECIFIC-ULN/mysql-5.5-mtr1.patch
+++ b/packaging/rpm-uln/mysql-5.5-mtr1.patch
diff --git a/SPECIFIC-ULN/mysql-5.5-stack-guard.patch b/packaging/rpm-uln/mysql-5.5-stack-guard.patch
index b2624d982de..b2624d982de 100644
--- a/SPECIFIC-ULN/mysql-5.5-stack-guard.patch
+++ b/packaging/rpm-uln/mysql-5.5-stack-guard.patch
diff --git a/SPECIFIC-ULN/mysql-5.5-testing.patch b/packaging/rpm-uln/mysql-5.5-testing.patch
index 74387135346..74387135346 100644
--- a/SPECIFIC-ULN/mysql-5.5-testing.patch
+++ b/packaging/rpm-uln/mysql-5.5-testing.patch
diff --git a/SPECIFIC-ULN/mysql-chain-certs.patch b/packaging/rpm-uln/mysql-chain-certs.patch
index 3b20a28031d..3b20a28031d 100644
--- a/SPECIFIC-ULN/mysql-chain-certs.patch
+++ b/packaging/rpm-uln/mysql-chain-certs.patch
diff --git a/SPECIFIC-ULN/mysql-embedded-check.c b/packaging/rpm-uln/mysql-embedded-check.c
index 8bf8ca53dad..8bf8ca53dad 100644
--- a/SPECIFIC-ULN/mysql-embedded-check.c
+++ b/packaging/rpm-uln/mysql-embedded-check.c
diff --git a/SPECIFIC-ULN/mysql-expired-certs.patch b/packaging/rpm-uln/mysql-expired-certs.patch
index acd3a78cce7..acd3a78cce7 100644
--- a/SPECIFIC-ULN/mysql-expired-certs.patch
+++ b/packaging/rpm-uln/mysql-expired-certs.patch
diff --git a/SPECIFIC-ULN/mysql-install-test.patch b/packaging/rpm-uln/mysql-install-test.patch
index 5980aea6a9f..5980aea6a9f 100644
--- a/SPECIFIC-ULN/mysql-install-test.patch
+++ b/packaging/rpm-uln/mysql-install-test.patch
diff --git a/SPECIFIC-ULN/mysql-strmov.patch b/packaging/rpm-uln/mysql-strmov.patch
index a144d0936e4..a144d0936e4 100644
--- a/SPECIFIC-ULN/mysql-strmov.patch
+++ b/packaging/rpm-uln/mysql-strmov.patch
diff --git a/SPECIFIC-ULN/mysql.init b/packaging/rpm-uln/mysql.init
index 310e8cfa023..310e8cfa023 100644
--- a/SPECIFIC-ULN/mysql.init
+++ b/packaging/rpm-uln/mysql.init
diff --git a/SPECIFIC-ULN/mysql.spec.sh b/packaging/rpm-uln/mysql.spec.sh
index 8b25b160be1..8b25b160be1 100644
--- a/SPECIFIC-ULN/mysql.spec.sh
+++ b/packaging/rpm-uln/mysql.spec.sh
diff --git a/SPECIFIC-ULN/scriptstub.c b/packaging/rpm-uln/scriptstub.c
index de942c136e7..de942c136e7 100644
--- a/SPECIFIC-ULN/scriptstub.c
+++ b/packaging/rpm-uln/scriptstub.c