rpms/globus-usage/F-10 globus-usage.spec, 1.2, 1.3 import.log, 1.2, 1.3

[Mattias Ellert]

Author: ellert

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

Modified Files:
	globus-usage.spec import.log 
Log Message:
* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.0-3
- Update to official Fedora Globus packaging guidelines



Index: globus-usage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-10/globus-usage.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- globus-usage.spec	27 Apr 2009 22:24:55 -0000	1.2
+++ globus-usage.spec	15 Jun 2009 21:01:05 -0000	1.3
@@ -7,7 +7,7 @@
 Name:		globus-usage
 %global _name %(tr - _ <<< %{name})
 Version:	1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Usage Library
 
 Group:		System Environment/Libraries
@@ -83,15 +83,15 @@ make %{?_smp_mflags}
 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 $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
 
 # Remove static libraries (.a files)
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
-sed '/lib.*\.a$/d' \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
@@ -103,9 +103,9 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{nam
 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 \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
 %clean
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* 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
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-usage/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 Apr 2009 22:24:55 -0000	1.2
+++ import.log	15 Jun 2009 21:01:06 -0000	1.3
@@ -1,2 +1,3 @@
 globus-usage-1_0-1_fc9:F-10:globus-usage-1.0-1.fc9.src.rpm:1240581154
 globus-usage-1_0-2_fc9:F-10:globus-usage-1.0-2.fc9.src.rpm:1240871061
+globus-usage-1_0-3_fc9:F-10:globus-usage-1.0-3.fc9.src.rpm:1245099645