diff options
| author | Jerome Martin <jxm@risingtidesystems.com> | 2011-05-14 04:15:33 +0200 |
|---|---|---|
| committer | Jerome Martin <jxm@risingtidesystems.com> | 2011-05-15 02:22:21 +0200 |
| commit | fbbeea285aa488f640c14b9fa312927b4935c2f4 (patch) | |
| tree | 2e4b6dce086dc8812b7821719fb9d63e492100b5 | |
| parent | 9ec2cc7c3160efcdefe0f3f02c99192b26da61ae (diff) | |
| download | rtslib-fb-fbbeea285aa488f640c14b9fa312927b4935c2f4.tar.gz | |
For RPM build, include docs and proper version.1.95
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | redhat/python-rtslib.spec.tmpl | 14 |
3 files changed, 25 insertions, 2 deletions
@@ -20,3 +20,4 @@ debian/python-rtslib.substvars debian/rtslib-doc.debhelper.log debian/tmp/ *.spec +rtslib-* @@ -61,6 +61,7 @@ clean: rm -frv debian/python2.6-rtslib/ debian/python-rtslib/ rm -frv results rm -fv redhat/*.spec *.spec + rm -frv rtslib-* ./bin/gen_changelog_cleanup echo "Finished cleanup." @@ -79,15 +80,22 @@ deb: doc mv ../*${NAME}*$$(cat dpkg-buildpackage.version)*.deb dist ./bin/gen_changelog_cleanup -rpm: +rpm: doc ./bin/gen_changelog echo Building RPM version ${RPMVERSION} mkdir -p ~/rpmbuild/SOURCES/ - git archive master --prefix rtslib-${RPMVERSION}/ | gzip > ~/rpmbuild/SOURCES/rtslib-${RPMVERSION}.tar.gz + mkdir -p build + git archive master --prefix rtslib/ > build/rtslib.tar + cd build; tar mxf rtslib.tar; rm rtslib.tar + cp rtslib/__init__.py build/rtslib/rtslib + cp -r doc build/rtslib/ + mv build/rtslib rtslib-${RPMVERSION} + tar zcf ~/rpmbuild/SOURCES/rtslib-${RPMVERSION}.tar.gz rtslib-${RPMVERSION} rpmbuild -ba redhat/*.spec @test -e dist || mkdir dist mv ~/rpmbuild/SRPMS/python-rtslib-${RPMVERSION}*.src.rpm dist/ mv ~/rpmbuild/RPMS/noarch/python-rtslib-${RPMVERSION}*.rpm dist/ + mv ~/rpmbuild/RPMS/noarch/python-rtslib-doc-${RPMVERSION}*.rpm dist/ ./bin/gen_changelog_cleanup sdist: clean doc diff --git a/redhat/python-rtslib.spec.tmpl b/redhat/python-rtslib.spec.tmpl index 8d8ff20..9fc5470 100644 --- a/redhat/python-rtslib.spec.tmpl +++ b/redhat/python-rtslib.spec.tmpl @@ -16,6 +16,14 @@ Vendor: RisingTide Systems %description API for RisingTide Systems generic SCSI target. +%package doc +Summary: PDF and HTML API reference for python-rtslib. +Group: Documentation +BuildRequires: epydoc + +%description doc +PDF and HTML API reference for python-rtslib. + %prep %setup -q -n %{oname}-%{version} @@ -27,6 +35,8 @@ rm -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} mkdir -p %{buildroot}/var/target/fabric cp specs/* %{buildroot}/var/target/fabric +mkdir -p %{buildroot}/usr/share/doc/%{oname}-%{version} +cp -r doc/* %{buildroot}/usr/share/doc/%{oname}-%{version}/ %clean rm -rf %{buildroot} @@ -37,4 +47,8 @@ rm -rf %{buildroot} /var/target %doc COPYING README +%files doc +%defattr(-,root,root,-) +/usr/share/doc/%{oname}-%{version} + %changelog |