More subpackages merges - gridsite-apache and gridsite-services into main gridsite...

diff --git a/org.gridsite.core/project/debian.control b/org.gridsite.core/project/debian.control
index 24110a8..31f020b 100644 (file)
--- a/org.gridsite.core/project/debian.control
+++ b/org.gridsite.core/project/debian.control
@@ -17,6 +17,14 @@ Standards-Version: 3.9.1
 Homepage: http://gridsite.org
 Vcs-Cvs: :pserver:anonymous@jra1mw.cvs.cern.ch:/cvs/jra1mw/org.gridsite.core
 
+Package: gridsite
+Section: httpd
+Architecture: any
+Provides: gridsite (= \${binary:Version})
+Depends: \${shlibs:Depends}, \${misc:Depends}
+Description: GridSite mod_gridsite module and CGI binaries for Apache httpd
+ GridSite Apache module and CGI binaries.
+
 Package: libgridsite${MINOR_VERSION}
 Section: libs
 Architecture: any
@@ -35,14 +43,6 @@ Depends: libgridsite${MINOR_VERSION} (= \${binary:Version}),
 Description: GridSite static libraries and headers
  Development files for GridSite - .a libraries and .h headers.
 
-Package: gridsite-apache
-Section: httpd
-Architecture: any
-Provides: gridsite (= \${binary:Version})
-Depends: \${shlibs:Depends}, \${misc:Depends}
-Description: GridSite mod_gridsite module for Apache httpd
- GridSite Apache module and CGI binaries.
-
 Package: gridsite-commands
 Section: web
 Architecture: any
