rpms/globus-gssapi-gsi/F-10 globus-gssapi-gsi.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Mattias Ellert]

Author: ellert

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

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



Index: globus-gssapi-gsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/F-10/globus-gssapi-gsi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gssapi-gsi.spec	19 May 2009 05:22:57 -0000	1.1
+++ globus-gssapi-gsi.spec	15 Jun 2009 17:31:33 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gssapi-gsi
 %global _name %(tr - _ <<< %{name})
 Version:	5.9
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - GSSAPI library
 
 Group:		System Environment/Libraries
@@ -52,18 +52,11 @@ BuildRequires:	globus-core >= 4
 BuildRequires:	globus-gsi-cert-utils-devel >= 5
 BuildRequires:	globus-common-devel >= 3
 BuildRequires:	doxygen
-%if %{?fedora}%{!?fedora:0} >= 3
-BuildRequires:	graphviz
-BuildRequires:	ghostscript
-%else
-%if %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	graphviz
 BuildRequires:	ghostscript
 %if "%{?rhel}" == "5"
 BuildRequires:	graphviz-gd
 %endif
-%endif
-%endif
 %if %{?fedora}%{!?fedora:0} >= 9
 BuildRequires:	tex(latex)
 %else
@@ -167,15 +160,15 @@ export PATH=$PWD/bin:$PATH
 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
@@ -186,25 +179,27 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgco
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 sed s!doc/%{_name}!doc/%{name}-%{version}! \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
-# Remove unwanted documentation
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
+# Remove unwanted documentation (needed for RHEL4)
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-sed -e '/deprecated\.3/d' \
-    -e '/_%{_name}-%{version}_.*\.3/d' \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/_%{_name}-%{version}_.*\.3/d' \
+  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+
+# Remove deprecated.3 man page (too common name)
+rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
+sed -e '/deprecated\.3/d' -i $GLOBUSPACKAGEDIR/%{_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 \
+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
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
 %clean
@@ -229,6 +224,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-3
+- Update to official Fedora Globus packaging guidelines
+
 * Tue May 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-2
 - Change the License tag to take the library/ssl_locl.h file into account
 
@@ -244,7 +242,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-0.4
 - Add s390x to the list of 64 bit platforms
 
-* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-0.3
+* Thu Jan 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-0.3
 - Adapt to updated GPT package
 
 * Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-0.2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 May 2009 05:22:57 -0000	1.1
+++ import.log	15 Jun 2009 17:31:34 -0000	1.2
@@ -1 +1,2 @@
 globus-gssapi-gsi-5_9-2_fc9:F-10:globus-gssapi-gsi-5.9-2.fc9.src.rpm:1242710545
+globus-gssapi-gsi-5_9-3_fc9:F-10:globus-gssapi-gsi-5.9-3.fc9.src.rpm:1245087073