diff --git a/.gitignore b/.gitignore index 6f26282..18a7948 100755 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,19 @@ /postgresql-16.3.tar.bz2.sha256 /postgresql-16.6.tar.bz2 /postgresql-16.6.tar.bz2.sha256 +/postgresql-16.8.tar.bz2 +/postgresql-15.12.tar.bz2 +/postgresql-16.8.tar.bz2.sha256 +/postgresql-15.12.tar.bz2.sha256 +/postgresql-16.9.tar.bz2 +/postgresql-15.13.tar.bz2 +/postgresql-16.9.tar.bz2.sha256 +/postgresql-15.13.tar.bz2.sha256 +/postgresql-16.10.tar.bz2 +/postgresql-15.14.tar.bz2 +/postgresql-16.10.tar.bz2.sha256 +/postgresql-15.14.tar.bz2.sha256 +/postgresql-16.11.tar.bz2 +/postgresql-15.15.tar.bz2 +/postgresql-16.11.tar.bz2.sha256 +/postgresql-15.15.tar.bz2.sha256 diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..a901bca --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.12.0.post1.dev18+gc39b0e7d4. diff --git a/packit-update-sources.sh b/packit-update-sources.sh new file mode 100755 index 0000000..370ade6 --- /dev/null +++ b/packit-update-sources.sh @@ -0,0 +1,8 @@ + git clone --depth 1 --branch master https://github.com/postgres/postgres.git + pushd postgres + git fetch --tags + NEW_MINOR=$(git tag -l "REL_15_*" | sed -E "s/REL_15_([0-9]+)/\1/" | sort -n | tail -n 1) + popd + pushd $PACKIT_DOWNSTREAM_REPO + sed -i "s/\(%global prevversion %{prevmajorversion}\)\.[0-9]\+/\1.$NEW_MINOR/" $PACKIT_DOWNSTREAM_PACKAGE_NAME.spec + popd diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..96a8367 --- /dev/null +++ b/packit.yaml @@ -0,0 +1,19 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ +actions: + pre-sync: + - bash -c "$PACKIT_DOWNSTREAM_REPO/packit-update-sources.sh" + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-all + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + - job: bodhi_update + trigger: commit + dist_git_branches: + fedora-all diff --git a/postgresql16.spec b/postgresql16.spec index e018687..2aaf0a1 100644 --- a/postgresql16.spec +++ b/postgresql16.spec @@ -29,7 +29,7 @@ %{!?sdt:%global sdt 1} %{!?selinux:%global selinux 1} %{!?runselftest:%global runselftest 1} -%{!?postgresql_default:%global postgresql_default 1} +%{!?postgresql_default:%global postgresql_default 0} %global majorname postgresql %global majorversion 16 @@ -47,7 +47,7 @@ Summary: PostgreSQL client programs Name: %{majorname}%{majorversion} -Version: %{majorversion}.6 +Version: %{majorversion}.11 Release: 1%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI @@ -60,7 +60,7 @@ Url: http://www.postgresql.org/ # that this be kept up with the latest minor release of the previous series; # but update when bugs affecting pg_dump output are fixed. %global prevmajorversion 15 -%global prevversion %{prevmajorversion}.7 +%global prevversion %{prevmajorversion}.15 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -107,6 +107,7 @@ Summary: PostgreSQL client programs BuildRequires: make BuildRequires: lz4-devel +BuildRequires: libzstd-devel BuildRequires: gcc BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk BuildRequires: perl(ExtUtils::Embed), perl-devel @@ -264,7 +265,6 @@ will interact with a PostgreSQL server. %package -n %{pkgname}-server Summary: The programs needed to create and run a PostgreSQL server Requires: %{pkgname}%{?_isa} = %precise_version -Requires(pre): /usr/sbin/useradd # We require this to be present for %%{_prefix}/lib/tmpfiles.d Requires: systemd # Make sure it's there when scriptlets run, too @@ -541,6 +541,14 @@ find . -type f -name Makefile -exec sed -i -e "s/SO_MAJOR_VERSION=\s\?\([0-9]\+\ # remove .gitignore files to ensure none get into the RPMs (bug #642210) find . -type f -name .gitignore | xargs rm +# Create a sysusers.d config file +cat >postgresql16.sysusers.conf < postgresql16.tmpfiles.conf <