diff --git a/.gitignore b/.gitignore index 8879ace..bfa0011 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /copr-backend-1.115.tar.gz /copr-backend-1.116.tar.gz /copr-backend-1.117.tar.gz +/copr-backend-1.117.git.13.c8d66192.tar.gz diff --git a/copr-backend.spec b/copr-backend.spec index b316e00..3d3131b 100644 --- a/copr-backend.spec +++ b/copr-backend.spec @@ -3,7 +3,7 @@ %endif Name: copr-backend -Version: 1.117 +Version: 1.117.git.13.c8d66192 Release: 1%{?dist} Summary: Backend for Copr @@ -11,10 +11,10 @@ License: GPLv2+ URL: https://pagure.io/copr/copr # Source is created by: # git clone https://pagure.io/copr/copr.git -# git checkout copr-backend-1.117 +# git checkout copr-backend-1.117.git.13.c8d66192 # cd copr/backend # rpkg spec --sources -Source0: copr-backend-1.117.tar.gz +Source0: copr-backend-1.117.git.13.c8d66192.tar.gz BuildArch: noarch BuildRequires: asciidoc @@ -23,9 +23,6 @@ BuildRequires: util-linux BuildRequires: systemd BuildRequires: redis -%global _python_bytecompile_extra 0 -%global __python %{__python3} - BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-requests @@ -94,21 +91,16 @@ and submit new builds and COPR will create yum repository from latests builds. This package include documentation for COPR code. Mostly useful for developers only. + %prep %setup -q + %build +make -C docs %{?_smp_mflags} html -%if 0%{?fedora} -# build documentation -pushd docs - PYTHONDONTWRITEBYTECODE=1 make %{?_smp_mflags} html - rm build/html/.buildinfo -popd -%endif # ?fedora %install - install -d %{buildroot}%{_sharedstatedir}/copr install -d %{buildroot}%{_sharedstatedir}/copr/jobs install -d %{buildroot}%{_sharedstatedir}/copr/public_html/results @@ -159,9 +151,7 @@ cp -a conf/playbooks %{buildroot}%{_pkgdocdir}/ install -d %{buildroot}%{_pkgdocdir}/examples/%{_sysconfdir}/logstash.d cp -a conf/logstash/copr_backend.conf %{buildroot}%{_pkgdocdir}/examples/%{_sysconfdir}/logstash.d/copr_backend.conf -%if 0%{?fedora} - cp -a docs/build/html %{buildroot}%{_pkgdocdir}/ -%endif +cp -a docs/build/html %{buildroot}%{_pkgdocdir}/ %py_byte_compile %{__python3} %{buildroot}%{_datadir}/copr/backend @@ -217,7 +207,6 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr %files doc %license LICENSE %doc -# %{_pkgdocdir}/python-doc %{_pkgdocdir}/ %exclude %{_pkgdocdir}/lighttpd %exclude %{_pkgdocdir}/playbooks diff --git a/sources b/sources index 41a78d5..73013af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (copr-backend-1.117.tar.gz) = 1bdfd140787305e016e446bf47a6f548e1f8f34b5baadc081808078fdd3ec071f8cb998dbb3f611bdaa68a65eacb22f6f8e1a0d11a612d63df9e7c9c2b877be3 +SHA512 (copr-backend-1.117.git.13.c8d66192.tar.gz) = d72119961c1fa939b5d760767a55f62be3c0a2d0ff76b5b681d15832dff7779dfadf768d476c0103783a136332d711cc9e201ddc0028d15d555350efdf08427f