rpms/globus-openssl-module/EL-4 globus-openssl-module-mingw.patch, NONE, 1.1 globus-openssl-module.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl-module/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10481/EL-4

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


globus-openssl-module-mingw.patch:

--- NEW FILE globus-openssl-module-mingw.patch ---
diff -ur globus_openssl_module-0.6.orig/library/globus_openssl.c globus_openssl_module-0.6/library/globus_openssl.c
--- globus_openssl_module-0.6.orig/library/globus_openssl.c	2009-05-06 15:04:12.000000000 +0200
+++ globus_openssl_module-0.6/library/globus_openssl.c	2009-05-06 15:06:05.000000000 +0200
@@ -188,11 +188,7 @@
 static unsigned long
 globus_l_openssl_thread_id(void)
 {
-#ifndef TARGET_ARCH_WIN32
     return (unsigned long) globus_thread_self();
-#else
-    return (unsigned long) globus_thread_get_threadID_as_long();
-#endif
 }
 /* globus_l_openssl_thread_id() */
 


Index: globus-openssl-module.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/EL-4/globus-openssl-module.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-openssl-module.spec	29 Apr 2009 08:09:20 -0000	1.1
+++ globus-openssl-module.spec	15 Jun 2009 16:31:55 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-openssl-module
 %global _name %(tr - _ <<< %{name})
 Version:	0.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper
 
 Group:		System Environment/Libraries
@@ -30,6 +30,9 @@ Patch0:		%{name}-sslinit.patch
 #		Fix a typo in the metadata file:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6470
 Patch1:		%{name}-typo.patch
+#		Fixes for mingw compilation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
+Patch2:		%{name}-mingw.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl >= 1
@@ -40,18 +43,11 @@ BuildRequires:	globus-gsi-openssl-error-
 BuildRequires:	globus-openssl-devel >= 1
 BuildRequires:	globus-core >= 4
 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
@@ -108,6 +104,7 @@ Globus OpenSSL Module Wrapper Documentat
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -149,15 +146,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
@@ -168,25 +165,23 @@ 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
 
 # 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
@@ -211,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-2
+- Update to official Fedora Globus packaging guidelines
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
 - Make comment about source retrieval more explicit
 - Change defines to globals
@@ -223,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.4
 - Add s390x to the list of 64 bit platforms
 
-* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.3
+* Thu Jan 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.3
 - Adapt to updated GPT package
 
 * Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Apr 2009 08:09:20 -0000	1.1
+++ import.log	15 Jun 2009 16:31:55 -0000	1.2
@@ -1 +1,2 @@
 globus-openssl-module-0_6-1_fc9:EL-4:globus-openssl-module-0.6-1.fc9.src.rpm:1240992527
+globus-openssl-module-0_6-2_fc9:EL-4:globus-openssl-module-0.6-2.fc9.src.rpm:1245083495