[gridsite/el6] - New upstream 2.2.0 for compat package - default keylength 1024 - New upstream 1.7.29 for compat pa
stevetraylen
stevetraylen at fedoraproject.org
Wed Dec 18 10:56:37 UTC 2013
commit b54d6320e091714ce0a0bd3f4a96b3978a689b5a
Author: Steve Traylen <steve.traylen at cern.ch>
Date: Wed Dec 18 10:56:40 2013 +0000
- New upstream 2.2.0 for compat package - default keylength 1024
- New upstream 1.7.29 for compat package - default keylength 1024
- Upstream source URL is now github.
- Drop gridsite-httpd24_v3.patch since fixed upstream.
.gitignore | 2 +
gridsite-httpd24_v2.patch | 4677 ---------------------------------------------
gridsite-httpd24_v3.patch | 111 --
gridsite.spec | 61 +-
sources | 4 +-
5 files changed, 30 insertions(+), 4825 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 911552a..a504f4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ gridsite-1.5.18.src.tar.gz
/gridsite-1.7.20.src.tar.gz
/gridsite-1.7.21.src.tar.gz
/gridsite-1.7.25.src.tar.gz
+/gridsite-core_R_1_7_29.tar.gz
+/gridsite-core_R_2_2_0.tar.gz
diff --git a/gridsite.spec b/gridsite.spec
index 57c6aa3..6208218 100644
--- a/gridsite.spec
+++ b/gridsite.spec
@@ -4,18 +4,19 @@
# The normal* variables refer to the standard packaging.
# The compat* variables refer to the compat packages.
-%global normalver 2.0.4
-%global normalrel 2
+%global releaseno 1
+%global normalver 2.2.0
+%global normalunder 2_2_0
%global normalso 2
-%global compatver 1.7.25
-%global compatrel 2
+%global compatver 1.7.29
+%global compatunder 1_7_29
%global compatso 1.7
Name: gridsite
Version: %{normalver}
-Release: %{normalrel}%{?dist}
+Release: %{releaseno}%{?dist}
Summary: Grid Security for the Web, Web platforms for Grids
Group: System Environment/Daemons
@@ -27,28 +28,22 @@ Group: System Environment/Daemons
# All other files are BSD
License: ASL 2.0 and BSD
URL: http://www.gridsite.org
-Source0: http://www.gridsite.org/download/sources/gridsite-%{normalver}.src.tar.gz
+Source0: https://github.com/CESNET/gridsite/archive/gridsite-core_R_%{normalunder}.tar.gz
Source1: gridsite-httpd.conf
Source2: gridsitehead.txt
Source3: gridsitefoot.txt
Source4: root-level.gacl
Source5: gridsitelogo.png
-Source6: http://www.gridsite.org/download/sources/gridsite-%{compatver}.src.tar.gz
+Source6: https://github.com/CESNET/gridsite/archive/gridsite-core_R_%{compatunder}.tar.gz
#Change location of cgi-scripts.
Patch1: cgi-bin-location-2.0.4.patch
-# httpd 2.4 support.
-# https://www.jiscmail.ac.uk/cgi-bin/webadmin?A2=ind1204&L=GRIDSITE-DISCUSS&F=&S=&P=59
-Patch2: gridsite-httpd24_v3.patch
# And the same for compat package.
#Change location of cgi-scripts.
Patch3: cgi-bin-location-1.7.24.patch
-# httpd 2.4 support.
-# https://www.jiscmail.ac.uk/cgi-bin/webadmin?A2=ind1204&L=GRIDSITE-DISCUSS&F=&S=&P=59
-Patch4: gridsite-httpd24_v2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,11 +63,11 @@ BuildRequires: canl-c-devel
Requires: httpd-mmn = %{_httpd_mmn}
Requires: mod_ssl
-Requires: gridsite-libs = %{normalver}-%{normalrel}%{?dist}
+Requires: gridsite-libs = %{normalver}-%{releaseno}%{?dist}
-Provides: gridsite-apache = %{normalver}-%{normalrel}%{?dist}
+Provides: gridsite-apache = %{normalver}-%{releaseno}%{?dist}
Obsoletes: gridsite-apache <= 1.7.20
-Provides: gridsite-services = %{normalver}-%{normalrel}%{?dist}
+Provides: gridsite-services = %{normalver}-%{releaseno}%{?dist}
Obsoletes: gridsite-services <= 1.7.20
%description
@@ -102,7 +97,7 @@ This package contains the runtime libraries.
Group: System Environment/Daemons
Summary: Run time libraries for mod_gridsite and gridsite-clients
Version: %{compatver}
-Release: %{compatrel}
+Release: %{releaseno}
%description -n gridsite%{compatso}-compat
@@ -116,8 +111,8 @@ This package contains the runtime libraries.
%package clients
Group: System Environment/Daemons
Summary: Clients to gridsite including htcp, htrm, htmv
-Requires: gridsite-libs = %{normalver}-%{normalrel}%{?dist}
-Provides: gridsite-commands = %{normalver}-%{normalrel}%{?dist}
+Requires: gridsite-libs = %{normalver}-%{releaseno}%{?dist}
+Provides: gridsite-commands = %{normalver}-%{releaseno}%{?dist}
Obsoletes:gridsite-commands <= 1.7.20
%description clients
@@ -132,7 +127,7 @@ htcp, htrm, ...
%package devel
Group: System Environment/Daemons
Summary: Developers tools for gridsite
-Requires: gridsite-libs = %{normalver}-%{normalrel}%{?dist}
+Requires: gridsite-libs = %{normalver}-%{releaseno}%{?dist}
Requires: openssl-devel
%description devel
@@ -154,7 +149,7 @@ 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.
%prep
-%setup -q -n org.gridsite.core -a 6
+%setup -q -n gridsite-gridsite-core_R_%{normalunder} -a 6
# Copy in apache configuration.
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
@@ -162,7 +157,7 @@ cp -p %{SOURCE3} .
cp -p %{SOURCE4} .
cp -p %{SOURCE5} .
# And the compat.
-pushd org.gridsite.core
+pushd gridsite-gridsite-core_R_%{compatunder}
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
cp -p %{SOURCE3} .
@@ -174,33 +169,23 @@ popd
## Change installed path of cgi-bins.
%patch1 -p1
-## Changes for httpd 2.4 only.
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 18
-%patch2 -p1
-%endif
-
# And the compat.
-pushd org.gridsite.core
+pushd gridsite-gridsite-core_R_%{compatunder}
## Change installed path of cgi-bins.
%patch3 -p1
-
-## Changes for httpd 2.4 only.
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 18
-%patch4 -p1
-%endif
popd
%build
(cd src && MYCFLAGS="%{optflags} -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE -I../interface -I%{_includedir}/httpd -I%{_includedir}/apr-%{aprversion} -fPIC " make )
# And the compat
-pushd org.gridsite.core
+pushd gridsite-gridsite-core_R_%{compatunder}
(cd src && MYCFLAGS="%{optflags} -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE -I../interface -I%{_includedir}/httpd -I%{_includedir}/apr-%{aprversion} -fPIC " make )
popd
%install
rm -rf $RPM_BUILD_ROOT
# And the compat
-pushd org.gridsite.core
+pushd gridsite-gridsite-core_R_%{compatunder}
(cd src && make install prefix=$RPM_BUILD_ROOT%{_usr} libdir=%{_lib} )
(cd src && make install-ws prefix=$RPM_BUILD_ROOT%{_usr} libdir=%{_lib} )
# And clean up everything we do not want from compat.
@@ -357,6 +342,12 @@ rm -rf $RPM_BUILD_ROOT
%doc src/doxygen LICENSE
%changelog
+* Wed Dec 18 2013 Steve Traylen <steve.traylen at cern.ch> - 2.2.0-3
+- New upstream 2.2.0 for compat package - default keylength 1024
+- New upstream 1.7.29 for compat package - default keylength 1024
+- Upstream source URL is now github.
+- Drop gridsite-httpd24_v3.patch since fixed upstream.
+
* Mon Sep 23 2013 Steve Traylen <steve.traylen at cern.ch> - 2.0.4-2
- Correct package interdependencies.
diff --git a/sources b/sources
index 3de7fea..9af47c6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a9f91f16668e862a82486df72b5a5956 gridsite-1.7.25.src.tar.gz
-4f42d7bee72ab8269b4729e2fb529772 gridsite-2.0.4.src.tar.gz
+e56b4451ef595e72022cb8bdf276e787 gridsite-core_R_2_2_0.tar.gz
+33256643236ba71f635a191929eee8f1 gridsite-core_R_1_7_29.tar.gz
More information about the scm-commits
mailing list