From 0ffd833f0d2840b5304c1f74483c26bd0b749746 Mon Sep 17 00:00:00 2001
From: František Dvořák <valtri@civ.zcu.cz>
Date: Nov 09 2016 13:29:45 +0000
Subject: Upstream 2.3.3, removed compatibility dependencies and macros


---

diff --git a/gridsite.spec b/gridsite.spec
index 8994dcf..a63f481 100644
--- a/gridsite.spec
+++ b/gridsite.spec
@@ -1,10 +1,10 @@
 %global aprversion 1
-%global underversion 2_3_2
+%global underversion 2_3_3
 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}}
 
 Name:           gridsite
-Version:        2.3.2
-Release:        2%{?dist}
+Version:        2.3.3
+Release:        1%{?dist}
 Summary:        Grid Security for the Web, Web platforms for Grids
 
 Group:          System Environment/Daemons
@@ -22,7 +22,7 @@ Source3:        gridsitefoot.txt
 Source4:        root-level.gacl
 Source5:        gridsitelogo.png
 
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+%if %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:  libcurl-devel
 %else
 BuildRequires:  curl-devel
@@ -38,12 +38,6 @@ BuildRequires:  libtool
 
 Requires:       httpd-mmn = %{_httpd_mmn}
 Requires:       mod_ssl
-Requires:       gridsite-libs = %{version}-%{release}
-
-Provides:       gridsite-apache = %{version}-%{release}
-Obsoletes:      gridsite-apache <= 1.7.20
-Provides:       gridsite-services = %{version}-%{release}
-Obsoletes:      gridsite-services <= 1.7.20
 
 %description
 GridSite was originally a web application developed for managing and formatting
@@ -55,9 +49,9 @@ This package gridsite contains apache httpd modules for enabling
 mod_gridsite.
 
 
-%package  libs
-Group:    System Environment/Daemons
-Summary:  Run time libraries for mod_gridsite and gridsite-clients
+%package        libs
+Group:          System Environment/Daemons
+Summary:        Run time libraries for mod_gridsite and gridsite-clients
 
 %description libs
 GridSite was originally a web application developed for managing and formatting
@@ -68,12 +62,9 @@ Grid credentials, GACL access control lists and HTTP(S) protocol operations.
 This package contains the runtime libraries.
 
 
-%package  clients
-Group:    System Environment/Daemons
-Summary:  Clients to gridsite including htcp, htrm, htmv
-Requires: gridsite-libs = %{version}-%{release}
-Provides: gridsite-commands = %{version}-%{release}
-Obsoletes:gridsite-commands <= 1.7.20
+%package        clients
+Group:          System Environment/Daemons
+Summary:        Clients to gridsite including htcp, htrm, htmv
 
 %description  clients
 GridSite was originally a web application developed for managing and formatting
@@ -85,11 +76,11 @@ This package gridsite-clients, contains clients for using against gridsite,
 htcp, htrm, ...
 
 
-%package  devel
-Group:    System Environment/Daemons
-Summary:  Developers tools for gridsite
-Requires: gridsite-libs = %{version}-%{release}
-Requires: openssl-devel
+%package        devel
+Group:          System Environment/Daemons
+Summary:        Developers tools for gridsite
+Requires:       gridsite-libs%{?_isa} = %{version}-%{release}
+Requires:       openssl-devel%{?_isa}
 
 %description  devel
 GridSite was originally a web application developed for managing and formatting
@@ -99,10 +90,10 @@ has grown into a set of extensions to the Apache web server and a toolkit for
 This package gridsite-devel, contains developer tools for using gridsite.
 
 
-%package   doc
-Group:     System Environment/Daemons
-Summary:   Developers Documentation for gridsite
-BuildArch: noarch
+%package        doc
+Group:          System Environment/Daemons
+Summary:        Developers Documentation for gridsite
+BuildArch:      noarch
 
 %description  doc
 GridSite was originally a web application developed for managing and formatting
@@ -177,6 +168,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/vomsdir
 
 
 %files
+%license LICENSE
+%doc doc/httpd-fileserver.conf doc/httpd-webserver.conf
+%doc doc/httpd-storage.conf
+%doc CHANGES
 %{_libdir}/httpd/modules/mod_gridsite.so
 %dir %{_libexecdir}/gridsite
 %dir %{_libexecdir}/gridsite/cgi-bin
@@ -198,17 +193,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/vomsdir
 %config(noreplace) %attr(-,apache,apache) %{_var}/lib/gridsite/gridsitehead.txt
 %config(noreplace) %attr(-,apache,apache) %{_var}/lib/gridsite/gridsitefoot.txt
 
-%license LICENSE
-
-%doc doc/httpd-fileserver.conf doc/httpd-webserver.conf
-%doc doc/httpd-storage.conf
-
-%doc CHANGES
-
 %files libs
+%license LICENSE
 %{_libdir}/libgridsite.so.2
 %{_libdir}/libgridsite.so.2.*
-%license LICENSE
 
 %files  clients
 %{_bindir}/findproxyfile
@@ -257,6 +245,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/vomsdir
 
 
 %changelog
+* Wed Nov 09 2016 František Dvořák <valtri@civ.zcu.cz> - 2.3.1-1
+- Upstream 2.3.3
+- Removed compatibility dependencies and macros
+
 * Mon Sep 26 2016 František Dvořák <valtri@civ.zcu.cz> - 2.3.2-2
 - Removed gsexec obsolete
 - Rebuild for new gsoap