SPECS: lstat.spec - main and -cgi both require http user group for...

glen glen at pld-linux.org
Mon Apr 14 12:57:39 CEST 2008


Author: glen                         Date: Mon Apr 14 10:57:39 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- main and -cgi both require http user group for %files
- %post of main pkg also requires http user/group
- add R: alias for -cgi
- statimg dir is packaged by -cgi
- bug 136
- rel 20

---- Files affected:
SPECS:
   lstat.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SPECS/lstat.spec
diff -u SPECS/lstat.spec:1.80 SPECS/lstat.spec:1.81
--- SPECS/lstat.spec:1.80	Mon Apr 14 12:20:42 2008
+++ SPECS/lstat.spec	Mon Apr 14 12:57:34 2008
@@ -11,7 +11,7 @@
 Summary(pl.UTF-8):	LinuxStat służy do generowania i prezentacji różnych statystyk
 Name:		lstat
 Version:	2.3.2
-Release:	19
+Release:	20
 Epoch:		1
 License:	GPL
 Group:		Applications/Networking
@@ -36,14 +36,14 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
+Requires:	group(http)
 Requires:	rc-scripts
+Requires:	user(http)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_initdir	/etc/rc.d/init.d
 %define		_pkglibdir	/var/lib/%{name}
-%define		_wwwuser	http
-%define		_wwwgroup	http
 %define		_wwwrootdir	/usr/share/%{name}
 %define		_webapps	/etc/webapps
 %define		_webapp		%{name}
@@ -74,11 +74,14 @@
 Summary(pl.UTF-8):	Interfejs WWW (CGI) do lstata
 Group:		Applications/WWW
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	apache(mod_auth)
-Requires:	apache(mod_dir)
 Requires:	apache(mod_perl)
+Requires:	group(http)
+Requires:	user(http)
 Requires:	webapps
 Requires:	webserver = apache
+Requires:	webserver(alias)
+Requires:	webserver(auth)
+Requires:	webserver(indexfile)
 #Suggests:	apache(mod_cgi)
 #Suggests:	apache(mod_perl)
 
@@ -115,8 +118,8 @@
 	--with-objects=%{_pkglibdir}/objects \
 	--with-statimg=%{_pkglibdir}/statimg \
 	--with-templates=%{_pkglibdir}/templates \
-	--with-wwwuser=%{_wwwuser} \
-	--with-wwwgroup=%{_wwwgroup} \
+	--with-wwwuser=http \
+	--with-wwwgroup=http \
 	--noupdate_apache_conf
 
 %{__make}
@@ -152,9 +155,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pretrans
+%pretrans cgi
 test -h %{_wwwrootdir}/doc || rm -rf %{_wwwrootdir}/doc
 test -h %{_wwwrootdir}/statimg || rm -rf %{_wwwrootdir}/lstat/statimg
+exit 0
 
 %post
 /sbin/chkconfig --add lstatd
@@ -273,6 +277,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2008-04-14 10:57:34  glen
+- main and -cgi both require http user group for %files
+- %post of main pkg also requires http user/group
+- add R: alias for -cgi
+- statimg dir is packaged by -cgi
+- bug 136
+- rel 20
+
 Revision 1.80  2008-04-14 10:20:42  glen
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lstat.spec?r1=1.80&r2=1.81&f=u



More information about the pld-cvs-commit mailing list