Skip to content

Commit

Permalink
Merge pull request #4599 from raukadah/rpmbuild_without
Browse files Browse the repository at this point in the history
Updates on making doc building optional
  • Loading branch information
openshift-merge-robot authored Dec 3, 2019
2 parents b88f2c4 + 1414a06 commit d8bfd11
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .copr/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ SHORT_COMMIT ?= $(shell git rev-parse --short=8 HEAD)
srpm:
mkdir -p $(topdir)
sh $(current_dir)/prepare.sh
rpmbuild -bs -D "dist %{nil}" -D "_sourcedir build/" -D "_srcrpmdir $(outdir)" -D "_topdir $(topdir)" --nodeps contrib/spec/podman.spec
rpmbuild -bs -D "dist %{nil}" -D "_sourcedir build/" -D "_srcrpmdir $(outdir)" -D "_topdir $(topdir)" --nodeps ${extra_arg:-""} contrib/spec/podman.spec

build_binary:
mkdir -p $(topdir)
rpmbuild --rebuild -D "_rpmdir $(outdir)" -D "_topdir $(topdir)" $(outdir)/podman-*.git$(SHORT_COMMIT).src.rpm
rpmbuild --rebuild -D "_rpmdir $(outdir)" -D "_topdir $(topdir)" ${extra_arg:-""} $(outdir)/podman-*.git$(SHORT_COMMIT).src.rpm

clean:
rm -fr rpms
Expand Down
8 changes: 6 additions & 2 deletions contrib/build_rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ declare -a PKGS=(device-mapper-devel \
glib2-devel \
glibc-static \
golang \
golang-github-cpuguy83-go-md2man \
gpgme-devel \
libassuan-devel \
libseccomp-devel \
Expand All @@ -41,14 +40,19 @@ if [ $pkg_manager == "/usr/bin/dnf" ]; then
PKGS+=(btrfs-progs-devel)
fi

fi

# golang-github-cpuguy83-go-md2man is needed for building man pages
# It is not available by default in CentOS 8 making it optional
if [ -z "$extra_arg" ]; then
PKGS+=(golang-github-cpuguy83-go-md2man)
fi

echo ${PKGS[*]}
$pkg_manager install -y ${PKGS[*]}

make -f .copr/Makefile
rpmbuild --rebuild podman-*.src.rpm
rpmbuild --rebuild ${extra_arg:-""} podman-*.src.rpm

# Test to make sure the install of the binary works
$pkg_manager -y install ~/rpmbuild/RPMS/x86_64/podman-*.x86_64.rpm
Expand Down
40 changes: 30 additions & 10 deletions contrib/spec/podman.spec.in
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
%global with_devel 0
%global with_bundled 1
%global with_debug 1
%global with_check 0
%global with_unit_test 0
%global with_doc 1
%bcond_without doc
%bcond_without debug

%if 0%{?fedora} >= 28
%bcond_without varlink
%else
%bcond_with varlink
%endif

%if 0%{?with_debug}
%if %{with debug}
%global _find_debuginfo_dwz_opts %{nil}
%global _dwz_low_mem_die_limit 0
%else
Expand Down Expand Up @@ -61,7 +61,7 @@ BuildRequires: glib2-devel
BuildRequires: glibc-devel
BuildRequires: glibc-static
BuildRequires: git
%if 0%{?with_doc}
%if %{with doc}
BuildRequires: go-md2man
%endif
BuildRequires: gpgme-devel
Expand Down Expand Up @@ -355,6 +355,15 @@ This package contains unit tests for project
providing packages with %{import_path} prefix.
%endif

%if %{with doc}
%package manpages
Summary: Man pages for the %{name} commands
BuildArch: noarch

%description manpages
Man pages for the %{name} commands
%endif

%prep
%autosetup -Sgit -n %{repo}-%{shortcommit0}

Expand All @@ -363,7 +372,7 @@ tar zxf %{SOURCE1}

sed -i 's/install.remote: podman-remote/install.remote:/' Makefile
sed -i 's/install.bin: podman/install.bin:/' Makefile
%if 0%{?with_doc}
%if %{with doc}
sed -i 's/install.man: docs/install.man:/' Makefile
%endif

Expand All @@ -379,7 +388,7 @@ export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/

GOPATH=$GOPATH go generate ./cmd/podman/varlink/...

%if 0%{?with_doc}
%if %{with doc}
BUILDTAGS=$BUILDTAGS make binaries docs
%else
BUILDTAGS=$BUILDTAGS make binaries
Expand All @@ -400,13 +409,22 @@ popd
%install
install -dp %{buildroot}%{_unitdir}
install -dp %{buildroot}%{_usr}/lib/systemd/user
%if %{with doc}
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
install.bin \
install.remote \
install.man \
install.cni \
install.systemd \
install.completions
%else
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
install.bin \
install.remote \
install.cni \
install.systemd \
install.completions
%endif

mv pkg/hooks/README.md pkg/hooks/README-hooks.md

Expand Down Expand Up @@ -489,10 +507,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%license LICENSE
%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
%{_bindir}/%{name}
%if 0%{?with_doc}
%{_mandir}/man1/*.1*
%{_mandir}/man5/*.5*
%endif
%{_datadir}/bash-completion/completions/*
%{_datadir}/zsh/site-functions/*
%{_libexecdir}/%{name}/conmon
Expand Down Expand Up @@ -522,6 +536,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
%{_bindir}/%{name}-remote

%if %{with doc}
%files manpages
%{_mandir}/man1/*.1*
%{_mandir}/man5/*.5*
%endif

%changelog
* Sat Aug 4 2018 Dan Walsh <[email protected]> - 0.8.1-1.git6b4ab2a
- Bump to v0.8.1
Expand Down

0 comments on commit d8bfd11

Please sign in to comment.