rpms/globus-core/F-9 globus-core.spec,1.1,1.2 import.log,1.1,1.2

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14389/F-9

Modified Files:
	globus-core.spec import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
- Make comment about source retrieval more explicit



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/globus-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-core.spec	20 Mar 2009 07:26:24 -0000	1.1
+++ globus-core.spec	17 Apr 2009 21:24:17 -0000	1.2
@@ -1,16 +1,29 @@
+%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
+%global flavor gcc64pthr
+%global enable64 yes
+%else
+%global flavor gcc32pthr
+%global enable64 no
+%endif
+
+%global debug_package %{nil}
+
+%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the directory
-#		source-trees/core/source in
-#		http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/
-#		gt4.2.1-all-source-installer.tar.bz2
+#		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/core/source globus_core-5.15
+#		tar -zcf globus_core-5.15.tar.gz globus_core-5.15
 Source:		%{_name}-%{version}.tar.gz
 Source1:	globus-gpt2pkg-config
 #		Make file locations configurable:
@@ -54,24 +67,11 @@
 BuildRequires:	grid-packaging-tools
 BuildRequires:	perl(XML::DOM)
 
-%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
-%global enable64 yes
-%else
-%global flavor gcc32pthr
-%global enable64 no
-%endif
-
-%global debug_package %{nil}
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 %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 Core
@@ -121,38 +121,35 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod -x $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
+# These scripts are intended to be sourced, not executed
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
 
+# Install the GPT metadata to pkg-config file converter
 install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
 
+# Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config \
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
-grep -v GLOBUS_LICENSE \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist > \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new
-mv $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist.new \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
+sed /GLOBUS_LICENSE/d \
+  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
 # Generate package filelists
-
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
   | sed s!^!%{_prefix}! > package.filelist
 
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f package.filelist
 %defattr(-,root,root,-)
+%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -162,11 +159,12 @@
 %dir %{_libdir}/globus
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %{_datadir}/globus/globus-gpt2pkg-config
 
 %changelog
+* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
+- Make comment about source retrieval more explicit
+
 * Fri Mar 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 07:26:24 -0000	1.1
+++ import.log	17 Apr 2009 21:24:17 -0000	1.2
@@ -1 +1,2 @@
 globus-core-5_15-1_fc9:F-9:globus-core-5.15-1.fc9.src.rpm:1237533936
+globus-core-5_15-2_fc9:F-9:globus-core-5.15-2.fc9.src.rpm:1240003398