@@ -71,13 +71,6 @@ Depends: \${shlibs:Depends}, \${misc:Depends}, libcurl3 (>=7.12.1), fuse-utils
 Description: SlashGrid daemon
  SlashGrid provides remote virtual filesystems under /grid (\"slash grid\").
 
-Package: gridsite-services
-Section: web
-Architecture: any
-Depends: \${shlibs:Depends}, \${misc:Depends}
-Description: GridSite WS gridsite-delegation.cgi
- GridSite WS delegation service, gridsite-delegation.cgi
-
 Package: gridsite-service-clients
 Section: web
 Architecture: any

diff --git a/org.gridsite.core/src/make-debian-files b/org.gridsite.core/src/make-debian-files
index 40d98e4..e2f13bf 100644 (file)
--- a/org.gridsite.core/src/make-debian-files
+++ b/org.gridsite.core/src/make-debian-files
@@ -30,18 +30,21 @@ chmod +x rules
 echo "7" > compat
 echo "3.0 (quilt)" > source/format
 
-# apache
-cat > gridsite-apache.install <<EOF
+# main (apache, cgi, delegation)
+cat > gridsite.install <<EOF
 usr/lib/apache2/modules/mod_gridsite.so
 usr/sbin/real-gridsite-admin.cgi
 usr/sbin/gridsite-copy.cgi
+usr/sbin/gridsite-delegation.cgi
 usr/sbin/gridsite-storage.cgi
 EOF
-cat > gridsite-apache.manpages <<EOF
+cat > gridsite.manpages <<EOF
+doc/gridsite-delegation.8
 doc/mod_gridsite.8
 EOF
-cat > gridsite-apache.docs <<EOF
+cat > gridsite.docs <<EOF
 debian/tmp/usr/share/doc/gridsite-${MINOR_VERSION}/httpd-*.conf
+doc/delegation-1.1.0.wsdl
 src/mod_gridsite_example.c
 EOF
 
@@ -97,17 +100,6 @@ doc/htproxyrenew.1
 doc/htproxyinfo.1
 EOF
 
-# services
-cat > gridsite-services.install <<EOF
-usr/sbin/gridsite-delegation.cgi
-EOF
-cat > gridsite-services.manpages <<EOF
-doc/gridsite-delegation.8
-EOF
-cat > gridsite-services.docs <<EOF
-doc/delegation-1.1.0.wsdl
-EOF
-
 # slashgrid
 cat > gridsite-slashgrid.dirs <<EOF
 etc/init.d

diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec
index 9deb20a..445f82a 100755 (executable)
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -55,23 +55,29 @@ Name: gridsite
 Version: ${PATCH_VERSION:-1.x.x}
 # This next piece of .spec/sed magic puts the build OS version in the release
 Release: %(if [ "$RELEASE_VERSION" ] ; then echo $RELEASE_VERSION ; else echo '1' ; fi)%{?dist}
-Summary: GridSite
+Summary: mod_gridsite module for Apache httpd
 License: Modified BSD
 Group: System Environment/Daemons
 Source: %{name}-%{version}.src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.gridsite.org/
 Vendor: GridPP
-Requires: gridsite-apache%{?_isa}
 Buildrequires: libxml2-devel,curl-devel,httpd-devel,openssl-devel,pkgconfig
 Buildrequires: doxygen${gsoapdep}${fusedep}${globusdep}
 Packager: Andrew McNab <Andrew.McNab@manchester.ac.uk>
+Provides: gridsite-apache = %{version}-%{release}
+Obsoletes: gridsite-apache <= 1.7.21
+Provides: gridsite-services = %{version}-%{release}
+Obsoletes: gridsite-services <= 1.7.21
 
 %description
 GridSite adds GSI, VOMS and GACL support to Apache 2.0 (mod_gridsite),
 a library for manipulating these technologies (libgridsite), and CGI
 programs for interactive management of HTTP(S) servers (gridsite-admin.cgi)
 
+This package contains Apache module, CGI binaries, and GridSite WS delegation
+service.
+
 See http://www.gridsite.org/ for details.
 
 %package $shared_name
@@ -88,22 +94,13 @@ See http://www.gridsite.org/ for details.
 %package devel
 Group: Development/Libraries
 Summary: GridSite .a libraries and .h headers
-Requires: gridsite-$shared_name%{?_isa} = %{version}-%{release}
+Requires: gridsite-$shared_name%{?_isa} = %{version}
 
 %description devel
 GridSite development libraries
 
 See http://www.gridsite.org/ for details.
 
-%package apache
-Group: System Environment/Daemons
-Summary: GridSite mod_gridsite module for Apache httpd
-
-%description apache
-GridSite Apache module and CGI binaries
-
-See http://www.gridsite.org/ for details.
-
 %package commands
 Group: Applications/Internet
 Summary: HTTP(S) read/write client and other GridSite commands
@@ -196,6 +193,23 @@ if [ "\$UID" = "0" ] ; then
 fi
 
 %files
+%attr(-, root, root) %{_prefix}/share/man/man8/mod_gridsite.8.gz
+%attr(-, root, root) %{_prefix}/%{_lib}/httpd/modules/mod_gridsite.so
+%attr(-, root, root) %{_prefix}/sbin/real-gridsite-admin.cgi
+%attr(-, root, root) %{_prefix}/sbin/gridsite-copy.cgi
+%attr(-, root, root) %{_prefix}/sbin/gridsite-storage.cgi
+EOF
+
+if [ $have_gsoap ] ; then
+cat <<EOF >>gridsite.spec
+%attr(-, root, root) %{_prefix}/sbin/gridsite-delegation.cgi
+%attr(-, root, root) %{_prefix}/share/man/man8/gridsite-delegation.8.gz
+%attr(-, root, root) %{_prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/delegation-1.1.0.wsdl
+%attr(-, root, root) %{_prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/gridsite-delegation.8
+EOF
+fi
+
+cat <<EOF >>gridsite.spec
 
 %files $shared_name
 %attr(-, root, root) %{_prefix}/%{_lib}/libgridsite.so.%{version}
@@ -220,13 +234,6 @@ fi
 %attr(-, root, root) %{_prefix}/%{_lib}/libgridsite_nossl.so
 %attr(-, root, root) %{_prefix}/%{_lib}/pkgconfig/*.pc
 
-%files apache
-%attr(-, root, root) %{_prefix}/share/man/man8/mod_gridsite.8.gz
-%attr(-, root, root) %{_prefix}/%{_lib}/httpd/modules/mod_gridsite.so
-%attr(-, root, root) %{_prefix}/sbin/real-gridsite-admin.cgi
-%attr(-, root, root) %{_prefix}/sbin/gridsite-copy.cgi
-%attr(-, root, root) %{_prefix}/sbin/gridsite-storage.cgi
-
 %files commands
 %attr(-, root, root) %{_prefix}/bin/htcp
 %attr(-, root, root) %{_prefix}/bin/htls
@@ -276,6 +283,7 @@ mkdir -p /grid
 %attr(0744, root, root) /etc/rc.d/init.d/slashgrid
 %attr(0700, root, root) /var/spool/slashgrid
 %attr(-, root, root) %{_prefix}/share/man/man8/slashgrid.8.gz
+
 EOF
 
 fi
@@ -283,19 +291,6 @@ fi
 if [ $have_gsoap ] ; then
 
 cat <<EOF >>gridsite.spec
-%package services
-Group: Applications/Internet
-Summary: GridSite WS gridsite-delegation.cgi
-
-%description services
-GridSite WS delegation service, gridsite-delegation.cgi
-
-%files services
-%attr(-, root, root) %{_prefix}/sbin/gridsite-delegation.cgi
-%attr(-, root, root) %{_prefix}/share/man/man8/gridsite-delegation.8.gz
-%attr(-, root, root) %{_prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/delegation-1.1.0.wsdl
-%attr(-, root, root) %{_prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/gridsite-delegation.8
-
 %package service-clients
 Group: Applications/Internet
 Summary: GridSite WS htproxyput