No longer package -israwhidebroken

[James Laska]

Greetings,

I mentioned this idea to Kamil on IRC today, so I generated a small patchset to
disable packaging of autoqa-israwhidebroken.  Rather than drop the code
entirely, this patch disables RPM package generation for the israwhidebroken
front-end.  We aren't using the front-end anywhere, and it was originally a
proof-of-concept.  I think the code is still worthwhile to keep around for a
bit longer (for example, I used it to create a wsgi git-commit watcher).

This patchset corrects a missing Makefile issue, as well as updates autoqa.spec
to disable -israwhidebroken sub-package generation.  I have not added any
%obsoletes to forcibly remove that package from any systems.

Comments/concerns?

Thanks,
James

[PATCH 1/2] Drop israwhidebroken sub-package

[James Laska]

---
 Makefile    |    7 -------
 autoqa.spec |   43 -------------------------------------------
 2 files changed, 0 insertions(+), 50 deletions(-)

diff --git a/Makefile b/Makefile
index ac4ddeb..1b3cac0 100644
--- a/Makefile
+++ b/Makefile
@@ -32,18 +32,11 @@ install: build
 	install -m 0644 lib/autotest/site_utils.py $(PREFIX)$(AUTOTEST_DIR)/client/bin
 	install -m 0644 lib/autotest/site_packages.py
$(PREFIX)$(AUTOTEST_DIR)/client/common_lib
 	( cd lib/python; $(PYTHON) setup.py install --skip-build --root $(PREFIX)/ )
-	## front-ends/israwhidebroken
-	install -d $(PREFIX)/usr/sbin
-	install -d $(PREFIX)/usr/share/autoqa-israwhidebroken
-	install -d $(PREFIX)/etc/httpd/conf.d
-	install -d $(PREFIX)/var/lib/israwhidebroken
-	( cd front-ends/israwhidebroken; $(PYTHON) setup.py install -O1 --skip-build --root
$(PREFIX)/ )
 
 build: lib/python/build
 
 lib/python/build:
 	( cd lib/python; $(PYTHON) setup.py build )
-	( cd front-ends/israwhidebroken; $(PYTHON) setup.py build )
 
 tarball: autoqa-$(VERSION).tar.gz
 
diff --git a/autoqa.spec b/autoqa.spec
index 261b20a..8d7c4e4 100644
--- a/autoqa.spec
+++ b/autoqa.spec
@@ -24,32 +24,6 @@ tests, the tests, and a series of watcher scripts designed to execute
tests
 under certain conditions.
 
 
-%package israwhidebroken
-Summary: A TurboGears front-end for 'is rawhide broken'
-Group: Applications/Internet
-Requires: TurboGears
-Requires: python-toscawidgets
-Requires: python-tw-forms >= 0.9.8
-Requires: mod_wsgi
-%if 0%{?fedora} >= 8
-Requires: python-cherrypy2
-%else
-Requires: python-cherrypy
-%endif
-BuildRequires: TurboGears
-BuildRequires: python-devel
-%if 0%{?fedora} >= 8
-BuildRequires:  python-setuptools-devel
-%else
-BuildRequires:  python-setuptools
-%endif
-
-
-%description israwhidebroken
-'Is rawhide broken' is a TurboGears front-end intended for AutoQA automated
-rawhide test results.
-
-
 %prep
 %setup -q
 
@@ -62,11 +36,6 @@ make build PYTHON=%{__python}
 rm -rf $RPM_BUILD_ROOT
 make install PREFIX=$RPM_BUILD_ROOT TEST_DIR=%{testdir} HOOK_DIR=%{hookdir}
PYTHON=%{__python}
 install -m 644 autoqa.conf repoinfo.conf $RPM_BUILD_ROOT%{_sysconfdir}/autoqa/
-# front-ends/israwhidebroken
-mv %{buildroot}%{_bindir}/start-israwhidebroken %{buildroot}%{_sbindir}/
-mv %{buildroot}%{_bindir}/israwhidebroken.wsgi %{buildroot}%{_sbindir}/
-mv %{buildroot}%{_bindir}/populate-israwhidebroken-db %{buildroot}%{_sbindir}/
-mv %{buildroot}%{python_sitelib}/israwhidebroken*
%{buildroot}%{_datadir}/%{name}-israwhidebroken/
 
 
 %clean
