rpms/globus-libtool/F-9 .cvsignore, 1.2, 1.3 globus-libtool.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Mattias Ellert
ellert at fedoraproject.org
Fri Apr 17 21:39:02 UTC 2009
Author: ellert
Update of /cvs/pkgs/rpms/globus-libtool/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20080/F-9
Modified Files:
.cvsignore globus-libtool.spec import.log sources
Log Message:
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
+- Add source description comment
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Mar 2009 10:12:04 -0000 1.2
+++ .cvsignore 17 Apr 2009 21:38:32 -0000 1.3
@@ -1 +0,0 @@
-GLOBUS_LICENSE
Index: globus-libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-9/globus-libtool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-libtool.spec 20 Mar 2009 10:12:05 -0000 1.1
+++ globus-libtool.spec 17 Apr 2009 21:38:32 -0000 1.2
@@ -1,14 +1,28 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%else
+%global flavor gcc32pthr
+%endif
+
+%global debug_package %{nil}
+
Name: globus-libtool
%global _name %(tr - _ <<< %{name})
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - Globus libtool package
Group: System Environment/Libraries
License: ASL 2.0
URL: http://www.globus.org/
+# This package is a substitution for the upstream globus-libtool
+# package, which contains a copy of the libltdl library sources.
+# Instead this package provides the necessary metadata files to
+# allow grid-packaging-tools (GPT) to use the libltdl library
+# provided by the Fedora/RHEL distribution. The package source
+# is a single GPT source package description file, referencing
+# the libltdl library as an external library.
Source: %{name}-pkg_data_src.gpt.in
-Source9: GLOBUS_LICENSE
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{?fedora}%{!?fedora:0} >= 4
@@ -38,30 +52,20 @@
%endif
Requires: pkgconfig
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%else
-%global flavor gcc32pthr
-%endif
-
-%global debug_package %{nil}
-
%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 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 libtool package (virtual GPT glue package)
%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 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 libtool package Development Files (virtual GPT glue package)
@@ -74,7 +78,7 @@
LIBTOOL_VERSION=`libtoolize --version | head -1 | sed 's!.* !!'`
sed "s!@LIBTOOL_VERSION@!$LIBTOOL_VERSION!g" \
- < pkg_data_src.gpt.in > pkg_data_src.gpt
+ < pkg_data_src.gpt.in > pkg_data_src.gpt
echo /share/globus/packages/%{_name}/%{flavor}_rtl.filelist > \
%{flavor}_rtl.filelist
@@ -86,7 +90,7 @@
echo /share/globus/packages/%{_name}/pkg_data_%{flavor}_dev.gpt >> \
%{flavor}_dev.filelist
-/usr/sbin/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
+%{_sbindir}/gpt_generate_bin_pkg_data --flavor=%{flavor} pkg_data_src.gpt
%install
rm -rf $RPM_BUILD_ROOT
@@ -98,21 +102,17 @@
install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
+# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-/usr/share/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
+%{_datadir}/globus/globus-gpt2pkg-config pkg_data_%{flavor}_dev.gpt > \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
# Generate package filelists
-
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
| sed s!^!%{_prefix}! > package.filelist
-
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.filelist
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -121,17 +121,15 @@
%dir %{_datadir}/globus
%dir %{_datadir}/globus/packages
%dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
-%dir %{_datadir}/globus
-%dir %{_datadir}/globus/packages
-%dir %{_datadir}/globus/packages/%{_name}
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-2
+- Add source description comment
+
* Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-1
- Change defines to globals
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 20 Mar 2009 10:12:05 -0000 1.1
+++ import.log 17 Apr 2009 21:38:32 -0000 1.2
@@ -1 +1,2 @@
globus-libtool-1_2-1_fc9:F-9:globus-libtool-1.2-1.fc9.src.rpm:1237543872
+globus-libtool-1_2-2_fc9:F-9:globus-libtool-1.2-2.fc9.src.rpm:1240004231
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 Mar 2009 10:12:05 -0000 1.2
+++ sources 17 Apr 2009 21:38:32 -0000 1.3
@@ -1 +0,0 @@
-2ee41112a44fe7014dce33e26468ba93 GLOBUS_LICENSE
More information about the fedora-extras-commits
mailing list