diff --git a/.gitignore b/.gitignore index 16adba2..f6a3a77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/fts-3.0.3.tar.gz -/fts-3.1.0.tar.gz -/fts-3.1.1.tar.gz -/fts-3.1.33.tar.gz -/fts-3.1.74.tar.gz -/fts-3.2.26.2.tar.gz +/*.tar.gz diff --git a/fts.spec b/fts.spec index e5830a1..c104d9c 100644 --- a/fts.spec +++ b/fts.spec @@ -4,17 +4,17 @@ %global selinux_variants mls targeted Name: fts -Version: 3.2.26.2 -Release: 4%{?dist} +Version: 3.2.30 +Release: 1%{?dist} Summary: File Transfer Service V3 Group: System Environment/Daemons License: ASL 2.0 URL: https://svnweb.cern.ch/trac/fts3/wiki # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export https://svn.cern.ch/reps/fts3/trunk fts3 -# tar -czvf fts-3.2.25-2.tar.gz fts3 -Source0: https://grid-deployment.web.cern.ch/grid-deployment/dms/fts3/tar/%{name}-%{version}.tar.gz +# svn export http://svn.cern.ch/guest/fts3/tags/fts3_3.2.30 fts-3.2.30 +# tar -czvf fts-3.2.30.tar.gz fts-3.2.30 +Source0: %{name}-%{version}.tar.gz Source1: fts.te Source2: fts.fc @@ -38,7 +38,7 @@ BuildRequires: e2fsprogs-devel %else BuildRequires: libuuid-devel %endif -BuildRequires: gfal2-devel +BuildRequires: gfal2-devel >= 2.7.3 BuildRequires: glib2-devel BuildRequires: globus-gsi-credential-devel BuildRequires: gridsite-devel @@ -73,9 +73,9 @@ Summary: File Transfer Service version 3 server Group: System Environment/Daemons Requires: fts-libs%{?_isa} = %{version}-%{release} -Requires: gfal2-plugin-gridftp%{?_isa} >= 2.1.0 -Requires: gfal2-plugin-http%{?_isa} >= 2.1.0 -Requires: gfal2-plugin-srm%{?_isa} >= 2.1.0 +Requires: gfal2-plugin-gridftp%{?_isa} >= 2.7.3 +Requires: gfal2-plugin-http%{?_isa} >= 2.7.3 +Requires: gfal2-plugin-srm%{?_isa} >= 2.7.3 #Requires: gfal2-plugin-xrootd%{?_isa} >= 0.2.2 Requires: gridsite >= 1.7.25 Requires(post): chkconfig @@ -83,10 +83,6 @@ Requires(preun): chkconfig Requires(postun): initscripts Requires(preun): initscripts -#Requires: emi-resource-information-service (from EMI3) -#Requires: emi-version (from EMI3) -#Requires: fetch-crl3 (metapackage) - %description server The FTS server is a service which accepts transfer jobs, it exposes both a SOAP and a RESTful interface. The File @@ -112,7 +108,6 @@ Group: System Environment/Daemons Requires: bdii Requires: fts-server%{?_isa} = %{version}-%{release} Requires: glue-schema -Requires: glue-validator Requires(post): chkconfig Requires(preun): chkconfig Requires(postun): initscripts @@ -165,7 +160,7 @@ Requires(postun): /usr/sbin/semodule, /sbin/restorecon, fts-server This package setup the SELinux policies for the FTS3 server. %prep -%setup -qc +%setup -q mkdir SELinux cp -p %{SOURCE1} %{SOURCE2} SELinux @@ -284,22 +279,18 @@ exit 0 # Messaging scriptlets %post msg /sbin/chkconfig --add fts-msg-bulk -/sbin/chkconfig --add fts-msg-cron exit 0 %preun msg if [ $1 -eq 0 ] ; then /sbin/service fts-msg-bulk stop >/dev/null 2>&1 /sbin/chkconfig --del fts-msg-bulk - /sbin/service fts-msg-cron stop >/dev/null 2>&1 - /sbin/chkconfig --del fts-msg-cron fi exit 0 %postun msg if [ $1 -eq 0 ] ; then /sbin/service fts-msg-bulk condrestart >/dev/null 2>&1 || : - /sbin/service fts-msg-cron condrestart >/dev/null 2>&1 || : fi exit 0 @@ -374,13 +365,9 @@ fi %files msg %{_sbindir}/fts_msg_bulk -%{_sbindir}/fts_msg_cron %attr(0755,root,root) %{_initddir}/fts-msg-bulk -%attr(0755,root,root) %{_initddir}/fts-msg-cron -%attr(0755,root,root) %{_sysconfdir}/cron.hourly/fts-msg-cron %config(noreplace) %attr(0644,fts3,root) %{_sysconfdir}/fts3/fts-msg-monitoring.conf %{_mandir}/man8/fts_msg_bulk.8.gz -%{_mandir}/man8/fts_msg_cron.8.gz %files client %{_bindir}/fts-config-set @@ -446,6 +433,9 @@ fi %{_datadir}/selinux/*/fts.pp %changelog +* Wed Nov 26 2014 Alejandro Alvarez Ayllon - 3.2.30-1 +- Update for new upstream release + * Thu Sep 04 2014 Orion Poplawski - 3.2.26.2-4 - Rebuild for pugixml 1.4 diff --git a/sources b/sources index 0e09190..fd13201 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f5af525c810dad5ea2012506f28f1323 fts-3.2.26.2.tar.gz +396506f13c047b6c94e568d2859c47a8 fts-3.2.30.tar.gz