[Ocfs2-tools-commits] manish commits r865 - in trunk: .
vendor/common
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Apr 28 21:00:07 CDT 2005
Author: manish
Date: 2005-04-28 21:00:05 -0500 (Thu, 28 Apr 2005)
New Revision: 865
Modified:
trunk/Makefile
trunk/vendor/common/ocfs2-tools.spec.in
Log:
Dist some docs in the rpm, only compile python files on red hat
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-04-29 01:30:14 UTC (rev 864)
+++ trunk/Makefile 2005-04-29 02:00:05 UTC (rev 865)
@@ -13,9 +13,11 @@
ifeq ($(SUSEBUILD),yes)
PYGTK_NAME = python-gtk
CHKCONFIG_DEP = aaa_base
+COMPILE_PY = 0
else
PYGTK_NAME = pygtk2
CHKCONFIG_DEP = chkconfig
+COMPILE_PY = 1
endif
TOOLSARCH = $(shell $(TOPDIR)/rpmarch.guess tools $(TOPDIR))
@@ -81,10 +83,10 @@
rm -f Config.make config.status config.cache config.log
srpm: dist
- $(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" --define "pygtk_name $(PYGTK_NAME)" --define "pyversion $(PYVERSION)" --define "chkconfig_dep $(CHKCONFIG_DEP)" $(TOPDIR)/vendor/common/ocfs2-tools.spec
+ $(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" --define "pygtk_name $(PYGTK_NAME)" --define "pyversion $(PYVERSION)" --define "chkconfig_dep $(CHKCONFIG_DEP)" --define "compile_py $(COMPILE_PY)" $(TOPDIR)/vendor/common/ocfs2-tools.spec
rpm: srpm
- $(RPMBUILD) --rebuild --define "pygtk_name $(PYGTK_NAME)" --define "pyversion $(PYVERSION)" --define "chkconfig_dep $(CHKCONFIG_DEP)" $(TOOLSARCH) "ocfs2-tools-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
+ $(RPMBUILD) --rebuild --define "pygtk_name $(PYGTK_NAME)" --define "pyversion $(PYVERSION)" --define "chkconfig_dep $(CHKCONFIG_DEP)" --define "compile_py $(COMPILE_PY)" $(TOOLSARCH) "ocfs2-tools-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
def:
@echo $(TOOLSARCH)
Modified: trunk/vendor/common/ocfs2-tools.spec.in
===================================================================
--- trunk/vendor/common/ocfs2-tools.spec.in 2005-04-29 01:30:14 UTC (rev 864)
+++ trunk/vendor/common/ocfs2-tools.spec.in 2005-04-29 02:00:05 UTC (rev 865)
@@ -59,7 +59,9 @@
make DESTDIR="$RPM_BUILD_ROOT" install
+%if %{compile_py}
%{__python} "%{_libdir}/python%{pyversion}/compileall.py" -q "$RPM_BUILD_ROOT/%{_libdir}/python%{pyversion}/site-packages/ocfs2interface"
+%endif
%clean
@@ -72,6 +74,8 @@
%files
%defattr(-,root,root)
+%doc README.O2CB COPYING CREDITS MAINTAINERS
+%doc documentation/users_guide.txt
/sbin/fsck.ocfs2
/sbin/mkfs.ocfs2
/sbin/mounted.ocfs2
More information about the Ocfs2-tools-commits
mailing list