Differential D882

Fix packaging issues
ClosedPublic
Actions

Authored by mkrizek on Jun 7 2016, 7:36 AM.

Details

Reviewers
tflink
Group Reviewers
libtaskotron
Maniphest Tasks
T779: Send libtaskotron rpm for package review
Commits
rLTRN9f8addfd455c: Fix packaging issues
Test Plan

doit chainbuild

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to Fix packaging issues.Jun 7 2016, 7:36 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added a reviewer: libtaskotron.
tflink accepted this revision.Jun 7 2016, 5:07 PM
tflink added a reviewer: tflink.
This revision is now accepted and ready to land.Jun 7 2016, 5:07 PM
tflink added a comment.Jun 7 2016, 5:10 PM

it just dawned on me that we're eventually going to have to change a bunch of those requires and buildrequires to python2-<depname> instead of python-<depname>. That might come up during review because I think that the dep names in rawhide have been moved over to the new naming scheme.

mkrizek updated this revision to Diff 2285.Jun 21 2016, 3:18 PM

Updating the review with fixes from the package review

Closed by commit rLTRN9f8addfd455c: Fix packaging issues (authored by mkrizek). · Explain WhyJun 22 2016, 1:43 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mlibtaskotron.spec (65 lines)

Diff 2291

View Options

libtaskotron.spec

