rpms/globus-callout/devel globus-callout.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-callout/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25709/devel

Modified Files:
	globus-callout.spec import.log sources 
Log Message:
* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
- Put GLOBUS_LICENSE file in extracted source tarball



Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/globus-callout.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globus-callout.spec	17 Apr 2009 22:15:26 -0000	1.1
+++ globus-callout.spec	22 Apr 2009 05:49:19 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-callout
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Callout Library
 
 Group:		System Environment/Libraries
@@ -17,11 +17,12 @@
 #		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/callout/source globus_callout-0.7
+#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_callout-0.7
 #		tar -zcf globus_callout-0.7.tar.gz globus_callout-0.7
 Source:		%{_name}-%{version}.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:	epstopdf-2.9.5gw
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-libtool >= 1
@@ -98,7 +99,7 @@
 
 %if "%{rhel}" == "5"
 mkdir bin
-install %{SOURCE8} bin/epstopdf
+install %{SOURCE9} bin/epstopdf
 %endif
 
 %build
@@ -164,6 +165,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
@@ -182,6 +187,8 @@
 %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-devel.filelist devel
 %defattr(-,root,root,-)
@@ -189,10 +196,12 @@
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-2
+- Put GLOBUS_LICENSE file in extracted source tarball
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2009 22:15:26 -0000	1.1
+++ import.log	22 Apr 2009 05:49:20 -0000	1.2
@@ -1 +1,2 @@
 globus-callout-0_7-1_fc9:HEAD:globus-callout-0.7-1.fc9.src.rpm:1240006486
+globus-callout-0_7-2_fc9:HEAD:globus-callout-0.7-2.fc9.src.rpm:1240379277


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Apr 2009 22:15:26 -0000	1.2
+++ sources	22 Apr 2009 05:49:20 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-7f1c410e0ae5e50832171c3ff70a9b00  globus_callout-0.7.tar.gz
+8d055fd70bd2ce70df4015dcec25d70b  globus_callout-0.7.tar.gz