[gridsite] Upstream 1.7.16, drop compat package from .spec only.

[stevetraylen]

commit a804c3b9bc2bd3b0981ebf415b9f11e8079fcfb6
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sat Dec 3 22:34:25 2011 +0100

    Upstream 1.7.16, drop compat package from .spec only.

 .gitignore    |    1 +
 gridsite.spec |   79 +++-----------------------------------------------------
 sources       |    3 +-
 3 files changed, 7 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 330fb75..d1457d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gridsite-1.5.18.src.tar.gz
 /gridsite-1.7.12.src.tar.gz
 /gridsite-1.7.13.src.tar.gz
 /gridsite-1.7.15.src.tar.gz
+/gridsite-1.7.16.src.tar.gz
diff --git a/gridsite.spec b/gridsite.spec
index 9ee371d..9ce62b9 100644
--- a/gridsite.spec
+++ b/gridsite.spec
@@ -4,17 +4,10 @@
 %define aprversion 1
 %endif
 
-
-%global vercompat 1.5.20
-%if 0%{?el4}%{?el5} 
-%global compat 1
-%endif
-
-
 Name:           gridsite
-Version:        1.7.15
+Version:        1.7.16
 
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Grid Security for the Web, Web platforms for Grids
 
 Group:          System Environment/Daemons
@@ -33,8 +26,6 @@ Source3:        gridsitefoot.txt
 Source4:        root-level.gacl
 Source5:        gridsitelogo.png
 
-Source10:       http://www.gridsite.org/download/sources/gridsite-%{vercompat}.src.tar.gz
-
 #Change location of cgi-scripts.
 Patch1:         cgi-bin-location-1.7.15.patch
 #Change location of cgi-scripts.
@@ -135,33 +126,8 @@ has grown into a set of extensions to the Apache web server and a toolkit for
 
 This package gridsite-doc, contains developer documentation for gridsite.
 
-%if 0%{?compat}
-%package compat
-Group:    System Environment/Daemons
-Summary:  Run time libraries for mod_gridsite and gridsite-clients
-Version:  %{vercompat}
-Release:  1
-
-%description compat
-GridSite was originally a web application developed for managing and formatting 
-the content of the http://www.gridpp.ac.uk/ website. Over the past years it 
-has grown into a set of extensions to the Apache web server and a toolkit for 
-Grid credentials, GACL access control lists and HTTP(S) protocol operations. 
-
-This package contains the runtime libraries.
-%endif
-
 %prep
-%if 0%{?compat}
-%setup -q -n org.gridsite.core -a 10
-pushd org.gridsite.core
-%patch2 -p1
-%patch3 -p1
-popd
-
-%else
 %setup -q -n org.gridsite.core
-%endif
 # Copy in apache configuration.
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
@@ -173,34 +139,10 @@ cp -p %{SOURCE5} .
 %patch1 -p1
 
 %build
-%if 0%{?compat}
-pushd org.gridsite.core
-(cd src && MYCFLAGS="%{optflags} -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE -I../interface -I%{_includedir}/httpd -I%{_includedir}/apr-%{aprversion} -fPIC " make )
-popd
-%endif
 (cd src && MYCFLAGS="%{optflags} -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE -I../interface -I%{_includedir}/httpd -I%{_includedir}/apr-%{aprversion} -fPIC " make )
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if 0%{?compat}
-pushd org.gridsite.core
-(cd src && make install prefix=$RPM_BUILD_ROOT%{_usr} libdir=%{_lib} )
-rm  $RPM_BUILD_ROOT/%{_libdir}/libgridsite.a
-# Remove the built against globus-openssl libs since
-# we don't actually do that.
-rm  $RPM_BUILD_ROOT/%{_libdir}/libgridsite_globus.*
-# Remove all most everything from -compat installation package
-# since we don't want it.
-rm $RPM_BUILD_ROOT%{_libdir}/libgridsite.so
-rm $RPM_BUILD_ROOT%{_libdir}/libgridsite.so.1
-rm -rf $RPM_BUILD_ROOT%{_includedir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}
-rm -rf $RPM_BUILD_ROOT%{_libexecdir}
-rm -rf $RPM_BUILD_ROOT%{_bindir}
-rm -rf $RPM_BUILD_ROOT%{_sbindir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/httpd
-popd
-%endif
 (cd src && make install prefix=$RPM_BUILD_ROOT%{_usr} libdir=%{_lib} )
 
 # Remove static libs 
@@ -244,12 +186,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun libs -p /sbin/ldconfig
 
-%if 0%{?compat}
-%post compat -p /sbin/ldconfig
-
-%postun compat -p /sbin/ldconfig
-%endif
-
 %files 
 %defattr(-,root,root,-)
 %{_libdir}/httpd/modules/mod_gridsite.so
@@ -288,14 +224,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgridsite.so.1.7*
 %doc LICENSE 
 
-%if 0%{?compat}
-%files compat
-%defattr(-,root,root,-)
-%{_libdir}/libgridsite.so.1.5*
-%doc LICENSE
-%endif
-
-
 %files  clients
 %defattr(-,root,root,-)
 %attr(0755,root,root) %{_bindir}/findproxyfile
@@ -331,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/doxygen LICENSE
 
 %changelog
+* Sat Dec 3 2011 Steve Traylen <steve.traylen at cern.ch>  - 1.7.16-1
+- Upstream 1.7.16, drop compat package from .spec only.
+
 * Wed Jul 6 2011 Steve Traylen <steve.traylen at cern.ch>  - 1.7.15-4
 - devel package require openssl devel rhbz#719174
 
diff --git a/sources b/sources
index 4242631..e8b5fab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-34432f9771f5c1b3828658dc985c8188  gridsite-1.7.15.src.tar.gz
-305caf79718b44f99e59c1e5c8fd3f67  gridsite-1.5.20.src.tar.gz
+4e9914ac143c4a6616d1362a1cc7e969  gridsite-1.7.16.src.tar.gz