@@ -89,18 +58,6 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/autoqa*
 
 
-%files israwhidebroken
-%defattr(-,root,root,-)
-%doc front-ends/israwhidebroken/README.txt
-%dir %attr(775,root,apache) %{_localstatedir}/lib/israwhidebroken
-%config(noreplace) %{_sysconfdir}/israwhidebroken.cfg
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/israwhidebroken.conf
-%{_sbindir}/start-israwhidebroken
-%{_sbindir}/israwhidebroken.wsgi
-%{_sbindir}/populate-israwhidebroken-db
-%{_datadir}/%{name}-israwhidebroken
-
-
 %changelog
 * Mon Nov 15 2010 James Laska <jlaska(a)redhat.com&gt; - 0.4.3-1
 - Cleanup repoinfo.conf for new F-14 release and expired releases (jlaska)
-- 
1.7.3.2

[PATCH 2/2] Create common_lib directory first

[James Laska]

---
 Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1b3cac0..61e8124 100644
--- a/Makefile
+++ b/Makefile
@@ -25,12 +25,12 @@ install: build
 	install -m 0644 repoinfo.conf $(PREFIX)/etc/autoqa/
 	install -d $(PREFIX)$(HOOK_DIR)
 	for h in hooks/*; do cp -a $$h $(PREFIX)$(HOOK_DIR); done
-	[ -f $(PREFIX)$(HOOK_DIR)/autoqa.cron ] || install -m 0644 autoqa.cron
$(PREFIX)$(HOOK_DIR)/autoqa.cron
+	[ -f $(PREFIX)$(HOOK_DIR)/autoqa.cron ] || install -m 0644 autoqa.cron
$(PREFIX)$(HOOK_DIR)/
 	install -d $(PREFIX)$(TEST_DIR)
 	for t in tests/*; do cp -a $$t $(PREFIX)$(TEST_DIR); done
-	install -d $(PREFIX)$(AUTOTEST_DIR)/client/bin
-	install -m 0644 lib/autotest/site_utils.py $(PREFIX)$(AUTOTEST_DIR)/client/bin
-	install -m 0644 lib/autotest/site_packages.py
$(PREFIX)$(AUTOTEST_DIR)/client/common_lib
+	install -d $(PREFIX)$(AUTOTEST_DIR)/client/{bin,common_lib}
+	install -m 0644 lib/autotest/site_utils.py $(PREFIX)$(AUTOTEST_DIR)/client/bin/
+	install -m 0644 lib/autotest/site_packages.py
$(PREFIX)$(AUTOTEST_DIR)/client/common_lib/
 	( cd lib/python; $(PYTHON) setup.py install --skip-build --root $(PREFIX)/ )
 
 build: lib/python/build
-- 
1.7.3.2

[Josef Skladanka]

Hello,

Although I do not really understand all the spec files & makefile magic,
it seems OK to me, and I do completely support the idea of not packaging
the israwhide broken.

Thank you James

joza

----- Original Message -----
From: "James Laska" <jlaska(a)redhat.com&gt;
To: autoqa-devel(a)lists.fedorahosted.org
Sent: Friday, December 10, 2010 8:19:50 PM GMT +01:00 Amsterdam / Berlin / Bern / Rome /
Stockholm / Vienna
Subject: No longer package -israwhidebroken

Greetings,

I mentioned this idea to Kamil on IRC today, so I generated a small patchset to
disable packaging of autoqa-israwhidebroken.  Rather than drop the code
entirely, this patch disables RPM package generation for the israwhidebroken
front-end.  We aren't using the front-end anywhere, and it was originally a
proof-of-concept.  I think the code is still worthwhile to keep around for a
bit longer (for example, I used it to create a wsgi git-commit watcher).

This patchset corrects a missing Makefile issue, as well as updates autoqa.spec
to disable -israwhidebroken sub-package generation.  I have not added any
%obsoletes to forcibly remove that package from any systems.

Comments/concerns?

Thanks,
James

_______________________________________________
autoqa-devel mailing list
autoqa-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/autoqa-devel