1# sitelib for noarch packages, sitearch for others (remove the unneeded one) ​
2%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} ​
3%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} ​
4 ​
5Name: libtaskotron 1​Name: libtaskotron
6Version: 0.4.13 2​Version: 0.4.13
7Release: 1%{?dist} 3​Release: 3%{?dist}
8Summary: Taskotron Support Library 4​Summary: Taskotron Support Library
9 5​
10License: GPLv3 6​License: GPLv3
11URL: https://bitbucket.org/fedoraqa/libtaskotron 7​URL: https://bitbucket.org/fedoraqa/libtaskotron
12Source0: http://qadevel.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz 8​Source0: https://qadevel.cloud.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
13 9​
14BuildArch: noarch 10​BuildArch: noarch
15 11​
16# sorted alphabetically 12​# sorted alphabetically
17Requires: libtaskotron-config = %{version}-%{release} 13​Requires: libtaskotron-config = %{version}-%{release}
18Requires: libtaskotron-core = %{version}-%{release} 14​Requires: libtaskotron-core = %{version}-%{release}
19Requires: libtaskotron-fedora = %{version}-%{release} 15​Requires: libtaskotron-fedora = %{version}-%{release}
20Requires: libtaskotron-disposable = %{version}-%{release} 16​Requires: libtaskotron-disposable = %{version}-%{release}
21 17​
22%description 18​%description
23Libtaskotron is a support library for running taskotron tasks. The top level libtaskotron package is a meta-package which will install all sub-packages 19​Libtaskotron is a support library for running taskotron tasks. The top level
20​libtaskotron package is a meta-package which will install all sub-packages.
24 21​
25%package -n libtaskotron-core 22​%package -n libtaskotron-core
26Summary: The minimal, core parts of libtaskotron 23​Summary: The minimal, core parts of libtaskotron
27 24​
28Requires: libtaskotron-config = %{version}-%{release} 25​Requires: libtaskotron-config = %{version}-%{release}
29Requires: python-configparser >= 3.5.0b2 26​Requires: python-configparser >= 3.5.0b2
30Requires: python-jinja2 >= 2.8 27​Requires: python-jinja2 >= 2.8
31Requires: python-progressbar >= 2.3 28​Requires: python-progressbar >= 2.3
29​Requires: python-resultsdb_api >= 1.2.1
32Requires: python-requests >= 2.7.0 30​Requires: python-requests >= 2.7.0
33Requires: python-setuptools 31​Requires: python-setuptools
34Requires: python2-xunitparser >= 1.3.3 32​Requires: python2-xunitparser >= 1.3.3
35Requires: PyYAML >= 3.11 33​Requires: PyYAML >= 3.11
36Requires: resultsdb_api >= 1.2.1 ​
37BuildRequires: pytest >= 2.7.3 34​BuildRequires: pytest >= 2.7.3
35​BuildRequires: python2-devel
38BuildRequires: python-configparser >= 3.5.0b2 36​BuildRequires: python-configparser >= 3.5.0b2
39BuildRequires: python-devel ​
40BuildRequires: python-dingus >= 0.3.4 37​BuildRequires: python-dingus >= 0.3.4
41BuildRequires: python-mock >= 1.0.1 38​BuildRequires: python-mock >= 1.0.1
42BuildRequires: python-progressbar >= 2.3 39​BuildRequires: python-progressbar >= 2.3
40​BuildRequires: python-resultsdb_api >= 1.2.1
43BuildRequires: python-requests >= 2.7.0 41​BuildRequires: python-requests >= 2.7.0
44BuildRequires: python-setuptools 42​BuildRequires: python-setuptools
45BuildRequires: PyYAML >= 3.11 43​BuildRequires: PyYAML >= 3.11
46BuildRequires: resultsdb_api >= 1.2.1 ​
47 44​
48%description -n libtaskotron-core 45​%description -n libtaskotron-core
49The minimal, core parts of libtaskotron that are needed to run tasks 46​The minimal, core parts of libtaskotron that are needed to run tasks
50 47​
51%package -n libtaskotron-config 48​%package -n libtaskotron-config
52Summary: Configuration files needed for using libtaskotron 49​Summary: Configuration files needed for using libtaskotron
53 50​
54%description -n libtaskotron-config 51​%description -n libtaskotron-config
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s)
97 94​
98%check 95​%check
99%{__python} setup.py test 96​%{__python} setup.py test
100 97​
101%build 98​%build
102%{__python} setup.py build 99​%{__python} setup.py build
103 100​
104%install 101​%install
105rm -rf $RPM_BUILD_ROOT 102​rm -rf %{buildroot}
106%{__python} setup.py install -O1 --skip-build --root %{buildroot} 103​%{__python} setup.py install -O1 --skip-build --root %{buildroot}
107 104​
108# configuration files 105​# configuration files
109mkdir -p %{buildroot}%{_sysconfdir}/taskotron/ 106​mkdir -p %{buildroot}%{_sysconfdir}/taskotron/
110install conf/taskotron.yaml.example %{buildroot}%{_sysconfdir}/taskotron/taskotron.yaml 107​install -m 0644 conf/taskotron.yaml.example %{buildroot}%{_sysconfdir}/taskotron/taskotron.yaml
111install conf/namespaces.yaml.example %{buildroot}%{_sysconfdir}/taskotron/namespaces.yaml 108​install -m 0644 conf/namespaces.yaml.example %{buildroot}%{_sysconfdir}/taskotron/namespaces.yaml
112install conf/yumrepoinfo.conf.example %{buildroot}%{_sysconfdir}/taskotron/yumrepoinfo.conf 109​install -m 0644 conf/yumrepoinfo.conf.example %{buildroot}%{_sysconfdir}/taskotron/yumrepoinfo.conf
113 110​
114# log dir 111​# log dir
115install -d %{buildroot}/%{_localstatedir}/log/taskotron 112​install -d %{buildroot}/%{_localstatedir}/log/taskotron
116 113​
117# tmp dir 114​# tmp dir
118install -d %{buildroot}/%{_tmppath}/taskotron 115​install -d %{buildroot}/%{_tmppath}/taskotron
119 116​
120# artifacts dir 117​# artifacts dir
121install -d %{buildroot}/%{_sharedstatedir}/taskotron/artifacts 118​install -d %{buildroot}/%{_sharedstatedir}/taskotron/artifacts
122 119​
123# cache dir 120​# cache dir
124install -d %{buildroot}/%{_localstatedir}/cache/taskotron 121​install -d %{buildroot}/%{_localstatedir}/cache/taskotron
125 122​
126# images dir 123​# images dir
127install -d %{buildroot}/%{_sharedstatedir}/taskotron/images 124​install -d %{buildroot}/%{_sharedstatedir}/taskotron/images
128 125​
129%files 126​%files
130 127​
131%files -n libtaskotron-core 128​%files -n libtaskotron-core
132%doc readme.rst LICENSE 129​%doc readme.rst
133%{python_sitelib}/libtaskotron/*.py* 130​%license LICENSE
134%{python_sitelib}/libtaskotron/directives/*.py* 131​%{python2_sitelib}/libtaskotron/*.py*
135%{python_sitelib}/libtaskotron/ext/*.py* 132​%{python2_sitelib}/libtaskotron/directives/*.py*
136%{python_sitelib}/libtaskotron/report_templates/*.j2 133​%{python2_sitelib}/libtaskotron/ext/*.py*
137%{python_sitelib}/*.egg-info 134​%{python2_sitelib}/libtaskotron/report_templates/*.j2
138 135​%{python2_sitelib}/*.egg-info
139%dir %{python_sitelib}/libtaskotron/ext/fedora 136​
140%dir %{python_sitelib}/libtaskotron/ext 137​%dir %{python2_sitelib}/libtaskotron/ext/fedora
141%dir %{python_sitelib}/libtaskotron/directives 138​%dir %{python2_sitelib}/libtaskotron/ext
142%dir %{python_sitelib}/libtaskotron/report_templates 139​%dir %{python2_sitelib}/libtaskotron/directives
140​%dir %{python2_sitelib}/libtaskotron/report_templates
143 141​
144%attr(755, root, root) %{_bindir}/runtask 142​%attr(755, root, root) %{_bindir}/runtask
145 143​
146%dir %attr(2775, root, taskotron) %{_tmppath}/taskotron 144​%dir %attr(2775, root, taskotron) %{_tmppath}/taskotron
147%dir %attr(2775, root, taskotron) %{_localstatedir}/log/taskotron 145​%dir %attr(2775, root, taskotron) %{_localstatedir}/log/taskotron
148%dir %attr(2775, root, taskotron) %{_localstatedir}/cache/taskotron 146​%dir %attr(2775, root, taskotron) %{_localstatedir}/cache/taskotron
149%dir %attr(2775, root, taskotron) %{_sharedstatedir}/taskotron 147​%dir %attr(2775, root, taskotron) %{_sharedstatedir}/taskotron
150%dir %attr(2775, root, taskotron) %{_sharedstatedir}/taskotron/artifacts 148​%dir %attr(2775, root, taskotron) %{_sharedstatedir}/taskotron/artifacts
151%dir %attr(2775, root, taskotron) %{_sharedstatedir}/taskotron/images 149​%dir %attr(2775, root, taskotron) %{_sharedstatedir}/taskotron/images
152 150​
153%files -n libtaskotron-config 151​%files -n libtaskotron-config
154%dir %{_sysconfdir}/taskotron 152​%dir %{_sysconfdir}/taskotron
155%config(noreplace) %{_sysconfdir}/taskotron/taskotron.yaml 153​%config(noreplace) %{_sysconfdir}/taskotron/taskotron.yaml
156%config %{_sysconfdir}/taskotron/namespaces.yaml 154​%config(noreplace) %{_sysconfdir}/taskotron/namespaces.yaml
157%config %{_sysconfdir}/taskotron/yumrepoinfo.conf 155​%config %{_sysconfdir}/taskotron/yumrepoinfo.conf
158 156​
159%files -n libtaskotron-fedora 157​%files -n libtaskotron-fedora
160%dir %{python_sitelib}/libtaskotron/ext/fedora 158​%dir %{python2_sitelib}/libtaskotron/ext/fedora
161%{python_sitelib}/libtaskotron/ext/fedora/* 159​%{python2_sitelib}/libtaskotron/ext/fedora/*
162 160​
163%files -n libtaskotron-disposable 161​%files -n libtaskotron-disposable
164%dir %{python_sitelib}/libtaskotron/ext/disposable 162​%dir %{python2_sitelib}/libtaskotron/ext/disposable
165%{python_sitelib}/libtaskotron/ext/disposable/* 163​%{python2_sitelib}/libtaskotron/ext/disposable/*
166 164​
167%changelog 165​%changelog
166​* Fri May 27 2016 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.13-3
167​- fix download URL for Source0
168​- fix conf files permissions
169​
170​* Thu May 26 2016 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.13-2
171​- remove not needed custom python_sitelib macro
172​
168* Thu May 26 2016 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.13-1 173​* Thu May 26 2016 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.13-1
169- add distgit docs 174​- add distgit docs
170- fix progressbar 175​- fix progressbar
171- koji: allow to exclude arches 176​- koji: allow to exclude arches
172- remote_exec: update to latest packages even when cache is outdated 177​- remote_exec: update to latest packages even when cache is outdated
173 178​
174* Tue May 10 2016 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.12-2 179​* Tue May 10 2016 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.12-2
175- remove global write permissions of libtaskotron directories and change group ownership 180​- remove global write permissions of libtaskotron directories and change group ownership
▲ Show 20 Lines • Show All 203 Lines • Show Last 20 Lines