Some repo folders reorganization

cern-eos · Jun 8, 2021 · 6218806 · 6218806
1 parent dd8e066
commit 6218806
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 7 deletions.
diff --git a/samba.logrotate → etc/samba.logrotate b/samba.logrotate → etc/samba.logrotate
diff --git a/dnf-install-list → gitlab-ci/dnf-install-list b/dnf-install-list → gitlab-ci/dnf-install-list
diff --git a/eos-deps-8.repo → gitlab-ci/eos-deps-8.repo b/eos-deps-8.repo → gitlab-ci/eos-deps-8.repo
diff --git a/epel-8.repo → gitlab-ci/epel-8.repo b/epel-8.repo → gitlab-ci/epel-8.repo
diff --git a/gitlab-ci/prebuild-c8.Dockerfile b/gitlab-ci/prebuild-c8.Dockerfile
@@ -10,10 +10,10 @@ RUN dnf install --nogpg -y git && dnf clean all \
     && if [[ $(git rev-parse --git-dir) != .git ]] || [[ $(git config --get remote.origin.url) != *gitlab.cern.ch/dss/samba-richacl.git ]]; \
         then git clone https://gitlab.cern.ch/dss/samba-richacl.git . ; fi
 
-COPY *8.repo /etc/yum.repos.d
+COPY gitlab-ci/*8.repo /etc/yum.repos.d
 
 RUN dnf install -y epel-release \
-    && dnf install --nogpg -y $(cat ./dnf-install-list) \
+    && dnf install --nogpg -y $(cat gitlab-ci/dnf-install-list) \
     && dnf install -y moreutils \
     && dnf clean all \
     && cd /usr/lib64 && ln -s libpyldb-util.cpython-36m-x86-64-linux-gnu.so.2.2.0 libpyldb-util.cpython-36m-x86-64-linux-gnu.so.2.2.1

diff --git a/samba-deps8.repo → gitlab-ci/samba-deps8.repo b/samba-deps8.repo → gitlab-ci/samba-deps8.repo
diff --git a/updates-source-7.repo → gitlab-ci/updates-source-7.repo b/updates-source-7.repo → gitlab-ci/updates-source-7.repo
diff --git a/updates-source-8.repo → gitlab-ci/updates-source-8.repo b/updates-source-8.repo → gitlab-ci/updates-source-8.repo
diff --git a/samba.spec.4.13 b/samba.spec.4.13
@@ -139,7 +139,7 @@ Source1:        https://ftp.samba.org/pub/samba/samba-%{version}%{pre_release}.t
 Source2:        gpgkey-52FBC0B86D954B0843324CDC6F33915B6568B7EA.gpg
 
 # Red Hat specific replacement-files
-Source10:       samba.logrotate
+Source10:       etc/samba.logrotate
 Source11:       smb.conf.vendor
 Source12:       smb.conf.example
 Source13:       pam_winbind.conf

diff --git a/samba.spec.4.14 b/samba.spec.4.14
@@ -139,7 +139,7 @@ Source1:        https://ftp.samba.org/pub/samba/stable/samba-%{version}%{pre_rel
 Source2:        gpgkey-52FBC0B86D954B0843324CDC6F33915B6568B7EA.gpg
 
 # Red Hat specific replacement-files
-Source10:       samba.logrotate
+Source10:       etc/samba.logrotate
 Source11:       smb.conf.vendor
 Source12:       smb.conf.example
 Source13:       pam_winbind.conf

diff --git a/samba_richacl.spec b/samba_richacl.spec
@@ -38,7 +38,7 @@ License:        GPLv3+ and LGPLv3+
 URL:            http://www.samba.org/
 
 Source0:        vfs_richacl.c
-Source1:	samba_richacl_build.sh
+Source1:        samba_richacl_build.sh
 
 Requires(post): systemd
 Requires(preun): systemd

diff --git a/samba_richacl_build.sh b/samba_richacl_build.sh
@@ -68,7 +68,7 @@ set -x
 #        -e "/^Source[0-9].*samba.pamd/d" \
 
     SRCDIR=$(dirname $sambaspec)/../SOURCES
-    for n in samba.logrotate smb.conf.vendor smb.conf.example pam_winbind.conf samba.pamd README.downgrade; do
+    for n in etc/samba.logrotate smb.conf.vendor smb.conf.example pam_winbind.conf samba.pamd README.downgrade; do
         if [[ -e $dir/$n ]]; then 
             cp $n $SRCDIR/$n
         else 
@@ -125,7 +125,7 @@ set -x
 [[ -n "$2" ]] && {
     case $2 in 
         srpm)           # create the source rpm from files in cwd
-            cp $dir/vfs_richacl.c $0 ~/rpmbuild/SOURCES
+            cp $dir/src/vfs_richacl.c $0 ~/rpmbuild/SOURCES
             cp $dir/samba_richacl.spec ~/rpmbuild/SPECS
 
             rpmbuild -bs ~/rpmbuild/SPECS/samba_richacl.spec

diff --git a/vfs_richacl.c → src/vfs_richacl.c b/vfs_richacl.c → src/vfs_richacl.c