summaryrefslogtreecommitdiffstats
path: root/redhat/build
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2024-10-22 22:12:43 +0200
committerFrançois Andriot <[email protected]>2024-10-22 22:12:54 +0200
commit7ac1265088113bee95ae869cc8c94d4646d98ea2 (patch)
tree4f02655ded25bdb30ccaa908154f40c191026b5a /redhat/build
parent3486112a8b6ddb04304d4a0da14d55501d3af8da (diff)
downloadtde-packaging-7ac1265088113bee95ae869cc8c94d4646d98ea2.tar.gz
tde-packaging-7ac1265088113bee95ae869cc8c94d4646d98ea2.zip
RPM: Update for final R14.1.3
Signed-off-by: François Andriot <[email protected]>
Diffstat (limited to 'redhat/build')
-rwxr-xr-xredhat/build/gather_rpm_sources.sh2
-rwxr-xr-xredhat/build/update_repository.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh
index 3a5d0e5ba..8feea95b5 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -41,7 +41,7 @@ if [ -d "${PATCHDIR}" ]; then
fi
fi
-if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST}" = ".omv5000" ] || [ "${DIST}" = ".osstw" ]; then
+if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST}" = ".omv5000" ] || [ "${DIST}" = ".osstw" ] || [ "${DIST:0:6}" = ".pclos" ]; then
sed -i "${TARGETDIR}/"*".spec" \
-e "s|%patch|%patch -P |g"
fi
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 6530efc63..5a8a13eb4 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -28,7 +28,7 @@ elif [ -x /usr/bin/dnf ]; then
REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)'
elif [ -x /usr/bin/zypper ]; then
REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
- REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
+ #REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/yum ]; then
if [ "${DIST}" = ".el5" ]; then
REPOUPDATE='(cd ${RPMDIR}; ${createrepo} ${ARCH} & ${createrepo} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'