rpms/globus-gridftp-server/EL-4 globus-gridftp-server-deps.patch, NONE, 1.1 globus-gridftp-server-etc.patch, NONE, 1.1 globus-gridftp-server-pathmax.patch, NONE, 1.1 globus-gridftp-server-usr.patch, NONE, 1.1 globus-gridftp-server.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Mattias Ellert
ellert at fedoraproject.org
Sat Nov 7 07:27:22 UTC 2009
- Previous message (by thread): rpms/globus-gridftp-server/EL-5 globus-gridftp-server-deps.patch, NONE, 1.1 globus-gridftp-server-etc.patch, NONE, 1.1 globus-gridftp-server-pathmax.patch, NONE, 1.1 globus-gridftp-server-usr.patch, NONE, 1.1 globus-gridftp-server.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/yumex/devel .cvsignore, 1.45, 1.46 sources, 1.64, 1.65 yumex.spec, 1.77, 1.78
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/globus-gridftp-server/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22976/EL-4
Modified Files:
.cvsignore sources
Added Files:
globus-gridftp-server-deps.patch
globus-gridftp-server-etc.patch
globus-gridftp-server-pathmax.patch
globus-gridftp-server-usr.patch globus-gridftp-server.spec
import.log
Log Message:
* Mon Oct 19 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.17-2
- Fix location of default config file
globus-gridftp-server-deps.patch:
pkg_data_src.gpt.in | 54 ++++++++++++++++++++++++++++++++++++----------------
1 file changed, 38 insertions(+), 16 deletions(-)
--- NEW FILE globus-gridftp-server-deps.patch ---
diff -ur globus_gridftp_server-3.15.orig/pkgdata/pkg_data_src.gpt.in globus_gridftp_server-3.15/pkgdata/pkg_data_src.gpt.in
--- globus_gridftp_server-3.15.orig/pkgdata/pkg_data_src.gpt.in 2008-09-27 01:05:50.000000000 +0200
+++ globus_gridftp_server-3.15/pkgdata/pkg_data_src.gpt.in 2009-07-28 08:56:52.238706022 +0200
@@ -22,29 +22,21 @@
<Simple_Version Major="0"/>
</Version>
</Dependency>
- </Source_Dependencies>
- <Source_Dependencies Type="compile">
<Dependency Name="globus_gridftp_server_control">
<Version>
<Simple_Version Major="0"/>
</Version>
</Dependency>
- </Source_Dependencies>
- <Source_Dependencies Type="compile">
<Dependency Name="globus_ftp_control">
<Version>
<Simple_Version Major="1"/>
</Version>
</Dependency>
- </Source_Dependencies>
- <Source_Dependencies Type="compile">
<Dependency Name="globus_authz">
<Version>
<Simple_Version Major="0"/>
</Version>
</Dependency>
- </Source_Dependencies>
- <Source_Dependencies Type="compile">
<Dependency Name="globus_usage">
<Version>
<Simple_Version Major="1"/>
@@ -68,30 +60,59 @@
<Simple_Version Major="0"/>
</Version>
</Dependency>
-
- </Source_Dependencies>
- <Source_Dependencies Type="pgm_link">
<Dependency Name="globus_gridftp_server_control">
<Version>
<Simple_Version Major="0"/>
</Version>
</Dependency>
- </Source_Dependencies>
- <Source_Dependencies Type="pgm_link">
<Dependency Name="globus_ftp_control">
<Version>
<Simple_Version Major="1"/>
</Version>
</Dependency>
- </Source_Dependencies>
- <Source_Dependencies Type="pgm_link">
<Dependency Name="globus_authz">
<Version>
<Simple_Version Major="0"/>
</Version>
</Dependency>
+ <Dependency Name="globus_usage">
+ <Version>
+ <Simple_Version Major="1"/>
+ </Version>
+ </Dependency>
</Source_Dependencies>
- <Source_Dependencies Type="pgm_link">
+
+ <Source_Dependencies Type="lib_link">
+ <Dependency Name="globus_xio">
+ <Version>
+ <Simple_Version Major="0"/>
+ </Version>
+ </Dependency>
+ <Dependency Name="globus_xio_gsi_driver">
+ <Version>
+ <Simple_Version Major="0"/>
+ </Version>
+ </Dependency>
+ <Dependency Name="globus_gfork">
+ <Version>
+ <Simple_Version Major="0"/>
+ </Version>
+ </Dependency>
+ <Dependency Name="globus_gridftp_server_control">
+ <Version>
+ <Simple_Version Major="0"/>
+ </Version>
+ </Dependency>
+ <Dependency Name="globus_ftp_control">
+ <Version>
+ <Simple_Version Major="1"/>
+ </Version>
+ </Dependency>
+ <Dependency Name="globus_authz">
+ <Version>
+ <Simple_Version Major="0"/>
+ </Version>
+ </Dependency>
<Dependency Name="globus_usage">
<Version>
<Simple_Version Major="1"/>
@@ -105,6 +126,7 @@
<cflags>@GPT_PKG_CFLAGS@</cflags>
<external_includes>@GPT_EXTERNAL_INCLUDES@</external_includes>
<external_libs>@GPT_EXTERNAL_LIBS@</external_libs>
+ <pkg_libs>-lglobus_server</pkg_libs>
</Build_Environment>
</src_pkg>
</gpt_package_metadata>
globus-gridftp-server-etc.patch:
globus_i_gfs_config.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE globus-gridftp-server-etc.patch ---
diff -ur globus_gridftp_server-3.17.orig/globus_i_gfs_config.c globus_gridftp_server-3.17/globus_i_gfs_config.c
--- globus_gridftp_server-3.17.orig/globus_i_gfs_config.c 2009-06-12 11:25:22.000000000 +0200
+++ globus_gridftp_server-3.17/globus_i_gfs_config.c 2009-10-19 23:27:20.423111913 +0200
@@ -2141,7 +2141,8 @@
if(local_config_file == NULL && !argv_only)
{
local_config_file = globus_common_create_string(
- "%s/etc/gridftp.conf", globus_libc_getenv("GLOBUS_LOCATION"));
+ "%s/etc/gridftp.conf", globus_libc_getenv("GLOBUS_LOCATION") ?
+ globus_libc_getenv("GLOBUS_LOCATION") : "");
}
globus_l_gfs_config_load_defaults();
globus-gridftp-server-pathmax.patch:
globus_i_gfs_config.c | 4 +-
globus_i_gfs_control.c | 4 ++
globus_i_gfs_data.c | 46 ++++++++++++++++++++++++++----
modules/file/globus_gridftp_server_file.c | 3 +
4 files changed, 50 insertions(+), 7 deletions(-)
--- NEW FILE globus-gridftp-server-pathmax.patch ---
diff -ur globus_gridftp_server-3.17.orig/globus_i_gfs_config.c globus_gridftp_server-3.17/globus_i_gfs_config.c
--- globus_gridftp_server-3.17.orig/globus_i_gfs_config.c 2009-06-12 11:25:22.000000000 +0200
+++ globus_gridftp_server-3.17/globus_i_gfs_config.c 2009-08-06 11:17:48.994508311 +0200
@@ -15,6 +15,7 @@
*/
#include "globus_i_gridftp_server.h"
+#include "globus_gsi_system_config.h"
#include "version.h"
#define GLOBUS_GFS_HELP_ROWS 60
@@ -2114,8 +2115,7 @@
}
else if(exec_name[0] == '.')
{
- tmp_str = malloc(PATH_MAX);
- getcwd(tmp_str, PATH_MAX);
+ GLOBUS_GSI_SYSCONFIG_GET_CURRENT_WORKING_DIR(&tmp_str);
exec_name = globus_common_create_string(
"%s/%s", tmp_str, exec_name);
globus_free(tmp_str);
diff -ur globus_gridftp_server-3.17.orig/globus_i_gfs_control.c globus_gridftp_server-3.17/globus_i_gfs_control.c
--- globus_gridftp_server-3.17.orig/globus_i_gfs_control.c 2009-06-12 11:25:19.000000000 +0200
+++ globus_gridftp_server-3.17/globus_i_gfs_control.c 2009-08-06 11:25:41.756508578 +0200
@@ -17,6 +17,10 @@
#include "globus_i_gridftp_server.h"
#include "version.h"
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
struct passwd *
globus_l_gfs_getpwuid(
uid_t uid);
diff -ur globus_gridftp_server-3.17.orig/globus_i_gfs_data.c globus_gridftp_server-3.17/globus_i_gfs_data.c
--- globus_gridftp_server-3.17.orig/globus_i_gfs_data.c 2009-06-24 21:42:56.000000000 +0200
+++ globus_gridftp_server-3.17/globus_i_gfs_data.c 2009-08-06 11:05:13.566888209 +0200
@@ -25,7 +25,6 @@
#define FTP_SERVICE_NAME "file"
#define USER_NAME_MAX 64
-#define GSC_GETPW_PWBUFSIZE (USER_NAME_MAX*3)+(PATH_MAX*2)
#define GFSDataOpDec(_op, _d_op, _d_s) \
do \
@@ -759,18 +758,37 @@
uid_t uid)
{
int rc;
- char pw_buffer[GSC_GETPW_PWBUFSIZE];
+ int pw_buflen;
+ char * pw_buffer;
struct passwd pwent_mem;
struct passwd * pw_result;
struct passwd * pwent = NULL;
+#ifdef _SC_GETPW_R_SIZE_MAX
+ pw_buflen = sysconf(_SC_GETPW_R_SIZE_MAX) + 1;
+ if(pw_buflen < 1)
+ {
+ pw_buflen = 1024;
+ }
+#else
+ pw_buflen = 1024;
+#endif
+ pw_buffer = globus_malloc(pw_buflen);
+ if(!pw_buffer)
+ {
+ return NULL;
+ }
+
rc = globus_libc_getpwuid_r(getuid(), &pwent_mem, pw_buffer,
- GSC_GETPW_PWBUFSIZE, &pw_result);
+ pw_buflen, &pw_result);
if(rc != 0)
{
+ globus_free(pw_buffer);
return NULL;
}
+
pwent = globus_l_gfs_pw_copy(&pwent_mem);
+ globus_free(pw_buffer);
return pwent;
}
@@ -781,19 +799,37 @@
const char * name)
{
int rc;
- char pw_buffer[GSC_GETPW_PWBUFSIZE];
+ int pw_buflen;
+ char * pw_buffer;
struct passwd pwent_mem;
struct passwd * pw_result;
struct passwd * pwent = NULL;
+#ifdef _SC_GETPW_R_SIZE_MAX
+ pw_buflen = sysconf(_SC_GETPW_R_SIZE_MAX) + 1;
+ if(pw_buflen < 1)
+ {
+ pw_buflen = 1024;
+ }
+#else
+ pw_buflen = 1024;
+#endif
+ pw_buffer = globus_malloc(pw_buflen);
+ if(!pw_buffer)
+ {
+ return NULL;
+ }
+
rc = globus_libc_getpwnam_r(
- (char *)name, &pwent_mem, pw_buffer,GSC_GETPW_PWBUFSIZE, &pw_result);
+ (char *)name, &pwent_mem, pw_buffer, pw_buflen, &pw_result);
if(rc != 0)
{
+ globus_free(pw_buffer);
return NULL;
}
pwent = globus_l_gfs_pw_copy(&pwent_mem);
+ globus_free(pw_buffer);
return pwent;
}
diff -ur globus_gridftp_server-3.17.orig/modules/file/globus_gridftp_server_file.c globus_gridftp_server-3.17/modules/file/globus_gridftp_server_file.c
--- globus_gridftp_server-3.17.orig/modules/file/globus_gridftp_server_file.c 2009-06-24 21:43:32.000000000 +0200
+++ globus_gridftp_server-3.17/modules/file/globus_gridftp_server_file.c 2009-08-06 11:23:19.417510568 +0200
@@ -20,6 +20,9 @@
#include "openssl/md5.h"
#include "version.h"
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
GlobusDebugDeclare(GLOBUS_GRIDFTP_SERVER_FILE);
globus-gridftp-server-usr.patch:
Makefile.am | 8 +++-----
configure.in | 4 ++--
gridftp-be.gfork.in | 14 +++++++-------
gridftp-fe.gfork.in | 14 +++++++-------
gridftp.gfork.in | 14 +++++++-------
5 files changed, 26 insertions(+), 28 deletions(-)
--- NEW FILE globus-gridftp-server-usr.patch ---
diff -ur globus_gridftp_server-3.15.orig/configure.in globus_gridftp_server-3.15/configure.in
--- globus_gridftp_server-3.15.orig/configure.in 2008-10-03 07:18:44.000000000 +0200
+++ globus_gridftp_server-3.15/configure.in 2009-07-28 07:08:23.568709012 +0200
@@ -80,8 +80,8 @@
AC_MSG_CHECKING(Toolkit version)
GLOBUS_TOOLKIT_ID=unknown
-if test -x ${GLOBUS_LOCATION}/bin/globus-version ; then
- GLOBUS_TOOLKIT_ID="`${GLOBUS_LOCATION}/bin/globus-version -full`"
+if test -x ${GLOBUS_LOCATION:-/usr}/bin/globus-version ; then
+ GLOBUS_TOOLKIT_ID="`${GLOBUS_LOCATION:-/usr}/bin/globus-version -full`"
fi
AC_MSG_RESULT($GLOBUS_TOOLKIT_ID)
AC_SUBST(GLOBUS_TOOLKIT_ID)
diff -ur globus_gridftp_server-3.15.orig/gridftp-be.gfork.in globus_gridftp_server-3.15/gridftp-be.gfork.in
--- globus_gridftp_server-3.15.orig/gridftp-be.gfork.in 2007-09-14 03:13:02.000000000 +0200
+++ globus_gridftp_server-3.15/gridftp-be.gfork.in 2009-07-28 09:56:35.208708536 +0200
@@ -3,18 +3,18 @@
port = 2812
instances = 100
log_level = 0
- env = GLOBUS_LOCATION=@GLOBUS_LOCATION@
- env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib
- env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin
+ env = GLOBUS_LOCATION=@prefix@
+ env += LD_LIBRARY_PATH=@libdir@
+ env += PATH=@sbindir@:@bindir@
# might need additional envs for security
- server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server
- server_args = -i -aa -l @GLOBUS_LOCATION@/gridftp-be.log
+ server = @sbindir@/globus-gridftp-server
+ server_args = -i -aa -l @localstatedir@/log/globus-gridftp-be.log
server_args += -d WARN -ia self
nice = -20
- master = @GLOBUS_LOCATION@/libexec/gfs-gfork-master
+ master = @sbindir@/gfs-gfork-master
master_args = -G y @GRIDMAP_CONF@
- master_args += -l @GLOBUS_LOCATION@/gridftp-master-be.log
+ master_args += -l @localstatedir@/log/globus-gridftp-master-be.log
# must set this next value properly
master_args += -b <frontend registartion cs>
diff -ur globus_gridftp_server-3.15.orig/gridftp-fe.gfork.in globus_gridftp_server-3.15/gridftp-fe.gfork.in
--- globus_gridftp_server-3.15.orig/gridftp-fe.gfork.in 2007-09-14 03:13:02.000000000 +0200
+++ globus_gridftp_server-3.15/gridftp-fe.gfork.in 2009-07-28 09:54:30.635708011 +0200
@@ -3,18 +3,18 @@
port = 2811
instances = 100
log_level = 0
- env = GLOBUS_LOCATION=@GLOBUS_LOCATION@
- env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib
- env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin
+ env = GLOBUS_LOCATION=@prefix@
+ env += LD_LIBRARY_PATH=@libdir@
+ env += PATH=@sbindir@:@bindir@
# might need additional envs for security
- server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server
- server_args = -i -aa -l @GLOBUS_LOCATION@/gridftp-fe.log
+ server = @sbindir@/globus-gridftp-server
+ server_args = -i -aa -l @localstatedir@/log/globus-gridftp-fe.log
server_args += -d WARN -dsi remote -ia self
nice = -20
- master = @GLOBUS_LOCATION@/libexec/gfs-gfork-master
+ master = @sbindir@/gfs-gfork-master
master_args = -port 2815 -G y @GRIDMAP_CONF@
- master_args += -l @GLOBUS_LOCATION@/gridftp-master-fe.log
+ master_args += -l @localstatedir@/log/globus-gridftp-master-fe.log
# undoc the following for memory limiting
# master_args += -m
diff -ur --exclude pkgdata globus_gridftp_server-3.15.orig/gridftp.gfork.in globus_gridftp_server-3.15/gridftp.gfork.in
--- globus_gridftp_server-3.15.orig/gridftp.gfork.in 2007-09-14 03:13:02.000000000 +0200
+++ globus_gridftp_server-3.15/gridftp.gfork.in 2009-07-28 09:53:03.396707994 +0200
@@ -3,18 +3,18 @@
port = 2811
instances = 100
log_level = 0
- env = GLOBUS_LOCATION=@GLOBUS_LOCATION@
- env += LD_LIBRARY_PATH=@GLOBUS_LOCATION@/lib
- env += PATH=@GLOBUS_LOCATION@/sbin:@GLOBUS_LOCATION@/bin
+ env = GLOBUS_LOCATION=@prefix@
+ env += LD_LIBRARY_PATH=@libdir@
+ env += PATH=@sbindir@:@bindir@
# might need additional envs for security
- server = @GLOBUS_LOCATION@/sbin/globus-gridftp-server
- server_args = -i -aa -l @GLOBUS_LOCATION@/gridftp.log
+ server = @sbindir@/globus-gridftp-server
+ server_args = -i -aa -l @localstatedir@/log/globus-gridftp.log
server_args += -d WARN
nice = -20
- master = @GLOBUS_LOCATION@/libexec/gfs-gfork-master
+ master = @sbindir@/gfs-gfork-master
master_args = -G y
- master_args += -l @GLOBUS_LOCATION@/gridftp-master.log
+ master_args += -l @localstatedir@/log/globus-gridftp-master.log
# undoc the following for memory limiting
# master_args += -m
diff -ur --exclude pkgdata globus_gridftp_server-3.15.orig/Makefile.am globus_gridftp_server-3.15/Makefile.am
--- globus_gridftp_server-3.15.orig/Makefile.am 2008-03-10 20:03:13.000000000 +0100
+++ globus_gridftp_server-3.15/Makefile.am 2009-07-28 09:29:35.000708918 +0200
@@ -97,17 +97,15 @@
# You can also use any directory defined by a macro of the form
# <directory_name>dir
-sbin_PROGRAMS= \
- globus-gridftp-server
-
sbin_SCRIPTS = \
gridftp-password.pl
-libexec_PROGRAMS= \
+sbin_PROGRAMS = \
+ globus-gridftp-server \
gfs-gfork-master \
gfs-dynbe-client
-scriptsysconf_SCRIPTS=\
+scriptsysconf_DATA = \
gridftp.gfork \
gridftp-fe.gfork \
gridftp-be.gfork
--- NEW FILE globus-gridftp-server.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif
Name: globus-gridftp-server
%global _name %(tr - _ <<< %{name})
Version: 3.17
Release: 2%{?dist}
Summary: Globus Toolkit - Globus GridFTP Server
Group: System Environment/Libraries
License: ASL 2.0
URL: http://www.globus.org/
Source: http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
# Add missing dependency metadata:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6813
Patch0: %{name}-deps.patch
# Fixes for FHS installation:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6814
Patch1: %{name}-usr.patch
# PATH_MAX and MAXPATHLENGTH should not be defined in headers:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6830
Patch2: %{name}-pathmax.patch
# Fix location of default config file:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6876
Patch3: %{name}-etc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-xio-gsi-driver%{?_isa}
BuildRequires: grid-packaging-tools
BuildRequires: globus-gridftp-server-control-devel%{?_isa}
BuildRequires: globus-usage-devel%{?_isa} >= 1
BuildRequires: globus-xio-gsi-driver-devel%{?_isa}
BuildRequires: globus-xio-devel%{?_isa}
BuildRequires: globus-authz-devel%{?_isa}
BuildRequires: globus-gfork-devel%{?_isa}
BuildRequires: globus-ftp-control-devel%{?_isa} >= 1
%package progs
Summary: Globus Toolkit - Globus GridFTP Server Programs
Group: Applications/Internet
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: globus-xio-gsi-driver%{?_isa}
%package devel
Summary: Globus Toolkit - Globus GridFTP Server Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: globus-gridftp-server-control-devel%{?_isa}
Requires: globus-usage-devel%{?_isa} >= 1
Requires: globus-xio-gsi-driver-devel%{?_isa}
Requires: globus-xio-devel%{?_isa}
Requires: globus-authz-devel%{?_isa}
Requires: globus-gfork-devel%{?_isa}
Requires: globus-ftp-control-devel%{?_isa} >= 1
%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name} package contains:
Globus GridFTP Server
%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name}-progs package contains:
Globus GridFTP Server Programs
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name}-devel package contains:
Globus GridFTP Server Development Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
# Remove flavor tags
for f in `find . -name Makefile.am` ; do
sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
-e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -s 's!\(lib[a-zA-Z_${}]*\)_${GLOBUS_FLAVOR_NAME}\.la!\1.la!g' \
-i configure.in
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-i pkgdata/pkg_data_src.gpt.in
%{_datadir}/globus/globus-bootstrap.sh
export GRIDMAP=/etc/grid-security/grid-mapfile
%configure --with-flavor=%{flavor} --sysconfdir=/etc/%{name}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
# Remove buildroot from filelist
sed s!$RPM_BUILD_ROOT!! -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
# No need for environment in gfork scripts
sed '/ env /d' -i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/g*
# Remove .pl extension and add globus namespace
mv $RPM_BUILD_ROOT%{_sbindir}/gridftp-password.pl \
$RPM_BUILD_ROOT%{_sbindir}/globus-gridftp-password
sed s/gridftp-password.pl/globus-gridftp-password/ \
-i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
# Don't use /usr/bin/env
sed 's!/usr/bin/env perl!/usr/bin/perl!' \
-i $RPM_BUILD_ROOT%{_sbindir}/globus-gridftp-password
# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
| sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
$GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
| sed -e s!^!%{_prefix}! \
-e 's!%{_prefix}%{_sysconfdir}!%config(noreplace) %{_sysconfdir}!' \
> package-progs.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.filelist
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%files -f package-progs.filelist progs
%defattr(-,root,root,-)
%dir %{_sysconfdir}/%{name}
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Mon Oct 19 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.17-2
- Fix location of default config file
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.17-1
- Autogenerated
--- NEW FILE import.log ---
globus-gridftp-server-3_17-2_fc11:EL-4:globus-gridftp-server-3.17-2.fc11.src.rpm:1257578783
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 6 Nov 2009 20:32:55 -0000 1.1
+++ .cvsignore 7 Nov 2009 07:27:21 -0000 1.2
@@ -0,0 +1 @@
+globus_gridftp_server-3.17.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 6 Nov 2009 20:32:55 -0000 1.1
+++ sources 7 Nov 2009 07:27:22 -0000 1.2
@@ -0,0 +1 @@
+4f1b25af2672acd1f9eaee3e6a6be40e globus_gridftp_server-3.17.tar.gz
- Previous message (by thread): rpms/globus-gridftp-server/EL-5 globus-gridftp-server-deps.patch, NONE, 1.1 globus-gridftp-server-etc.patch, NONE, 1.1 globus-gridftp-server-pathmax.patch, NONE, 1.1 globus-gridftp-server-usr.patch, NONE, 1.1 globus-gridftp-server.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/yumex/devel .cvsignore, 1.45, 1.46 sources, 1.64, 1.65 yumex.spec, 1.77, 1.78
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list