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

[Mattias Ellert]

Author: ellert

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

Modified Files:
	globus-openssl.spec import.log 
Log Message:
* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-2
- Update to official Fedora Globus packaging guidelines



Index: globus-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl/devel/globus-openssl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-openssl.spec	17 Apr 2009 22:05:55 -0000	1.1
+++ globus-openssl.spec	15 Jun 2009 15:25:41 -0000	1.2
@@ -9,7 +9,7 @@
 Name:		globus-openssl
 %global _name %(tr - _ <<< %{name})
 Version:	3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Openssl Library
 
 Group:		System Environment/Libraries
@@ -109,14 +109,16 @@ echo /share/globus/packages/%{_name}/pkg
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
+GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+
+mkdir -p $GLOBUSPACKAGEDIR/%{_name}
 
 install -m 644 pkg_data_%{flavor}_rtl.gpt %{flavor}_rtl.filelist \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
+  $GLOBUSPACKAGEDIR/%{_name}
 install -m 644 pkg_data_%{flavor}_pgm.gpt %{flavor}_pgm.filelist \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
+  $GLOBUSPACKAGEDIR/%{_name}
 install -m 644 pkg_data_%{flavor}_dev.gpt %{flavor}_dev.filelist \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}
+  $GLOBUSPACKAGEDIR/%{_name}
 
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
@@ -127,11 +129,11 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgco
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # 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}_pgm.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
   | sed s!^!%{_prefix}! > package-progs.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
@@ -151,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-2
+- Update to official Fedora Globus packaging guidelines
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0-1
 - Change defines to globals
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Apr 2009 22:05:55 -0000	1.1
+++ import.log	15 Jun 2009 15:25:41 -0000	1.2
@@ -1 +1,2 @@
 globus-openssl-3_0-1_fc9:HEAD:globus-openssl-3.0-1.fc9.src.rpm:1240005899
+globus-openssl-3_0-2_fc9:HEAD:globus-openssl-3.0-2.fc9.src.rpm:1245079520