rpms/globus-gfork/EL-5 globus-gfork-etc.patch, NONE, 1.1 globus-gfork-opts.patch, NONE, 1.1 globus-gfork-undefined.patch, NONE, 1.1 globus-gfork.patch, NONE, 1.1 globus-gfork.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-gfork/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22473/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gfork-etc.patch globus-gfork-opts.patch 
	globus-gfork-undefined.patch globus-gfork.patch 
	globus-gfork.spec import.log 
Log Message:
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file


globus-gfork-etc.patch:
 globus_gfork_server.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE globus-gfork-etc.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_server.c globus_gfork-0.2/globus_gfork_server.c
--- globus_gfork-0.2.orig/globus_gfork_server.c	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_server.c	2009-10-19 22:04:30.006108522 +0200
@@ -1551,7 +1551,8 @@
     if(gfork_l_options.conf_file == NULL)
     {
         gfork_l_options.conf_file = globus_common_create_string(
-            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION"));
+            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION") ?
+                                 globus_libc_getenv("GLOBUS_LOCATION") : "");
     }
     result = globus_options_xinetd_file_process(
         opt_h, gfork_l_options.conf_file, "gridftp");

globus-gfork-opts.patch:
 globus_gfork_opts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gfork-opts.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_opts.c globus_gfork-0.2/globus_gfork_opts.c
--- globus_gfork-0.2.orig/globus_gfork_opts.c	2008-09-18 10:52:42.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_opts.c	2009-10-24 13:32:50.863112115 +0200
@@ -732,8 +732,8 @@
     {"master", "m", NULL, "<master program name>",
         "The name of the master program",
         1, gfork_l_opts_master},
-    {"master_args", "m", NULL, "<master program name>",
-        "The name of the master program",
+    {"master_args", "ma", NULL, "<arguments to the master>",
+        "List of arguments.  Comma seperated (or += if xinetd style)",
         1, gfork_l_opts_master_args},
     {"config_file", "c", NULL, NULL,
         "Print version information.",

globus-gfork-undefined.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE globus-gfork-undefined.patch ---
diff -ur globus_gfork-0.2.orig/Makefile.am globus_gfork-0.2/Makefile.am
--- globus_gfork-0.2.orig/Makefile.am	2006-12-07 23:24:55.000000000 +0100
+++ globus_gfork-0.2/Makefile.am	2009-09-14 15:49:55.973603339 +0200
@@ -22,8 +22,7 @@
 
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS)
-libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = \
-    $(MODULE_LIBS) $(GPT_LIB_LINKS)
+libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS)
 
 sbin_PROGRAMS= \
     gfork

globus-gfork.patch:
 pkg_data_src.gpt.in |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE globus-gfork.patch ---
diff -ur globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in	2009-07-28 05:35:24.334708299 +0200
@@ -44,5 +44,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~


--- NEW FILE globus-gfork.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gfork
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	3%{?dist}
Summary:	Globus Toolkit - GFork

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gridftp/gfork/source globus_gfork-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gfork-0.2
#		tar -zcf globus_gfork-0.2.tar.gz globus_gfork-0.2
Source:		%{_name}-%{version}.tar.gz
#		Remove some junk lines in the package description file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6812
Patch0:		%{name}.patch
#		Undefined make variable:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6857
Patch1:		%{name}-undefined.patch
#		Fix location of default config file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6875
Patch2:		%{name}-etc.patch
#		Fix cut & paste error in option description:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6879
Patch3:		%{name}-opts.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel%{?_isa} >= 2

%package progs
Summary:	Globus Toolkit - GFork Programs
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - GFork Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-xio-devel%{?_isa} >= 2

%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:
GFork Library

%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:
GFork Programs - GFork is user configurable super-server daemon very similar
to xinetd. It listens on a TCP port. When clients connect to a port it runs an
administrator defined program which services that client connection, just as
x/inetd do.

%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:
GFork 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 -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

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

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Add empty default configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
echo "# This is the default gfork configuration file" > \
  $RPM_BUILD_ROOT%{_sysconfdir}/gfork.conf

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > 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}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-progs.filelist progs
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/gfork.conf
%doc README.txt

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file

* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Include additional documentation

* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gfork-0_2-3_fc11:EL-5:globus-gfork-0.2-3.fc11.src.rpm:1256615716


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:14:09 -0000	1.1
+++ .cvsignore	27 Oct 2009 03:55:37 -0000	1.2
@@ -0,0 +1 @@
+globus_gfork-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:14:09 -0000	1.1
+++ sources	27 Oct 2009 03:55:37 -0000	1.2
@@ -0,0 +1 @@
+f5230d4520092e66dc307f83d93d65bb  globus_gfork-0.2.tar.gz