r969 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-06 12:32:11 +0000 (Wed, 06 Jul 2011)
New Revision: 969
Added:
tags/v7-V1-4R4/
Log:
tag version
12 years, 10 months
r968 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-06 12:31:46 +0000 (Wed, 06 Jul 2011)
New Revision: 968
Modified:
trunk/Makefile
Log:
R4
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-07-06 12:31:01 UTC (rev 967)
+++ trunk/Makefile 2011-07-06 12:31:46 UTC (rev 968)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.4
-V7_RELEASE := 3
+V7_RELEASE := 4
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years, 10 months
r967 - in trunk/server: . cgi
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-06 12:31:01 +0000 (Wed, 06 Jul 2011)
New Revision: 967
Modified:
trunk/server/Makefile
trunk/server/cgi/Makefile
Log:
702695 - v7 server should have it's own package
Modified: trunk/server/Makefile
===================================================================
--- trunk/server/Makefile 2011-07-05 21:03:23 UTC (rev 966)
+++ trunk/server/Makefile 2011-07-06 12:31:01 UTC (rev 967)
@@ -25,7 +25,7 @@
# svn co $(V7_CATALOG_CCS_REPO) $(V7_CATALOG_CSS_COPY)
install-server:
- for i in $(SUBDIRS); do $(MAKE) -C $$i V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done
+ for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done
for file in $(FILES); do cp -f $$file $(DESTDIR)/var/www/v7/$$file; done
chcon -R root:object_r:httpd_sys_content_t $(DESTDIR)/var/www/v7
Modified: trunk/server/cgi/Makefile
===================================================================
--- trunk/server/cgi/Makefile 2011-07-05 21:03:23 UTC (rev 966)
+++ trunk/server/cgi/Makefile 2011-07-06 12:31:01 UTC (rev 967)
@@ -30,6 +30,6 @@
mkdir -p $(DESTDIR)$(V7_SERVER_ROOT)/cgi
mkdir -p $(DESTDIR)$(V7_SERVER_ROOT)/store
for file in $(FILES); do cp -f $$file $(DESTDIR)$(V7_SERVER_ROOT)/cgi/$$file; done
- for i in $(SUBDIRS); do $(MAKE) -C $$i V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done
+ for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done
mkdir -p $(DESTDIR)/etc/httpd/conf.d
cp -f v7.conf $(DESTDIR)/etc/httpd/conf.d/.
12 years, 10 months
r966 - trunk/tools
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-05 21:03:23 +0000 (Tue, 05 Jul 2011)
New Revision: 966
Modified:
trunk/tools/v7-release.py
Log:
702695 - v7 server should have it's own package
Modified: trunk/tools/v7-release.py
===================================================================
--- trunk/tools/v7-release.py 2011-07-05 21:01:44 UTC (rev 965)
+++ trunk/tools/v7-release.py 2011-07-05 21:03:23 UTC (rev 966)
@@ -25,7 +25,6 @@
distDir = "/home/gnichols/dist/v7"
sourceTar = "%s/v7-%s-%s.el%s.tar.bz2" % (buildDir, v7.version.version, v7.version.release, v7.version.rhel_version)
-serverSourceTar = "%s/v7-server-%s-%s.el%s.tar.bz2" % (buildDir, v7.version.version, v7.version.release, v7.version.rhel_version)
print "building for RHEL %s" % v7.version.rhel_version
@@ -35,15 +34,11 @@
#copy the spec file
shutil.copy(os.path.join(buildDir, "v7.spec"), "v7.spec")
-shutil.copy(os.path.join(buildDir, "v7-server.spec"), "v7-server.spec")
# upload the tarball
command = "make upload FILES=%s" % sourceTar
print command
os.system(command)
-command = "make upload FILES=%s" % serverSourceTar
-print command
-os.system(command)
# commit the new source and spec
command = "cvs commit -m \"R%s\" . " % v7.version.release
12 years, 10 months
r965 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-05 21:01:44 +0000 (Tue, 05 Jul 2011)
New Revision: 965
Added:
tags/v7-V1-4R3/
Log:
tag version
12 years, 10 months
r964 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-05 21:01:27 +0000 (Tue, 05 Jul 2011)
New Revision: 964
Modified:
trunk/Makefile
Log:
R3
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-07-05 20:58:12 UTC (rev 963)
+++ trunk/Makefile 2011-07-05 21:01:27 UTC (rev 964)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.4
-V7_RELEASE := 2
+V7_RELEASE := 3
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years, 10 months
r963 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-05 20:58:12 +0000 (Tue, 05 Jul 2011)
New Revision: 963
Modified:
trunk/Makefile
Log:
702695 - v7 server should have it's own package
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-07-05 20:58:01 UTC (rev 962)
+++ trunk/Makefile 2011-07-05 20:58:12 UTC (rev 963)
@@ -45,7 +45,7 @@
@echo "release = '$(V7_RELEASE)'" >> $(V7_VERSION_PY)
@echo "rhel_version = '$(V7_RHEL_VERSION)'" >> $(V7_VERSION_PY)
-install: mark-version
+install: mark-version install-server
mkdir -p $(DESTDIR)/usr/share/v7
mkdir -p $(DESTDIR)/var/v7
mkdir -p $(DESTDIR)/var/v7/docs
12 years, 10 months
r962 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-05 20:58:01 +0000 (Tue, 05 Jul 2011)
New Revision: 962
Modified:
trunk/v7.spec.in
Log:
702695 - v7 server should have it's own package
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-07-05 19:06:31 UTC (rev 961)
+++ trunk/v7.spec.in 2011-07-05 20:58:01 UTC (rev 962)
@@ -21,20 +21,33 @@
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Conflicts: rhr-core, rhr-auto, rhr-interact, rhr-crush
-# Obsoletes: rhr2-rhel4, rhr2-tests, rhr2-externals - does not provide these either!
-# need to check this. Requires: diffutils, rpm-build, /usr/bin/xmllint, /etc/sysconfig/init, httpd,
-# sox, cdrecord, bc, dosfstools, sysreport, ethtool, net-tools, nfs-utils, e2fsprogs, mt-st,
-# hotplug, /usr/X11R6/bin/x11perf, perl, up2date >= 4.2.57-2, kudzu, ltp, lmbench, dt, schedutils
-
Obsoletes: hts
Requires: lmbench, dt, httpd, nfs-utils, stress, gcc, PyXML, rpm-build
Requires: dbus-python, kernel-devel, kernel-headers
+# v7-server subpackage
+%package server
+Summary: Red Hat Hardware Test Suite Server
+Version: %{version}
+Release: %{release}.el%{rhel_version}
+Group: Development/Tools
+License: GPL
+URL: http://redhat.com
+# snapshot
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildArch: noarch
+Requires: v7
+Requires: python-lxml
+
+
%description
Red Hat Hardware Test Suite certifies hardware for Red Hat Enterprise Linux
+%description server
+Red Hat Hardware Test Suite Server supports systems running certification tests
+
%prep
%setup -q -c
@@ -64,7 +77,13 @@
/usr/share/man/man8/v7.8.gz
/etc/init.d/v7
+%files server
+%defattr(-,root,root)
+# set to user apache for web/cgi serving
+%attr(-, apache, apache) /var/www/v7
+/etc/httpd/conf.d/v7.conf
+
%changelog
* Wed Jun 15 2011 Greg Nichols <gnichols(a)redhat.com>
@@ -72,7 +91,7 @@
690676 - FEAT: v7 should generate zipped xml file as results
702695 - v7 server should have it's own package
-
+
* Wed Jun 08 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.4 R0
12 years, 10 months
r961 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-05 19:06:31 +0000 (Tue, 05 Jul 2011)
New Revision: 961
Added:
tags/v7-V1-4R2/
Log:
tag version
12 years, 10 months
r960 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-05 19:05:37 +0000 (Tue, 05 Jul 2011)
New Revision: 960
Modified:
trunk/Makefile
Log:
R2
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-06-15 19:52:54 UTC (rev 959)
+++ trunk/Makefile 2011-07-05 19:05:37 UTC (rev 960)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.4
-V7_RELEASE := 1
+V7_RELEASE := 2
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years, 10 months