diff --git a/.gitignore b/.gitignore index e4f2ace..8e17e23 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ gridsite-1.5.18.src.tar.gz /gridsite-core_R_2_2_6.tar.gz /gridsite-core_R_2_3_1.tar.gz /gridsite-core_R_2_3_2.tar.gz +/gridsite-d51b2fd.tar.gz diff --git a/gridsite.spec b/gridsite.spec index 78b2149..a65b624 100644 --- a/gridsite.spec +++ b/gridsite.spec @@ -1,10 +1,12 @@ %global aprversion 1 -%global underversion 2_3_2 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} +%global commit0 d51b2fd0601c966660a2784c381f2d44d78f53f4 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + Name: gridsite -Version: 2.3.2 -Release: 3%{?dist} +Version: 3.0.0 +Release: 0.20170225git%{shortcommit0}%{?dist} Summary: Grid Security for the Web, Web platforms for Grids Group: System Environment/Daemons @@ -15,25 +17,20 @@ Group: System Environment/Daemons # All other files are BSD License: ASL 2.0 and BSD URL: http://www.gridsite.org -Source0: https://github.com/CESNET/gridsite/archive/gridsite-core_R_%{underversion}.tar.gz +Source0: https://github.com/CESNET/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz Source1: gridsite-httpd.conf Source2: gridsitehead.txt Source3: gridsitefoot.txt Source4: root-level.gacl Source5: gridsitelogo.png -%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: libcurl-devel -%else -BuildRequires: curl-devel -%endif - BuildRequires: libxml2-devel BuildRequires: httpd-devel BuildRequires: doxygen -BuildRequires: openssl-devel +BuildRequires: openssl-devel >= 1.1 BuildRequires: gsoap-devel -BuildRequires: canl-c-devel +BuildRequires: canl-c-devel >= 3.0.0 BuildRequires: libtool Requires: httpd-mmn = %{_httpd_mmn} @@ -113,7 +110,7 @@ This package gridsite-doc, contains developer documentation for gridsite. %prep -%setup -q -n gridsite-gridsite-core_R_%{underversion} +%setup -q -n %{name}-%{commit0} # Copy in apache configuration. cp -p %{SOURCE1} . cp -p %{SOURCE2} . @@ -206,8 +203,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/vomsdir %doc CHANGES %files libs -%{_libdir}/libgridsite.so.2 -%{_libdir}/libgridsite.so.2.* +%{_libdir}/libgridsite.so.6 +%{_libdir}/libgridsite.so.6.* %license LICENSE %files clients @@ -257,6 +254,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/vomsdir %changelog +* Mon Feb 13 2017 František Dvořák - 3.0.0-0.20170225gitd51b2fd +- Upstream 3.0.0 (development snapshot) +- Major version update +- OpenSSL 1.1 + * Fri Feb 10 2017 Fedora Release Engineering - 2.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 89ce3c8..1c62c8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b485d2b6c56a60320b694e13a21db45 gridsite-core_R_2_3_2.tar.gz +SHA512 (gridsite-d51b2fd.tar.gz) = 26406fbeb6bac8b1fb2fa6577521a53fdb8acf0fb0b9f830375b9157299224a9b5736a07cc694b7011791d49061ccfbf937e3f0589f32ef6e30c6c1b2eff6b44