SPECS: scgi.spec - fixed Name issue (Name=scgi, no main binary pac...

[qboosh]

Author: qboosh                       Date: Mon Nov 21 07:00:29 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed Name issue (Name=scgi, no main binary package)

---- Files affected:
SPECS:
   scgi.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/scgi.spec
diff -u SPECS/scgi.spec:1.6 SPECS/scgi.spec:1.7
--- SPECS/scgi.spec:1.6	Wed Jun  1 19:11:49 2005
+++ SPECS/scgi.spec	Mon Nov 21 08:00:24 2005
@@ -1,32 +1,28 @@
 # $Revision$, $Date$
 #
 # TODO:
-#   - Name vs spec filename (use scgi for SRPM only without main package?)
 #   - there is also support for apache1 in scgi-1.2.tar.gz
 #   - there is cgi2scgi.c (CGI script that forwards requests to a SCGI server)
 #     which may be compiled and instaled in cgi-bin
 #   - python-scgi not tested; apache-mod_scgi works for me
 #
-#
 
-%define		pname	scgi
 %define		apxs	/usr/sbin/apxs
 
 Summary:	SCGI - a replacement for the Common Gateway Interface (CGI)
 Summary(pl):	SCGI - zastępnik dla Common Gateway Interface (CGI)
-Name:		apache-mod_scgi
+Name:		scgi
 Version:	1.2
 Release:	1
 Epoch:		0
 License:	CNRI OPEN SOURCE LICENSE
 Group:		Networking/Daemons
-Source0:	http://www.mems-exchange.org/software/scgi/%{pname}-%{version}.tar.gz
-Source1:	%{name}.conf
+Source0:	http://www.mems-exchange.org/software/scgi/%{name}-%{version}.tar.gz
+Source1:	apache-mod_%{name}.conf
 # Source0-md5:	577f6db7ab95e602378293756d368112
-Patch0:		%{pname}-apache2.patch
+Patch0:		%{name}-apache2.patch
 URL:		http://www.mems-exchange.org/software/scgi/
 BuildRequires:	python-devel >= 1:2.3
-%pyrequires_eq  python-modules
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,10 +33,28 @@
 HTTP servers. It is similar to FastCGI but is designed to be easier to
 implement.
 
+%description -l pl
+Protokół SCGI może być używany zamiast protokołu Common Gateway
+Interface (CGI). Jest standardem komunikacji miedzy aplikacją a
+serwerem HTTP. Jest podobny do FastCGI ale zaprojektowany tak, by być
+prostszym do zaimplementowania.
+
+%package -n apache-mod_scgi
+Summary:	SCGI - a replacement for the Common Gateway Interface (CGI)
+Summary(pl):	SCGI - zastępnik dla Common Gateway Interface (CGI)
+Group:		Networking/Daemons
+%pyrequires_eq  python-modules
+
+%description -n apache-mod_scgi
+The SCGI protocol is a replacement for the Common Gateway Interface
+(CGI) protocol. It is a standard for applications to interface with
+HTTP servers. It is similar to FastCGI but is designed to be easier to
+implement.
+
 In this package you can find an Apache module named mod_scgi that
 implements the client side of the protocol.
 
-%description -l pl
+%description -n apache-mod_scgi -l pl
 Protokół SCGI może być używany zamiast protokołu Common Gateway
 Interface (CGI). Jest standardem komunikacji miedzy aplikacją a
 serwerem HTTP. Jest podobny do FastCGI ale zaprojektowany tak, by być
@@ -73,7 +87,7 @@
 protokołu SCGI.
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -q
 %patch0 -p1
 
 %build
@@ -96,8 +110,8 @@
         --optimize=2
 
 find $RPM_BUILD_ROOT%{py_sitedir} -name \*.py | xargs rm -f
-install -d $RPM_BUILD_ROOT%{py_sitescriptdir}/%{pname}
-find $RPM_BUILD_ROOT%{py_sitedir} -name \*.py[co] -exec mv \{\} $RPM_BUILD_ROOT%{py_sitescriptdir}/%{pname} \;
+install -d $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}
+find $RPM_BUILD_ROOT%{py_sitedir} -name \*.py[co] -exec mv \{\} $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,17 +128,17 @@
 	fi
 fi
 
-%files
+%files -n apache-mod_scgi
 %defattr(644,root,root,755)
 %doc CHANGES apache2/README LICENSE.txt
-%attr(755,root,root) %{_libdir}/apache/mod_%{pname}.so
+%attr(755,root,root) %{_libdir}/apache/mod_%{name}.so
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/httpd.conf/*.conf
 
-%files -n python-%{pname}
+%files -n python-%{name}
 %doc LICENSE.txt
 %defattr(644,root,root,755)
-%{py_sitescriptdir}/%{pname}
-%{py_sitedir}/%{pname}
+%{py_sitescriptdir}/%{name}
+%{py_sitedir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -132,6 +146,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/11/21 07:00:24  qboosh
+- fixed Name issue (Name=scgi, no main binary package)
+
 Revision 1.6  2005/06/01 17:11:49  qboosh
 - cosmetics; note: Name or spec filename should be changed to match each other
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/scgi.spec?r1=1.6&r2=1.7&f=u