rpms/globus-common/F-10 .cvsignore, 1.2, 1.3 globus-common.spec, 1.2, 1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8356/F-10

Modified Files:
	.cvsignore globus-common.spec import.log sources 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
- Put GLOBUS_LICENSE file in extracted source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 08:31:53 -0000	1.2
+++ .cvsignore	21 Apr 2009 15:49:33 -0000	1.3
@@ -1,4 +1,3 @@
-GLOBUS_LICENSE
 epstopdf-2.9.5gw
 globus_common-10.2.tar.gz
 globus_common_setup-2.6.tar.gz


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/globus-common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-common.spec	17 Apr 2009 21:55:04 -0000	1.2
+++ globus-common.spec	21 Apr 2009 15:49:33 -0000	1.3
@@ -10,7 +10,7 @@
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -20,18 +20,19 @@
 #		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/common/source globus_common-10.2
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common-10.2
 #		tar -zcf globus_common-10.2.tar.gz globus_common-10.2
 Source:		%{_name}-%{version}.tar.gz
 #		Source1 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/common/setup globus_common_setup-2.6
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_common_setup-2.6
 #		tar -zcf globus_common_setup-2.6.tar.gz globus_common_setup-2.6
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source8:	epstopdf-2.9.5gw
-Source9:	GLOBUS_LICENSE
+Source9:	epstopdf-2.9.5gw
 #		Environment variable elimination patch:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6459
 Patch0:		%{name}-usr.patch
@@ -187,7 +188,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -306,6 +307,10 @@
     -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -324,10 +329,6 @@
 touch $RPM_BUILD_ROOT%{_datadir}/globus/setup/globus-sh-tools-vars.sh
 touch $RPM_BUILD_ROOT%{_datadir}/globus/globus-sh-tools-vars.sh
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -369,6 +370,9 @@
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-3
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-2
 - Remove config.guess file
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:55:04 -0000	1.2
+++ import.log	21 Apr 2009 15:49:33 -0000	1.3
@@ -1,2 +1,3 @@
 globus-common-10_2-1_fc9:F-10:globus-common-10.2-1.fc9.src.rpm:1239093082
 globus-common-10_2-2_fc9:F-10:globus-common-10.2-2.fc9.src.rpm:1240005254
+globus-common-10_2-3_fc9:F-10:globus-common-10.2-3.fc9.src.rpm:1240328836


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2009 08:31:54 -0000	1.2
+++ sources	21 Apr 2009 15:49:33 -0000	1.3
@@ -1,4 +1,3 @@
-2ee41112a44fe7014dce33e26468ba93  GLOBUS_LICENSE
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-2a80cda660b3b8dd7d9a5c9a793497e7  globus_common-10.2.tar.gz
-7a27af5fd1f776b2390b43d94f28a5bb  globus_common_setup-2.6.tar.gz
+92ce30191723a419252bd595fa1a6c08  globus_common-10.2.tar.gz
+7954be1b1d10ec20d72159ceccafa386  globus_common_setup-2.6.tar.gz