From 4447054c35dc624f5de6eb3f9393395e40423975 Mon Sep 17 00:00:00 2001 From: Marko Zivanovic Date: Sat, 6 Jun 2026 12:57:06 +0200 Subject: [PATCH] Update Dockerfile and spec files to include additional build dependencies and improve RPM handling --- 8.17.3/Dockerfile | 5 +++-- 8.17.3/libvips-8.17.3.spec | 13 ++++++------ 8.18.2/libvips-8.18.2.spec | 2 +- Makefile | 16 ++++++++++----- dist/RPM-GPG-KEY-marko | 41 ++++++++++++++++++++++++++++++++++++++ dist/index.html | 20 +++++++++++++++++++ 6 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 dist/RPM-GPG-KEY-marko create mode 100644 dist/index.html diff --git a/8.17.3/Dockerfile b/8.17.3/Dockerfile index 64ea49f..caabf90 100644 --- a/8.17.3/Dockerfile +++ b/8.17.3/Dockerfile @@ -1,4 +1,4 @@ -FROM rockylinux/rockylinux:10.1.20251123 AS base +FROM rockylinux/rockylinux:10.1.20251123-minimal AS base WORKDIR /root @@ -25,6 +25,7 @@ RUN dnf update -y && dnf install -y \ RUN crb enable RUN dnf install -y \ + cfitsio-devel \ fftw-devel \ fontconfig-devel \ ImageMagick-devel \ @@ -37,7 +38,7 @@ RUN dnf install -y \ openexr-devel \ openjpeg2-devel \ openslide-devel \ - poppler-devel \ + poppler-glib-devel \ rpmlint \ && dnf clean all diff --git a/8.17.3/libvips-8.17.3.spec b/8.17.3/libvips-8.17.3.spec index d5d7248..178f23f 100644 --- a/8.17.3/libvips-8.17.3.spec +++ b/8.17.3/libvips-8.17.3.spec @@ -10,11 +10,12 @@ ExclusiveArch: x86_64 Source: https://github.com/libvips/libvips/releases/download/v%{LIBVIPS_VERSION}/vips-%{LIBVIPS_VERSION}.tar.xz URL: https://www.libvips.org/ -Requires: cairo -Requires: expat -Requires: openexr -Requires: openjpeg2 +# Requires: cairo +# Requires: expat +# Requires: openexr +# Requires: openjpeg2 +BuildRequires: cfitsio-devel BuildRequires: cmake BuildRequires: expat-devel BuildRequires: fftw-devel @@ -38,7 +39,7 @@ BuildRequires: ninja-build BuildRequires: openexr-devel BuildRequires: openjpeg2-devel BuildRequires: openslide-devel -BuildRequires: poppler-devel +BuildRequires: poppler-glib-devel BuildRequires: python3-pip @@ -93,5 +94,5 @@ meson install -C build --destdir %{buildroot} %{_libdir}/pkgconfig/* %%changelog -* Wed Jun 03 2026 Marko Zivanovic - 8.17.3-1 +* Wed Jun 06 2026 Marko Zivanovic - 8.17.3-1 - Initial package. diff --git a/8.18.2/libvips-8.18.2.spec b/8.18.2/libvips-8.18.2.spec index 9765fa5..2b75857 100644 --- a/8.18.2/libvips-8.18.2.spec +++ b/8.18.2/libvips-8.18.2.spec @@ -93,5 +93,5 @@ meson install -C build --destdir %{buildroot} %{_libdir}/pkgconfig/* %%changelog -* Wed Jun 03 2026 Marko Zivanovic - 8.17.3-1 +* Wed Jun 03 2026 Marko Zivanovic - 8.18.2-1 - Initial package. diff --git a/Makefile b/Makefile index 29f7f8e..2f9d762 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,16 @@ build: docker build -t libvips-build:$(LIBVIPS_VERSION) $(LIBVIPS_VERSION) copy_rpms: - mkdir rpms || true - docker run --rm -v $(PWD)/rpms:/rpms libvips-build:$(LIBVIPS_VERSION) bash -c "cp rpmbuild/RPMS/x86_64/*.rpm /rpms" - docker run --rm -v $(PWD)/rpms:/rpms libvips-build:$(LIBVIPS_VERSION) bash -c "cp rpmbuild/SRPMS/*.rpm /rpms" + mkdir -p dist/libvips/el10 || true + docker run --rm -v $(PWD)/dist/libvips/el10:/rpms libvips-build:$(LIBVIPS_VERSION) bash -c "cp rpmbuild/RPMS/x86_64/*.rpm /rpms" + docker run --rm -v $(PWD)/dist/libvips/el10:/rpms libvips-build:$(LIBVIPS_VERSION) bash -c "cp rpmbuild/SRPMS/*.rpm /rpms" shell: - mkdir rpms || true - docker run -it --rm -v $(PWD)/rpms:/rpms libvips-build:$(LIBVIPS_VERSION) + mkdir -p dist/libvips/el10 || true + docker run -it --rm -v $(PWD)/dist/libvips/el10:/rpms libvips-build:$(LIBVIPS_VERSION) + +create_repo: + createrepo_c dist/libvips/el10 + +s3_sync: + aws s3 sync dist s3://noisy-lab-com-rpms-crnrnya0 diff --git a/dist/RPM-GPG-KEY-marko b/dist/RPM-GPG-KEY-marko new file mode 100644 index 0000000..a8d2284 --- /dev/null +++ b/dist/RPM-GPG-KEY-marko @@ -0,0 +1,41 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=4j6g +-----END PGP PUBLIC KEY BLOCK----- diff --git a/dist/index.html b/dist/index.html new file mode 100644 index 0000000..106ed19 --- /dev/null +++ b/dist/index.html @@ -0,0 +1,20 @@ + + + + Libvips RPMs + + + +

libvips RPMs

+

noisy-lab-libvips.repo

+ +[noisy-lab-libvips-packages] +name=noisy-lab.com libvips packages +baseurl=https://rpms.noisy-lab.com/libvips/el10 +enabled=1 +gpgcheck=1 +gpgkey=https://rpms.noisy-lab.com/RPM-GPG-KEY-marko + + + + \ No newline at end of file