[metrics-commit] CVS update: MODIFIED: source ...
Joe Bester
commit at globus.org
Thu Feb 3 15:47:33 CST 2011
User: bester
Date: 11/02/03 15:47:33
Modified: c/sender/source Makefile.am bootstrap globus_usage.h
Added: c/sender/source GLOBUS_LICENSE globus-usage.spec
Log:
Merge RIC-92 changes
Revision Changes Path
1.5 +6 -2 usage/c/sender/source/Makefile.am
http://viewcvs.globus.org/viewcvs.cgi/usage/c/sender/source/Makefile.am.diff?r1=1.4&r2=1.5
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Makefile.am
===================================================================
RCS file: /home/globdev/CVS/globus-packages/usage/c/sender/source/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Makefile.am 28 Oct 2010 21:52:46 -0000 1.4
+++ Makefile.am 3 Feb 2011 21:47:33 -0000 1.5
@@ -1,5 +1,5 @@
-
include $(top_srcdir)/globus_automake_pre
+include $(top_srcdir)/globus_automake_pre_top
SUBDIRS = pkgdata
@@ -7,7 +7,6 @@
include_HEADERS = globus_usage.h
-
lib_LTLIBRARIES = libglobus_usage.la
INCLUDES = @GPT_INCLUDES@
@@ -17,4 +16,9 @@
libglobus_usage_la_SOURCES = $(Sources)
libglobus_usage_la_LDFLAGS = @GPT_LDFLAGS@
+doc_DATA = GLOBUS_LICENSE
+
+EXTRA_DIST = globus-usage.spec $(doc_DATA)
+
include $(top_srcdir)/globus_automake_post
+include $(top_srcdir)/globus_automake_post_top
1.3 +5 -5 usage/c/sender/source/bootstrap
http://viewcvs.globus.org/viewcvs.cgi/usage/c/sender/source/bootstrap.diff?r1=1.2&r2=1.3
(In the diff below, changes in quantity of whitespace are not shown.)
Index: bootstrap
===================================================================
RCS file: /home/globdev/CVS/globus-packages/usage/c/sender/source/bootstrap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- bootstrap 19 Oct 2010 18:21:27 -0000 1.2
+++ bootstrap 3 Feb 2011 21:47:33 -0000 1.3
@@ -3,15 +3,15 @@
# checking for the GLOBUS_LOCATION
if test "x$GLOBUS_LOCATION" = "x"; then
- echo "ERROR Please specify GLOBUS_LOCATION" >&2
- exit 1
+ echo "Using default GLOBUS_LOCATION of /usr"
+ GLOBUS_LOCATION="/usr"
fi
-if [ ! -f ${GLOBUS_LOCATION}/lib/globus/globus-bootstrap.sh ]; then
- echo "ERROR: Unable to locate \${GLOBUS_LOCATION}/lib/globus/globus-bootstrap.sh"
+if [ ! -f ${GLOBUS_LOCATION}/share/globus/globus-bootstrap.sh ]; then
+ echo "ERROR: Unable to locate \${GLOBUS_LOCATION}/share/globus/globus-bootstrap.sh"
echo " Please ensure that you have installed the globus-core package and"
echo " that GLOBUS_LOCATION is set to the proper directory"
exit
fi
-. ${GLOBUS_LOCATION}/lib/globus/globus-bootstrap.sh
+. ${GLOBUS_LOCATION}/share/globus/globus-bootstrap.sh
1.7 +0 -1 usage/c/sender/source/globus_usage.h
http://viewcvs.globus.org/viewcvs.cgi/usage/c/sender/source/globus_usage.h.diff?r1=1.6&r2=1.7
(In the diff below, changes in quantity of whitespace are not shown.)
Index: globus_usage.h
===================================================================
RCS file: /home/globdev/CVS/globus-packages/usage/c/sender/source/globus_usage.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- globus_usage.h 30 Nov 2007 18:52:04 -0000 1.6
+++ globus_usage.h 3 Feb 2011 21:47:33 -0000 1.7
@@ -66,4 +66,3 @@
EXTERN_C_END
#endif
-
1.2 +177 -0 usage/c/sender/source/GLOBUS_LICENSE
http://viewcvs.globus.org/viewcvs.cgi/usage/c/sender/source/GLOBUS_LICENSE.diff?r1=1.1&r2=1.2
(In the diff below, changes in quantity of whitespace are not shown.)
Index: GLOBUS_LICENSE
===================================================================
RCS file: GLOBUS_LICENSE
diff -N GLOBUS_LICENSE
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ GLOBUS_LICENSE 3 Feb 2011 21:47:33 -0000 1.2
@@ -0,0 +1,177 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
1.2 +143 -0 usage/c/sender/source/globus-usage.spec
http://viewcvs.globus.org/viewcvs.cgi/usage/c/sender/source/globus-usage.spec.diff?r1=1.1&r2=1.2
(In the diff below, changes in quantity of whitespace are not shown.)
Index: globus-usage.spec
===================================================================
RCS file: globus-usage.spec
diff -N globus-usage.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ globus-usage.spec 3 Feb 2011 21:47:33 -0000 1.2
@@ -0,0 +1,143 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64
+%else
+%global flavor gcc32
+%endif
+
+Name: globus-usage
+%global _name %(tr - _ <<< %{name})
+Version: 2.0
+Release: 1%{?dist}
+Summary: Globus Toolkit - Usage Library
+
+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/gt5/5.0/5.0.1/installers/src/gt5.0.1-all-source-installer.tar.bz2
+# tar -jxf gt5.0.1-all-source-installer.tar.bz2
+# mv gt5.0.1-all-source-installer/source-trees/usage/c/sender/source globus_usage-1.3
+# cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_usage-1.3
+# tar -zcf globus_usage-1.3.tar.gz globus_usage-1.3
+Source: %{_name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: globus-common
+BuildRequires: grid-packaging-tools
+BuildRequires: globus-xio-devel%{?_isa}
+BuildRequires: globus-core%{?_isa} >= 4
+
+%package devel
+Summary: Globus Toolkit - Usage Library Development Files
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: globus-xio-devel%{?_isa}
+Requires: globus-core%{?_isa} >= 4
+
+%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:
+Usage Library - client library for the Globus usage statistics collection
+service
+
+%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:
+Usage Library Development Files
+
+%prep
+%setup -q -n %{_name}-%{version}
+
+%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
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
+
+%{_datadir}/globus/globus-bootstrap.sh
+
+%configure --with-flavor=%{flavor} --docdir=%{_docdir}/%{name}-%{version} \
+ --disable-static
+
+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}_dev.filelist
+
+# Generate package filelists
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
+ $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+ | sed s!^!%{_prefix}! > package.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}
+
+%files -f package-devel.filelist devel
+%defattr(-,root,root,-)
+
+%changelog
+* Wed Apr 14 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3-1
+- Update to Globus Toolkit 5.0.1
+
+* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1-1
+- Update to Globus Toolkit 5.0.0
+
+* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-4
+- Add instruction set architecture (isa) tags
+
+* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-3
+- Update to official Fedora Globus packaging guidelines
+
+* Tue Apr 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-2
+- Rebuild with updated libtool
+
+* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-1
+- Make comment about source retrieval more explicit
+- Change defines to globals
+- Remove explicit requires on library packages
+- Put GLOBUS_LICENSE file in extracted source tarball
+
+* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.5
+- Adapting to updated globus-core package
+
+* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.4
+- Add s390x to the list of 64 bit platforms
+
+* Tue Dec 30 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.3
+- Adapt to updated GPT package
+
+* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.2
+- Update to Globus Toolkit 4.2.1
+
+* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-0.1
+- Autogenerated
More information about the metrics-commit
mailing list