Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	checksysreport.spec
@@ -1,19 +1,29 @@ -Summary: Perform automatic tests against a RHEL's sysreport. +Summary: Perform automatic tests against a RHEL's sysreport Name: checksysreport Version: 1.0 Release: 6 License: GPL Group: Application/Tools URL: https://www.checksysreport.com/ -Source0: %{name}-%{version}-6.tar.gz +Source0: %{name}-%{version}-6.tar.bz2 +Patch0: checksysreport-suse-wwwdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildArchitectures: noarch Requires: python %if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?fedora_version} Requires: pygtk2-libglade, pygtk2, postgresql-python +%define _wwwroot /var/www +%define _htdocsdir html +%define _wwwusr apache +%define _wwwusr apache %endif %if 0%{?suse_version} Requires: python-gtk python-gtkglext postgresql-plpython +BuildRequires: pwdutils +%define _wwwroot /srv/www +%define _htdocsdir htdocs +%define _wwwusr wwwrun +%define _wwwgrp www %endif Conflicts: rhnapiwrap @@ -23,9 +33,9 @@ %package server Requires: checksysreport,postgresql-server,php,php-pgsql,httpd,threadpool -Prereq: /usr/sbin/useradd +Requires: pwdutils Group: Application/Tools -Summary: This is the server side of checksysreport. +Summary: This is the server side of checksysreport %description server The checksysreport server uses a postgresql database to stores information about rhn packages. Ideally, the idea would be to have one such server per @@ -34,14 +44,25 @@ %pre server if [ $1 = 1 ] ; then echo "Creating checksysreport user" +%if 0%{?suseversion} +/usr/sbin/groupadd checksysreport +/usr/sbin/useradd -g checksysreport checksysreport +%endif +%if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?fedora_version} /usr/sbin/useradd checksysreport +%endif fi %post server echo "Read /usr/share/doc/checksysreport-server-%{version}/README.server to know how to enable the server." -/usr/sbin/usermod -a -G checksysreport apache -chmod g+s /var/www/checksysreport-spool +%if 0%{?suse_version} +/usr/sbin/usermod -A checksysreport %{_wwwusr} \|\| : +%endif +%if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?fedora_version} +/usr/sbin/usermod -a -G checksysreport %{_wwwusr} +%endif +chmod g+s %{_wwwroot}/checksysreport-spool %postun server if [ $1 = 0 ] ; then @@ -50,11 +71,14 @@ echo "Removing checksysreport group" /usr/sbin/groupdel checksysreport echo "Removing spool directory" - /bin/rm -rf /var/www/checksysreport-spool/ + /bin/rm -rf %{_wwwroot}/checksysreport-spool/ fi %prep %setup -q -n %{name}-%{version}-6 +%if 0%{?suse_version} +%patch0 +%endif %build @@ -71,6 +95,7 @@ %doc README COPYING CHANGELOG %attr(0755,root,root) /usr/bin/checksysreport %attr(0755,root,root) /usr/bin/yadarh +%dir /usr/share/%{name} %attr(0644,root,root) /usr/share/%{name}/globals.py* %attr(0644,root,root) /usr/share/%{name}/rhnapiwrap.py* %attr(0644,root,root) /usr/share/%{name}/sysreportChecker.py* @@ -92,13 +117,14 @@ %attr(0755,root,root) %{_bindir}/fill-cache-packages %attr(0755,root,root) %{_bindir}/fill-cache-advisory %attr(0755,root,root) %{_bindir}/wcs -%attr(0775,apache,checksysreport) /var/www/checksysreport-spool -%attr(0755,checksysreport,root) /var/www/html/wcs -%attr(0644,checksysreport,root) /var/www/html/wcs/index.ihtml -%attr(0644,checksysreport,root) /var/www/html/wcs/index.php -%attr(0644,checksysreport,root) /var/www/html/wcs/ok.ihtml -%attr(0644,checksysreport,root) /var/www/html/wcs/rhn-base.css -%attr(0644,checksysreport,root) /var/www/html/wcs/template.inc.php +%attr(0775,%{_wwwusr},checksysreport) %{_wwwroot}/checksysreport-spool +%dir %{_wwwroot}/%{_htdocsdir}/wcs +%attr(0755,checksysreport,root) %{_wwwroot}/%{_htdocsdir}/wcs +%attr(0644,checksysreport,root) %{_wwwroot}/%{_htdocsdir}/wcs/index.ihtml +%attr(0644,checksysreport,root) %{_wwwroot}/%{_htdocsdir}/wcs/index.php +%attr(0644,checksysreport,root) %{_wwwroot}/%{_htdocsdir}/wcs/ok.ihtml +%attr(0644,checksysreport,root) %{_wwwroot}/%{_htdocsdir}/wcs/rhn-base.css +%attr(0644,checksysreport,root) %{_wwwroot}/%{_htdocsdir}/wcs/template.inc.php %changelog
[-] [+]	Added	checksysreport-suse-wwwdir.patch ^
@@ -0,0 +1,18 @@ +--- Makefile.orig 2009-07-20 10:03:01.000000000 +0200 ++++ Makefile 2009-07-20 10:05:54.000000000 +0200 +@@ -10,13 +10,13 @@ + sbindir=$(prefix)/sbin + datadir=$(prefix)/share + mandir=$(prefix)/share/man/man1 +-htmldir=/var/www/html/wcs ++htmldir=/srv/www/htdocs/wcs + install: + @mkdir -p $(DESTDIR)$(bindir) + @mkdir -p $(DESTDIR)$(datadir)/$(NAME) + @mkdir -p $(DESTDIR)$(mandir) + @mkdir -p $(DESTDIR)$(htmldir) +- @mkdir -p $(DESTDIR)/var/www/checksysreport-spool ++ @mkdir -p $(DESTDIR)/srv/www/checksysreport-spool + mkdir -p $(DESTDIR)$(datadir)/$(NAME)/plugins + install -m 755 checksysreport $(DESTDIR)$(bindir) + install -m 755 yadarh $(DESTDIR)$(bindir)
	Renamed	checksysreport-1.0-6.tar.bz2 ^