summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Martin <jxm@risingtidesystems.com>2011-05-15 02:35:23 +0200
committerJerome Martin <jxm@risingtidesystems.com>2011-05-15 02:39:32 +0200
commit3da5f7ab958196e683392d6295eaf0b30ab5e13d (patch)
treef3bfb5653e2eccb6017f601456670097ab904bf4
parentc65215a4bc0f16f61b77d5240578b4ec228e436c (diff)
downloadconfigshell-fb-3da5f7ab958196e683392d6295eaf0b30ab5e13d.tar.gz
For RPM build, include docs and proper version.
-rw-r--r--.gitignore1
-rw-r--r--Makefile13
-rw-r--r--redhat/python-configshell.spec.tmpl14
3 files changed, 25 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index f63f7e8..8164ad5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ debian/python-configshell.substvars
debian/configshell-doc.debhelper.log
debian/tmp/
*.spec
+rtslib-*
diff --git a/Makefile b/Makefile
index 48adf3e..4dc6a20 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,7 @@ clean:
rm -frv debian/python2.6-configshell/ debian/python-configshell/
rm -frv results
rm -fv redhat/*.spec *.spec
+ rm -frv rtslib-*
./bin/gen_changelog_cleanup
echo "Finished cleanup."
@@ -77,16 +78,22 @@ deb: doc
mv ../${NAME}_$$(cat dpkg-buildpackage.version).tar.gz dist
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 configshell-${RPMVERSION}/ | gzip > ~/rpmbuild/SOURCES/configshell-${RPMVERSION}.tar.gz
+ mkdir -p build
+ git archive master --prefix configshell/ > build/configshell.tar
+ cd build; tar mxf configshell.tar; rm configshell.tar
+ cp configshell/__init__.py build/configshell/configshell
+ cp -r doc build/configshell/
+ mv build/configshell configshell-${RPMVERSION}
+ tar zcf ~/rpmbuild/SOURCES/configshell-${RPMVERSION}.tar.gz configshell-${RPMVERSION}
rpmbuild -ba redhat/*.spec
@test -e dist || mkdir dist
mv ~/rpmbuild/SRPMS/python-configshell-${RPMVERSION}*.src.rpm dist/
mv ~/rpmbuild/RPMS/noarch/python-configshell-${RPMVERSION}*.rpm dist/
+ mv ~/rpmbuild/RPMS/noarch/python-configshell-doc-${RPMVERSION}*.rpm dist/
./bin/gen_changelog_cleanup
sdist: clean doc
diff --git a/redhat/python-configshell.spec.tmpl b/redhat/python-configshell.spec.tmpl
index 9cb6456..b1f6492 100644
--- a/redhat/python-configshell.spec.tmpl
+++ b/redhat/python-configshell.spec.tmpl
@@ -17,6 +17,14 @@ Vendor: RisingTide Systems
%description
A framework to implement simple but nice command-line interfaces.
+%package doc
+Summary: PDF and HTML API reference for python-configshell.
+Group: Documentation
+BuildRequires: epydoc
+
+%description doc
+PDF and HTML API reference for python-configshell.
+
%prep
%setup -q -n %{oname}-%{version}
@@ -26,6 +34,8 @@ A framework to implement simple but nice command-line interfaces.
%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
+mkdir -p %{buildroot}/usr/share/doc/%{oname}-%{version}
+cp -r doc/* %{buildroot}/usr/share/doc/%{oname}-%{version}/
%clean
rm -rf %{buildroot}
@@ -35,4 +45,8 @@ rm -rf %{buildroot}
%{python_sitelib}
%doc examples COPYING README
+%files doc
+%defattr(-,root,root,-)
+/usr/share/doc/%{oname}-%{version}
+
%changelog