rpms/globus-rsl-assist/devel globus-rsl-assist.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl-assist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1722/devel

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



Index: globus-rsl-assist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/devel/globus-rsl-assist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rsl-assist.spec	27 Apr 2009 22:41:53 -0000	1.1
+++ globus-rsl-assist.spec	15 Jun 2009 20:50:15 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-rsl-assist
 %global _name %(tr - _ <<< %{name})
 Version:	2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - RSL Manipulation Library
 
 Group:		System Environment/Libraries
@@ -82,15 +82,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
@@ -102,9 +102,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
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-2
+- Update to official Fedora Globus packaging guidelines
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Apr 2009 22:41:53 -0000	1.1
+++ import.log	15 Jun 2009 20:50:15 -0000	1.2
@@ -1 +1,2 @@
 globus-rsl-assist-2_1-1_fc9:HEAD:globus-rsl-assist-2.1-1.fc9.src.rpm:1240872080
+globus-rsl-assist-2_1-2_fc9:HEAD:globus-rsl-assist-2.1-2.fc9.src.rpm:1245098991