[gridsite] update for 1.7.21 upstream, compliance with EMI project packaging
Ricardo Rocha
rocha at fedoraproject.org
Tue Jul 17 07:51:54 UTC 2012
commit f8236540bc072bda243ae65aeff49edefcc13321
Author: Ricardo Rocha <rocha.porto at gmail.com>
Date: Tue Jul 17 09:49:57 2012 +0200
update for 1.7.21 upstream, compliance with EMI project packaging
.gitignore | 1 +
cgi-bin-location-1.7.21.patch | 32 ++++++++++++++++++++++++++++++++
gridsite.spec | 30 ++++++++++++++++++++++++++++--
sources | 2 +-
4 files changed, 62 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a970aa2..854c6d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ gridsite-1.5.18.src.tar.gz
/gridsite-1.7.16.src.tar.gz
/gridsite-1.7.19.src.tar.gz
/gridsite-1.7.20.src.tar.gz
+/gridsite-1.7.21.src.tar.gz
diff --git a/cgi-bin-location-1.7.21.patch b/cgi-bin-location-1.7.21.patch
new file mode 100644
index 0000000..ddc8c3d
--- /dev/null
+++ b/cgi-bin-location-1.7.21.patch
@@ -0,0 +1,32 @@
+--- org.gridsite.core.ORIG/src/Makefile 2012-04-12 12:52:45.000000000 +0200
++++ org.gridsite.core/src/Makefile 2012-07-16 16:13:45.000000000 +0200
+@@ -408,15 +408,16 @@
+ $(prefix)/sbin \
+ $(prefix)/share/man/man1 \
+ $(prefix)/share/man/man8 \
+- $(prefix)/share/doc/gridsite-$(MINOR_VERSION)
++ $(prefix)/share/doc/gridsite-$(MINOR_VERSION) \
++ $(prefix)/libexec/gridsite/cgi-bin
+ sed 's/^\(#define GRST_VERSION\).*$$/\1 $(DEFVERSION)/' \
+ ../interface/gridsite.h > $(prefix)/include/gridsite.h
+ cp -f ../interface/gridsite-gacl.h $(prefix)/include
+ cp -f urlencode $(prefix)/bin
+ cp -f findproxyfile $(prefix)/bin
+- cp -f real-gridsite-admin.cgi $(prefix)/sbin
+- cp -f gridsite-copy.cgi $(prefix)/sbin
+- cp -f gridsite-storage.cgi $(prefix)/sbin
++ cp -f real-gridsite-admin.cgi $(prefix)/libexec/gridsite/cgi-bin
++ cp -f gridsite-copy.cgi $(prefix)/libexec/gridsite/cgi-bin
++ cp -f gridsite-storage.cgi $(prefix)/libexec/gridsite/cgi-bin
+ cp -f ../CHANGES ../README ../INSTALL ../LICENSE ../VERSION \
+ $(prefix)/share/doc/gridsite-$(MINOR_VERSION)
+ cp -f ../doc/index.html ../doc/*.conf ../doc/*.sh ../doc/*.spec \
+@@ -508,7 +509,7 @@
+ ln -sf htproxyput $(prefix)/bin/htproxyunixtime
+ ln -sf htproxyput $(prefix)/bin/htproxyrenew
+ ln -sf htproxyput $(prefix)/bin/htproxyinfo
+- cp -f gridsite-delegation.cgi $(prefix)/sbin
++ cp -f gridsite-delegation.cgi $(prefix)/libexec/gridsite/cgi-bin
+
+ post-install-debian:
+ sed -i \
diff --git a/gridsite.spec b/gridsite.spec
index 16063e5..d370128 100644
--- a/gridsite.spec
+++ b/gridsite.spec
@@ -2,7 +2,7 @@
%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
Name: gridsite
-Version: 1.7.20
+Version: 1.7.21
Release: 1%{?dist}
Summary: Grid Security for the Web, Web platforms for Grids
@@ -24,7 +24,7 @@ Source4: root-level.gacl
Source5: gridsitelogo.png
#Change location of cgi-scripts.
-Patch1: cgi-bin-location-1.7.15.patch
+Patch1: cgi-bin-location-1.7.21.patch
#Change location of cgi-scripts.
Patch2: cgi-bin-location-1.5.20.patch
# Includes are wrong.
@@ -49,11 +49,17 @@ BuildRequires: libxml2-devel
BuildRequires: httpd-devel
BuildRequires: doxygen
BuildRequires: openssl-devel
+BuildRequires: gsoap-devel
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
the content of the http://www.gridpp.ac.uk/ website. Over the past years it
@@ -79,6 +85,8 @@ This package contains the runtime libraries.
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
%description clients
GridSite was originally a web application developed for managing and formatting
@@ -151,6 +159,7 @@ cp -p %{SOURCE5} .
%install
rm -rf $RPM_BUILD_ROOT
(cd src && make install prefix=$RPM_BUILD_ROOT%{_usr} libdir=%{_lib} )
+(cd src && make install-ws prefix=$RPM_BUILD_ROOT%{_usr} libdir=%{_lib} )
# Remove static libs
rm $RPM_BUILD_ROOT/%{_libdir}/libgridsite.a
@@ -198,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/modules/mod_gridsite.so
%dir %{_libexecdir}/gridsite
%dir %{_libexecdir}/gridsite/cgi-bin
+%{_libexecdir}/gridsite/cgi-bin/gridsite-delegation.cgi
%{_libexecdir}/gridsite/cgi-bin/gridsite-copy.cgi
%{_libexecdir}/gridsite/cgi-bin/gridsite-storage.cgi
%{_libexecdir}/gridsite/cgi-bin/real-gridsite-admin.cgi
@@ -209,6 +219,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/grid-security/vomsdir
%{_mandir}/man8/mod_gridsite.8.*
+%{_mandir}/man8/gridsite-*.8.*
%config(noreplace) %{_sysconfdir}/httpd/conf.d/zgridsite.conf
%config(noreplace) %attr(-,apache,apache) %{_var}/lib/gridsite/.gacl
@@ -241,6 +252,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %{_bindir}/htmkdir
%attr(0755,root,root) %{_bindir}/htmv
%attr(0755,root,root) %{_bindir}/htping
+%attr(0755,root,root) %{_bindir}/htproxydestroy
+%attr(0755,root,root) %{_bindir}/htproxyinfo
+%attr(0755,root,root) %{_bindir}/htproxyput
+%attr(0755,root,root) %{_bindir}/htproxyrenew
+%attr(0755,root,root) %{_bindir}/htproxytime
+%attr(0755,root,root) %{_bindir}/htproxyunixtime
%attr(0755,root,root) %{_bindir}/htrm
%attr(0755,root,root) %{_bindir}/urlencode
@@ -252,6 +269,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/htmkdir.1.gz
%{_mandir}/man1/htmv.1.gz
%{_mandir}/man1/htping.1.gz
+%{_mandir}/man1/htproxydestroy.1.gz
+%{_mandir}/man1/htproxyinfo.1.gz
+%{_mandir}/man1/htproxyput.1.gz
+%{_mandir}/man1/htproxyrenew.1.gz
+%{_mandir}/man1/htproxytime.1.gz
+%{_mandir}/man1/htproxyunixtime.1.gz
%{_mandir}/man1/htrm.1.gz
%{_mandir}/man1/urlencode.1.gz
@@ -266,6 +289,9 @@ rm -rf $RPM_BUILD_ROOT
%doc src/doxygen LICENSE
%changelog
+* Mon Jul 16 2012 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.7.21-1
+- Upstream to 1.7.21, compliance with EMI project gridsite packaging
+
* Mon Apr 16 2012 steve.traylen at cern.ch - 1.7.20-1
- Upstream to 1.7.20, Add gridsite-httpd24.patch
diff --git a/sources b/sources
index a8475b6..a36539d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff7e9ec757bcaf644bd09a54ed773512 gridsite-1.7.20.src.tar.gz
+ac17ead3492c66e8914e2fc559b1ef25 gridsite-1.7.21.src.tar.gz
More information about the scm-commits
mailing list